Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/sharedRuntime.cpp @ 22298:c28cb37b2e1d
Rename JVMCI to INCLUDE_JVMCI.
author | twisti |
---|---|
date | Wed, 22 Jul 2015 08:56:03 -0700 |
parents | be896a1983c0 |
children | 7eda81bed2f3 |
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.cpp Wed Jul 22 15:50:08 2015 +0200 +++ b/src/share/vm/runtime/sharedRuntime.cpp Wed Jul 22 08:56:03 2015 -0700 @@ -111,7 +111,7 @@ _resolve_virtual_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_virtual_call_C), "resolve_virtual_call"); _resolve_static_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_static_call_C), "resolve_static_call"); -#if defined(COMPILER2) || defined(JVMCI) +#if defined(COMPILER2) || INCLUDE_JVMCI // Vectors are generated only by C2 and JVMCI. bool support_wide = is_wide_vector(MaxVectorSize); if (support_wide) { @@ -488,7 +488,7 @@ // Reset method handle flag. thread->set_is_method_handle_return(false); -#ifdef JVMCI +#if INCLUDE_JVMCI // JVMCI's ExceptionHandlerStub expects the thread local exception PC to be clear // and other exception handler continuations do not read it thread->set_exception_pc(NULL); @@ -650,7 +650,7 @@ assert(nm != NULL, "must exist"); ResourceMark rm; -#ifdef JVMCI +#if INCLUDE_JVMCI if (nm->is_compiled_by_jvmci()) { // lookup exception handler for this pc int catch_pco = ret_pc - nm->code_begin(); @@ -795,7 +795,7 @@ throw_and_post_jvmti_exception(thread, exception); JRT_END -#ifdef JVMCI +#if INCLUDE_JVMCI address SharedRuntime::deoptimize_for_implicit_exception(JavaThread* thread, address pc, nmethod* nm, int deopt_reason) { assert(deopt_reason > Deoptimization::Reason_none && deopt_reason < Deoptimization::Reason_LIMIT, "invalid deopt reason"); thread->set_jvmci_implicit_exception_pc(pc); @@ -901,7 +901,7 @@ #ifndef PRODUCT _implicit_null_throws++; #endif -#ifdef JVMCI +#if INCLUDE_JVMCI if (nm->is_compiled_by_jvmci() && nm->pc_desc_at(pc) != NULL) { // If there's no PcDesc then we'll die way down inside of // deopt instead of just getting normal error reporting, @@ -910,7 +910,7 @@ } else { #endif target_pc = nm->continuation_for_implicit_exception(pc); -#ifdef JVMCI +#if INCLUDE_JVMCI } #endif // If there's an unexpected fault, target_pc might be NULL, @@ -928,13 +928,13 @@ #ifndef PRODUCT _implicit_div0_throws++; #endif -#ifdef JVMCI +#if INCLUDE_JVMCI if (nm->is_compiled_by_jvmci() && nm->pc_desc_at(pc) != NULL) { return deoptimize_for_implicit_exception(thread, pc, nm, Deoptimization::Reason_div0_check); } else { #endif target_pc = nm->continuation_for_implicit_exception(pc); -#ifdef JVMCI +#if INCLUDE_JVMCI } #endif // If there's an unexpected fault, target_pc might be NULL, @@ -1013,7 +1013,7 @@ JRT_ENTRY_NO_ASYNC(void, SharedRuntime::register_finalizer(JavaThread* thread, oopDesc* obj)) -#ifdef JVMCI +#if INCLUDE_JVMCI if (!obj->klass()->has_finalizer()) { return; }