archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8144091: CompilerControl: directive file doesn't override inlining rules

Browse source 
Fix correct overrides

Reviewed-by: roland
This commit is contained in:
Nils Eliasson 2015-12-09 13:37:59 +01:00
parent 2bb757d0eb
commit 74cff677d4
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hotspot/src/share/vm/compiler/compilerDirectives.cpp
View file

@ -313,7 +313,7 @@ CompilerDirectives* DirectiveSet::directive() {
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 @@ bool DirectiveSet::should_inline(ciMethod* inlinee) {
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 @@ bool DirectiveSet::should_not_inline(ciMethod* inlinee) {
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;
}