[EVM] Support immutables in new stackification algorithm

Signed-off-by: Vladimir Radosavljevic <[email protected]>
matter-labs · Feb 6, 2025 · 0ea80f9 · 0ea80f9
1 parent 0aeb883
commit 0ea80f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/llvm/lib/Target/EVM/EVMStackModel.cpp b/llvm/lib/Target/EVM/EVMStackModel.cpp
@@ -167,6 +167,7 @@ void EVMStackModel::createOperation(MachineInstr &MI,
   case EVM::DATASIZE:
   case EVM::DATAOFFSET:
   case EVM::LINKERSYMBOL:
+  case EVM::LOADIMMUTABLE:
     // The copy/data instructions just represent an assignment. This case is
     // handled below.
     break;
@@ -194,7 +195,8 @@ void EVMStackModel::createOperation(MachineInstr &MI,
   } break;
   case EVM::DATASIZE:
   case EVM::DATAOFFSET:
-  case EVM::LINKERSYMBOL: {
+  case EVM::LINKERSYMBOL:
+  case EVM::LOADIMMUTABLE: {
     const Register DefReg = MI.getOperand(0).getReg();
     MCSymbol *Sym = MI.getOperand(1).getMCSymbol();
     Input.push_back(getSymbolSlot(Sym, &MI));

diff --git a/llvm/lib/Target/EVM/EVMStackifyCodeEmitter.cpp b/llvm/lib/Target/EVM/EVMStackifyCodeEmitter.cpp
@@ -116,7 +116,8 @@ void EVMStackifyCodeEmitter::CodeEmitter::emitSymbol(const MachineInstr *MI,
                                                      MCSymbol *Symbol) {
   unsigned Opc = MI->getOpcode();
   assert(Opc == EVM::DATASIZE || Opc == EVM::DATAOFFSET ||
-         Opc == EVM::LINKERSYMBOL && "Unexpected symbol instruction");
+         Opc == EVM::LINKERSYMBOL ||
+         Opc == EVM::LOADIMMUTABLE && "Unexpected symbol instruction");
   StackHeight += 1;
   // This is codegen-only instruction, that will be converted into PUSH4.
   auto NewMI = BuildMI(*CurMBB, CurMBB->end(), MI->getDebugLoc(),