# HG changeset patch
# User asaha
# Date 1525817903 25200
# Node ID 145e103778d349473847e5293935a9cb3b26b626
# Parent  db5c35aa48dfc63d29eec16c5cd38fd24bf39089# Parent  26aff69b585f61e7e141c260151bacfb6428fdbc
Merge

diff -r db5c35aa48df -r 145e103778d3 .hgtags
--- a/.hgtags	Tue May 08 11:50:49 2018 -0700
+++ b/.hgtags	Tue May 08 15:18:23 2018 -0700
@@ -1156,6 +1156,8 @@
 653d9e0cd3f4023675c9eece7f0d563287f1d34f jdk8u172-b02
 771d9e1fbe1ae2ec4d5d937ebcbfd18e9c800098 jdk8u172-b03
 efd7a4e211e8fddf52053d4b033d8d307f356bc3 jdk8u172-b04
+5587cde50bbc2aa031aefb47eaa36b041f5e7c4b jdk8u181-b00
+8f3131e04030eb35434a27c1a0866fc3651af6d5 jdk8u191-b00
 4235fb1dceebde1192498ef388a32e56b1ed5a46 jdk8u172-b05
 68b234d5df6f01f3c677a114ecd6878c25f23f3c jdk8u172-b06
 a311a45523b19d59f77e76b0441a2085bb5355c8 jdk8u172-b07
@@ -1163,6 +1165,9 @@
 aafd1bb21e2636ba982d3eae162f5c635a1df03a jdk8u172-b09
 dcd3ace969fcde4eedaddba629647656289d4264 jdk8u172-b10
 083a9d6562100353708e4b73656282b21a78f714 jdk8u172-b11
+6e2be123a2e1c7671086c767e79ffe8ad5d4f9ca jdk8u181-b01
+1d0b6fcff115a57ca02081da84589630ba282789 jdk8u181-b02
+1127faef22f14d56cdd6c0c8bded598f492c2611 jdk8u181-b03
 d5a33d109309138a1e9bed43d2a2bda04356dbac jdk8u172-b31
 b62c44a689e4d339b1129bffceee94119c84b1b2 jdk8u172-b32
 e8745ad08d55bb56b2ac5a70ec0a972c38fa6ca2 jdk8u172-b33
diff -r db5c35aa48df -r 145e103778d3 test/compiler/loopopts/TestCMovSplitThruPhi.java
--- a/test/compiler/loopopts/TestCMovSplitThruPhi.java	Tue May 08 11:50:49 2018 -0700
+++ b/test/compiler/loopopts/TestCMovSplitThruPhi.java	Tue May 08 15:18:23 2018 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8187822
  * @summary C2 conditonal move optimization might create broken graph
- * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestCMovSplitThruPhi::not_inlined -XX:CompileOnly=TestCMovSplitThruPhi::test -XX:-LoopUnswitching TestCMovSplitThruPhi
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestCMovSplitThruPhi::not_inlined -XX:CompileOnly=TestCMovSplitThruPhi::test -XX:-LoopUnswitching TestCMovSplitThruPhi
  *
  */