changeset 24224:3aed4cb813f4 jvmci-0.33

HotSpotResolvedJavaMethodImpl.hasNeverInlineDirective should respect Inline VM flag (JDK-8186235)
author Doug Simon <doug.simon@oracle.com>
date Fri, 18 Aug 2017 22:29:16 +0200
parents 1f8fa81f0c7d
children a2dbb6fcc923
files src/share/vm/jvmci/jvmciCompilerToVM.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Fri Aug 18 22:27:34 2017 +0200
+++ b/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Fri Aug 18 22:29:16 2017 +0200
@@ -738,7 +738,7 @@
 
 C2V_VMENTRY(jboolean, hasNeverInlineDirective,(JNIEnv *, jobject, jobject jvmci_method))
   methodHandle method = CompilerToVM::asMethod(jvmci_method);
-  return CompilerOracle::should_not_inline(method) || method->dont_inline();
+  return !Inline || CompilerOracle::should_not_inline(method) || method->dont_inline();
 C2V_END
 
 C2V_VMENTRY(jboolean, shouldInlineMethod,(JNIEnv *, jobject, jobject jvmci_method))