changeset 54096:91a3ebd000a3 lworld

8218143: Merge with main, fails compiler/valhalla/valuetypes/TestNewAcmp.java Reviewed-by: thartmann
author roland
date Thu, 31 Jan 2019 17:13:14 +0100
parents 991ba5f6900b
children 6ece319093a2
files src/hotspot/share/opto/callnode.cpp
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/opto/callnode.cpp	Thu Jan 31 13:43:11 2019 +0100
+++ b/src/hotspot/share/opto/callnode.cpp	Thu Jan 31 17:13:14 2019 +0100
@@ -1020,6 +1020,10 @@
   if (method() == NULL) {
     return true; // call into runtime or uncommon trap
   }
+  Bytecodes::Code bc = jvms()->method()->java_code_at_bci(_bci);
+  if (ACmpOnValues == 3 && (bc == Bytecodes::_if_acmpeq || bc == Bytecodes::_if_acmpne)) {
+    return true;
+  }
   ciMethod* symbolic_info = jvms()->method()->get_method_at_bci(_bci);
   ciMethod* callee = method();
   if (symbolic_info->is_method_handle_intrinsic() && !callee->is_method_handle_intrinsic()) {