Avoid adding (AArch64|AMD64)SaveRegistersOp twice to basic block

PullRequest: graal/18928
oracle · Oct 1, 2024 · ebd9cd6 · ebd9cd6
2 parents 7cc26dd + f0ed502
commit ebd9cd6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/...k.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java b/...k.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java
@@ -105,7 +105,6 @@ protected void emitPrologue(StructuredGraph graph) {
  assert stub.getLinkage().getDescriptor().getTransition() != HotSpotForeignCallDescriptor.Transition.SAFEPOINT : stub;
  Register[] savedRegisters = getGen().getRegisterConfig().getAllocatableRegisters().toArray();
  AArch64SaveRegistersOp saveOp = getGen().emitSaveAllRegisters(savedRegisters);
- append(saveOp);
  result.setSaveOnEntry(saveOp);
  }
 

diff --git a/...c/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java b/...c/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java
@@ -102,7 +102,6 @@ protected void emitPrologue(StructuredGraph graph) {
  if (stub != null && stub.getLinkage().getEffect() == HotSpotForeignCallLinkage.RegisterEffect.KILLS_NO_REGISTERS) {
  assert stub.getLinkage().getDescriptor().getTransition() != HotSpotForeignCallDescriptor.Transition.SAFEPOINT : stub;
  AMD64SaveRegistersOp saveOp = getGen().emitSaveAllRegisters(false);
- append(saveOp);
  result.setSaveOnEntry(saveOp);
  }
 

diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGenerator.java
@@ -343,6 +343,8 @@ public <I extends LIRInstruction> I append(I op) {
  assert verify(op);
  ArrayList<LIRInstruction> lirForBlock = lir.getLIRforBlock(getCurrentBlock());
  op.setPosition(currentPosition);
+
+ assert !lirForBlock.contains(op) : "added " + op + " twice";
  lirForBlock.add(op);
  return op;
  }