Merge

Thu, 08 Feb 2018 19:33:31 +0000

author
asaha
date
Thu, 08 Feb 2018 19:33:31 +0000
changeset 9377
085c8d443b99
parent 9376
012197c66a78
parent 9371
71754d34845c
child 9378
5c8850842a92

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Feb 07 13:57:42 2018 -0800
     1.2 +++ b/.hgtags	Thu Feb 08 19:33:31 2018 +0000
     1.3 @@ -1145,4 +1145,5 @@
     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
     2.1 --- a/test/compiler/loopopts/TestCMovSplitThruPhi.java	Wed Feb 07 13:57:42 2018 -0800
     2.2 +++ b/test/compiler/loopopts/TestCMovSplitThruPhi.java	Thu Feb 08 19:33:31 2018 +0000
     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