8293798: Fix test bugs due to incompatibility with -XX:+AlwaysIncrementalInline
Reviewed-by: kvn, thartmann, chagedorn
This commit is contained in:
parent
cb72f80925
commit
12e3510f63
@ -70,7 +70,7 @@ public class TestInliningProtectionDomain extends InliningBase {
|
||||
Asserts.assertTrue(inlineesReplay.get(0).compare("compiler.ciReplay.ProtectionDomainTestNoOtherCompilationPrivate", "bar", inlineesReplay.get(0).isDisallowedByReplay()));
|
||||
} else {
|
||||
Asserts.assertTrue(inlineesNormal.get(4).compare("compiler.ciReplay.InliningBar", "bar2", inlineesNormal.get(4).isNormalInline()));
|
||||
Asserts.assertTrue(inlineesReplay.get(4).compare("compiler.ciReplay.InliningBar", "bar2", inlineesReplay.get(4).isForcedByReplay()));
|
||||
Asserts.assertTrue(inlineesReplay.get(4).compare("compiler.ciReplay.InliningBar", "bar2", inlineesReplay.get(4).isForcedByReplay() || inlineesReplay.get(4).isForcedIncrementalInlineByReplay()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -37,6 +37,7 @@
|
||||
* -Xmixed -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:CompileThreshold=1000
|
||||
* -XX:+UnlockExperimentalVMOptions -XX:PerMethodTrapLimit=100 -XX:-StressReflectiveCode
|
||||
* -XX:+UncommonNullCast -XX:-StressMethodHandleLinkerInlining -XX:TypeProfileLevel=0
|
||||
* -XX:-AlwaysIncrementalInline
|
||||
* -XX:CompileCommand=exclude,compiler.intrinsics.klass.CastNullCheckDroppingsTest::runTest
|
||||
* compiler.intrinsics.klass.CastNullCheckDroppingsTest
|
||||
*/
|
||||
|
@ -36,6 +36,7 @@
|
||||
* -Xbatch -XX:-UseOnStackReplacement -XX:-TieredCompilation
|
||||
* -XX:+UnlockExperimentalVMOptions -XX:PerMethodTrapLimit=100 -XX:PerBytecodeTrapLimit=4
|
||||
* -XX:TypeProfileLevel=0
|
||||
* -XX:-AlwaysIncrementalInline
|
||||
* -XX:CompileCommand=compileonly,compiler.uncommontrap.Decompile::uncommonTrap
|
||||
* -XX:CompileCommand=inline,compiler.uncommontrap.Decompile*::foo
|
||||
* compiler.uncommontrap.Decompile
|
||||
|
Loading…
Reference in New Issue
Block a user