Merge

openjdk · Jul 9, 2020 · 3dcd1c1 · 3dcd1c1
2 parents 11ba454 + 2fe15bc
commit 3dcd1c1
Show file tree

Hide file tree

Showing 81 changed files with 118 additions and 565 deletions.
diff --git a/.hgtags b/.hgtags
@@ -645,7 +645,6 @@ bcbe7b8a77b8971bc221c0be1bd2abb6fb68c2d0 jdk-16+2
 b58fc60580550a4a587cab729d8fd87223ad6932 jdk-15+29
 76810b3a88c8c641ae3850a8dfd7c40c984aea9d jdk-16+3
 6909e4a1f25bfe9a2727026f5845fc1fc44a36aa jdk-15+30
-78c07dd7240412e60d8694e9dbfd46e57bd42ee0 jdk-16+4
-78c07dd7240412e60d8694e9dbfd46e57bd42ee0 jdk-16+4
 e2622818f0bd30e736252eba101fe7d2c27f400b jdk-16+4
+a32f58c6b8be81877411767de7ba9c4cf087c1b5 jdk-15+31
 143e258f64af490010eb7e0bacc1cfaeceff0993 jdk-16+5
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
@@ -2021,8 +2021,8 @@ void PhaseOutput::ScheduleAndBundle() {
   if (!C->do_scheduling())
     return;
 
-  // Scheduling code works only with pairs (16 bytes) maximum.
-  if (C->max_vector_size() > 16)
+  // Scheduling code works only with pairs (8 bytes) maximum.
+  if (C->max_vector_size() > 8)
     return;
 
   Compile::TracePhase tp("isched", &timers[_t_instrSched]);

diff --git a/...er.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java b/...er.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java