Merge

Mon, 19 Mar 2018 16:50:06 -0700

author
asaha
date
Mon, 19 Mar 2018 16:50:06 -0700
changeset 9383
c8ac3eba6d80
parent 9382
12204b54d3dc
parent 9378
5c8850842a92
child 9387
a98d34a0eca8

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Mar 19 13:23:53 2018 -0700
     1.2 +++ b/.hgtags	Mon Mar 19 16:50:06 2018 -0700
     1.3 @@ -1152,6 +1152,7 @@
     1.4  653d9e0cd3f4023675c9eece7f0d563287f1d34f jdk8u172-b02
     1.5  771d9e1fbe1ae2ec4d5d937ebcbfd18e9c800098 jdk8u172-b03
     1.6  efd7a4e211e8fddf52053d4b033d8d307f356bc3 jdk8u172-b04
     1.7 +5587cde50bbc2aa031aefb47eaa36b041f5e7c4b jdk8u181-b00
     1.8  4235fb1dceebde1192498ef388a32e56b1ed5a46 jdk8u172-b05
     1.9  68b234d5df6f01f3c677a114ecd6878c25f23f3c jdk8u172-b06
    1.10  a311a45523b19d59f77e76b0441a2085bb5355c8 jdk8u172-b07
     2.1 --- a/test/compiler/loopopts/TestCMovSplitThruPhi.java	Mon Mar 19 13:23:53 2018 -0700
     2.2 +++ b/test/compiler/loopopts/TestCMovSplitThruPhi.java	Mon Mar 19 16:50:06 2018 -0700
     2.3 @@ -25,7 +25,7 @@
     2.4   * @test
     2.5   * @bug 8187822
     2.6   * @summary C2 conditonal move optimization might create broken graph
     2.7 - * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestCMovSplitThruPhi::not_inlined -XX:CompileOnly=TestCMovSplitThruPhi::test -XX:-LoopUnswitching TestCMovSplitThruPhi
     2.8 + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestCMovSplitThruPhi::not_inlined -XX:CompileOnly=TestCMovSplitThruPhi::test -XX:-LoopUnswitching TestCMovSplitThruPhi
     2.9   *
    2.10   */
    2.11  

mercurial