Fix on SIR Dialect and Lowering

Author: ngmachado

build.zig

@@ -616,6 +616,7 @@ fn buildMlirLibrariesImpl(step: *std.Build.Step, options: std.Build.Step.MakeOpt
         "-DLLVM_ENABLE_TERMINFO=OFF",
         "-DLLVM_ENABLE_RTTI=ON",
         "-DLLVM_ENABLE_EH=ON",
+        "-DLLVM_ENABLE_PIC=ON",
         "-DLLVM_BUILD_LLVM_DYLIB=OFF",
         "-DLLVM_LINK_LLVM_DYLIB=OFF",
         "-DLLVM_BUILD_TOOLS=ON", // needed for tblgen

src/main.zig

@@ -90,7 +90,7 @@ pub fn main() !void {
     const emit_typed_ast: bool = parsed.emit_typed_ast;
     const emit_typed_ast_format: ?[]const u8 = parsed.emit_typed_ast_format;
     var emit_mlir: bool = parsed.emit_mlir;
-    const emit_mlir_sir: bool = parsed.emit_mlir_sir;
+    var emit_mlir_sir: bool = parsed.emit_mlir_sir;
     const emit_cfg: bool = parsed.emit_cfg;
     const emit_abi: bool = parsed.emit_abi;
     const emit_abi_solidity: bool = parsed.emit_abi_solidity;
@@ -146,7 +146,9 @@ pub fn main() !void {
         emit_mlir = true; // Default: emit MLIR
     }
     // By default, emit Ora MLIR plus SIR MLIR when --emit-mlir is requested.
-    // emit-mlir should stop after Ora MLIR (and validation) unless explicitly asked for SIR
+    if (emit_mlir and !emit_mlir_sir) {
+        emit_mlir_sir = true;
+    }
 
     // create MLIR options structure
     const mlir_options = MlirOptions{

src/mlir/IR/include/SIRDialect.h

@@ -9,6 +9,7 @@
 
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
+#include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Bytecode/BytecodeOpInterface.h"
 

src/mlir/IR/td/SIROps.td

@@ -50,6 +50,16 @@ def StringConstantOp : SIR_Op<"string.constant"> {
   let assemblyFormat = "$value attr-dict `:` type($res)";
 }
 
+// ==========================================================================
+// Metadata
+// ==========================================================================
+
+def ErrorDeclOp : SIR_Op<"error.decl", [NoMemoryEffect]> {
+  let summary = "Error declaration metadata";
+  let arguments = (ins StrAttr:$sym_name);
+  let assemblyFormat = "attr-dict";
+}
+
 // ==========================================================================
 // Arithmetic Operations (binary, word-wise)
 // ==========================================================================
@@ -791,33 +801,62 @@ def StaticCallOp : SIR_Op<"staticcall"> {
 // Return & termination ops.
 // You already have a ReturnOp, we keep it and add stop/revert/invalid/selfdestruct.
 
+// CFG ops.
+
+def BrOp : SIR_Op<"br", [Terminator]> {
+  let summary = "Unconditional branch";
+  let arguments = (ins Variadic<AnyType>:$destOperands);
+  let successors = (successor AnySuccessor:$dest);
+  let assemblyFormat =
+    "$dest (`(` $destOperands^ `:` type($destOperands) `)`)? attr-dict";
+}
+
+def CondBrOp : SIR_Op<"cond_br", [Terminator, AttrSizedOperandSegments]> {
+  let summary = "Conditional branch";
+  let arguments = (ins SIR_U256:$cond,
+                       Variadic<AnyType>:$trueOperands,
+                       Variadic<AnyType>:$falseOperands);
+  let successors = (successor AnySuccessor:$trueDest, AnySuccessor:$falseDest);
+  let assemblyFormat =
+    "$cond `:` type($cond) `,` $trueDest (`(` $trueOperands^ `:` type($trueOperands) `)`)? `,` "
+    "$falseDest (`(` $falseOperands^ `:` type($falseOperands) `)`)? attr-dict";
+}
+
+def SwitchOp : SIR_Op<"switch", [Terminator]> {
+  let summary = "Switch on selector";
+  let arguments = (ins SIR_U256:$selector, I64ArrayAttr:$caseValues);
+  let successors = (successor AnySuccessor:$defaultDest, VariadicSuccessor<AnySuccessor>:$caseDests);
+  let assemblyFormat =
+    "$selector `:` type($selector) `,` `[` $caseValues `]` `,` $caseDests `,` $defaultDest attr-dict";
+}
+
 def ReturnOp : SIR_Op<"return", [Terminator]> {
   let summary = "Return a pointer + size";
   let arguments = (ins SIR_Ptr:$ptr, SIR_U256:$len);
   let assemblyFormat =
     "$ptr `:` type($ptr) `,` $len `:` type($len) attr-dict";
 }
 
-def StopOp : SIR_Op<"stop"> {
+def StopOp : SIR_Op<"stop", [Terminator]> {
   let summary = "STOP";
   let arguments = (ins);
   let assemblyFormat = "attr-dict";
 }
 
-def RevertOp : SIR_Op<"revert"> {
+def RevertOp : SIR_Op<"revert", [Terminator]> {
   let summary = "REVERT";
   let arguments = (ins SIR_Ptr:$ptr, SIR_U256:$len);
   let assemblyFormat =
     "$ptr `:` type($ptr) `,` $len `:` type($len) attr-dict";
 }
 
-def InvalidOp : SIR_Op<"invalid"> {
+def InvalidOp : SIR_Op<"invalid", [Terminator]> {
   let summary = "INVALID";
   let arguments = (ins);
   let assemblyFormat = "attr-dict";
 }
 
-def SelfDestructOp : SIR_Op<"selfdestruct"> {
+def SelfDestructOp : SIR_Op<"selfdestruct", [Terminator]> {
   let summary = "SELFDESTRUCT";
   let arguments = (ins SIR_U256:$beneficiary);
   let assemblyFormat =
@@ -870,7 +909,7 @@ def NoOpOp : SIR_Op<"noop"> {
 // Internal Return
 // ==========================================================================
 
-def IRetOp : SIR_Op<"iret"> {
+def IRetOp : SIR_Op<"iret", [Terminator]> {
   let summary = "Internal function return";
   let arguments = (ins Variadic<SIR_U256Type>:$values);
   let assemblyFormat =

src/mlir/ora/lib/OraCAPI.cpp

@@ -200,6 +200,14 @@ void oraBlockAppendOwnedOperation(MlirBlock block, MlirOperation op)
             return;
         }
 
+        if (auto contractOp = llvm::dyn_cast<mlir::ora::ContractOp>(operation))
+        {
+            if (auto moduleOp = llvm::dyn_cast<mlir::ModuleOp>(blk->getParentOp()))
+            {
+                moduleOp->setLoc(contractOp.getLoc());
+            }
+        }
+
         if (blk->empty())
         {
             blk->push_back(operation);
@@ -762,6 +770,7 @@ MlirModule oraLowerContractStub(MlirContext ctx, MlirLocation loc, MlirStringRef
         builder.setInsertionPointToStart(moduleOp.getBody());
 
         auto contractOp = builder.create<ContractOp>(location, contractRef);
+        moduleOp->setLoc(contractOp.getLoc());
         auto &bodyRegion = contractOp.getBody();
         if (bodyRegion.empty())
         {
@@ -858,6 +867,7 @@ MlirModule oraLowerContractStubWithSig(
         builder.setInsertionPointToStart(moduleOp.getBody());
 
         auto contractOp = builder.create<ContractOp>(location, contractRef);
+        moduleOp->setLoc(contractOp.getLoc());
         auto &bodyRegion = contractOp.getBody();
         if (bodyRegion.empty())
         {