Mercurial > hg > openjdk > jdk9 > hotspot

changeset 9797:78d3a49f182b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8144091: CompilerControl: directive file doesn't override inlining rules Summary: Fix correct overrides Reviewed-by: roland
author neliasso
date Wed, 09 Dec 2015 13:37:59 +0100
parents 5225495dfa66
children 1c9c87f80696 5f331a6a4b26
files src/share/vm/compiler/compilerDirectives.cpp
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/compiler/compilerDirectives.cpp	Wed Dec 16 15:39:11 2015 +0100
+++ b/src/share/vm/compiler/compilerDirectives.cpp	Wed Dec 09 13:37:59 2015 +0100
@@ -313,7 +313,7 @@
 
 bool DirectiveSet::matches_inline(methodHandle method, int inline_action) {
   if (_inlinematchers != NULL) {
-    if (_inlinematchers->match(method, InlineMatcher::force_inline)) {
+    if (_inlinematchers->match(method, inline_action)) {
       return true;
     }
   }
@@ -325,11 +325,11 @@
   VM_ENTRY_MARK;
   methodHandle mh(THREAD, inlinee->get_Method());
 
-  if (matches_inline(mh, InlineMatcher::force_inline)) {
-    return true;
+  if (_inlinematchers != NULL) {
+    return matches_inline(mh, InlineMatcher::force_inline);
   }
-  if (!CompilerDirectivesIgnoreCompileCommandsOption && CompilerOracle::should_inline(mh)) {
-    return true;
+  if (!CompilerDirectivesIgnoreCompileCommandsOption) {
+    return CompilerOracle::should_inline(mh);
   }
   return false;
 }
@@ -339,11 +339,11 @@
   VM_ENTRY_MARK;
   methodHandle mh(THREAD, inlinee->get_Method());
 
-  if (matches_inline(mh, InlineMatcher::dont_inline)) {
-    return true;
+  if (_inlinematchers != NULL) {
+    return matches_inline(mh, InlineMatcher::dont_inline);
   }
-  if (!CompilerDirectivesIgnoreCompileCommandsOption && CompilerOracle::should_not_inline(mh)) {
-    return true;
+  if (!CompilerDirectivesIgnoreCompileCommandsOption) {
+    return CompilerOracle::should_not_inline(mh);
   }
   return false;
 }