src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java

rev 52509 : [mq]: graal

*** 856,866 ****
                                  ValueNode nextValue = objectState.getEntry(valueIndex + 1);
                                  if (value.isConstant() && value.asConstant().equals(JavaConstant.INT_0) && nextValue.isConstant() && nextValue.asConstant().equals(JavaConstant.INT_0)) {
                                      // rewrite to a zero constant of the larger kind
                                      debug.log("Rewriting entry %s to constant of larger size", valueIndex);
                                      states[i].setEntry(object, valueIndex, ConstantNode.defaultForKind(twoSlotKinds[valueIndex], graph()));
!                                     states[i].setEntry(object, valueIndex + 1, ConstantNode.forConstant(JavaConstant.forIllegal(), tool.getMetaAccessProvider(), graph()));
                                  } else {
                                      compatible = false;
                                      break outer;
                                  }
                              }
--- 856,866 ----
                                  ValueNode nextValue = objectState.getEntry(valueIndex + 1);
                                  if (value.isConstant() && value.asConstant().equals(JavaConstant.INT_0) && nextValue.isConstant() && nextValue.asConstant().equals(JavaConstant.INT_0)) {
                                      // rewrite to a zero constant of the larger kind
                                      debug.log("Rewriting entry %s to constant of larger size", valueIndex);
                                      states[i].setEntry(object, valueIndex, ConstantNode.defaultForKind(twoSlotKinds[valueIndex], graph()));
!                                     states[i].setEntry(object, valueIndex + 1, ConstantNode.forConstant(JavaConstant.forIllegal(), tool.getMetaAccess(), graph()));
                                  } else {
                                      compatible = false;
                                      break outer;
                                  }
                              }
*** 888,898 ****
                      }
                      if (twoSlotKinds != null && twoSlotKinds[valueIndex] != null) {
                          // skip an entry after a long/double value that occupies two int slots
                          valueIndex++;
                          phis[valueIndex] = null;
!                         values[valueIndex] = ConstantNode.forConstant(JavaConstant.forIllegal(), tool.getMetaAccessProvider(), graph());
                      }
                      valueIndex++;
                  }
  
                  boolean materialized = false;
--- 888,898 ----
                      }
                      if (twoSlotKinds != null && twoSlotKinds[valueIndex] != null) {
                          // skip an entry after a long/double value that occupies two int slots
                          valueIndex++;
                          phis[valueIndex] = null;
!                         values[valueIndex] = ConstantNode.forConstant(JavaConstant.forIllegal(), tool.getMetaAccess(), graph());
                      }
                      valueIndex++;
                  }
  
                  boolean materialized = false;