changeset 23317:1fe52e24abe2

JVMCI should check is_not_compilable only for CompLevel_full_optimization
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Tue, 08 Mar 2016 10:01:28 -0800
parents c0df579bf9db
children 293eb76b86d3
files src/share/vm/jvmci/jvmciCompilerToVM.cpp
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Tue Mar 08 09:41:10 2016 +0100
+++ b/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Tue Mar 08 10:01:28 2016 -0800
@@ -285,7 +285,14 @@
 
 C2V_VMENTRY(jboolean, canInlineMethod,(JNIEnv *, jobject, jobject jvmci_method))
   methodHandle method = CompilerToVM::asMethod(jvmci_method);
-  return !method->is_not_compilable() && !CompilerOracle::should_not_inline(method) && !method->dont_inline();
+#ifdef COMPILER_JVMCI
+  bool is_compilable = !method->is_not_compilable(CompLevel_full_optimization);
+#else
+  // In hosted mode ignore the not_compilable flags since they are never set by
+  // the JVMCI compiler.
+  bool is_compilable = true;
+#endif
+  return is_compilable && !CompilerOracle::should_not_inline(method) && !method->dont_inline();
 C2V_END
 
 C2V_VMENTRY(jboolean, shouldInlineMethod,(JNIEnv *, jobject, jobject jvmci_method))