Mercurial > hg > truffle
diff src/share/vm/c1/c1_Runtime1.cpp @ 1429:abc670a709dc
* -XX:TraceC1X=0...5 controls the native c1x tracing
* -Dc1x.debug=true turns on the logging proxies and lots of log output on the java side
* provide more information about types to the compiler (type hierarchy, etc)
* provide exception handler tables to the compiler
* add exception handlers to the nmethod
* correct implementation of ExceptionObject
* exception handling/unwinding entry points
* modified versions of handle/unwind exception stubs using standard calling conventions
* exception throwing
* implicit null pointer exception, implicit div by 0 exception
* arraystore/classcast/arrayindex exceptions
* checkcast implementation
* newarray, anewarray, multinewarray implementation
* correct new instance initialization
* access to java class mirrors (for ldc)
* unresolved methods
* class resolving - class patching (asssembly prototype copying)
| author | Lukas Stadler <lukas.stadler@oracle.com> |
|---|---|
| date | Tue, 31 Aug 2010 22:13:30 -0700 |
| parents | 230fac611b50 |
| children | 72cfb36c6bb2 |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Runtime1.cpp Thu Aug 19 14:34:52 2010 -0700 +++ b/src/share/vm/c1/c1_Runtime1.cpp Tue Aug 31 22:13:30 2010 -0700 @@ -173,6 +173,8 @@ case slow_subtype_check_id: case fpu2long_stub_id: case unwind_exception_id: + case c1x_unwind_exception_call_id: + case c1x_slow_subtype_check_id: #ifndef TIERED case counter_overflow_id: // Not generated outside the tiered world #endif @@ -411,6 +413,9 @@ JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* thread, oopDesc* ex, address pc, nmethod*& nm)) Handle exception(thread, ex); + if (UseC1X && exception.is_null()) { + exception = Exceptions::new_exception(thread, vmSymbols::java_lang_NullPointerException(), NULL); + } nm = CodeCache::find_nmethod(pc); assert(nm != NULL, "this is not an nmethod"); // Adjust the pc as needed/