[NFC][Emit] Replace body with bodyRegion

elhewaty · Mar 11, 2024 · 4d5dab5 · 4d5dab5
1 parent 2e23cda
commit 4d5dab5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/include/circt/Dialect/Emit/EmitOps.td b/include/circt/Dialect/Emit/EmitOps.td
@@ -35,14 +35,14 @@ def FileOp : EmitOp<"file", [
     filename through an optional symbol.
   }];
 
-  let regions = (region SizedRegion<1>:$body);
+  let regions = (region SizedRegion<1>:$bodyRegion);
   let arguments = (ins
     StrAttr:$file_name,
     OptionalAttr<SymbolNameAttr>:$sym_name
   );
   let results = (outs);
 
-  let assemblyFormat = "$file_name (`sym` $sym_name^)? $body attr-dict";
+  let assemblyFormat = "$file_name (`sym` $sym_name^)? $bodyRegion attr-dict";
 
   let skipDefaultBuilders = 1;
   let builders = [
@@ -61,9 +61,6 @@ def FileOp : EmitOp<"file", [
   let extraClassDeclaration = [{
     // SymbolOpInterface
     static bool isOptionalSymbol() { return true; }
-
-    // Utilities
-    Block *getBodyBlock() { return &getBodyRegion().front(); }
   }];
 }
 

diff --git a/lib/Conversion/ExportVerilog/ExportVerilog.cpp b/lib/Conversion/ExportVerilog/ExportVerilog.cpp
@@ -6048,7 +6048,7 @@ class FileEmitter : public EmitterBase {
 };
 
 void FileEmitter::emit(emit::FileOp op) {
-  for (Operation &op : *op.getBodyBlock()) {
+  for (Operation &op : *op.getBody()) {
     TypeSwitch<Operation *>(&op)
         .Case<emit::VerbatimOp, emit::RefOp>([&](auto op) { emitOp(op); })
         .Case<VerbatimOp, IfDefOp, MacroDefOp>(

diff --git a/lib/Dialect/FIRRTL/Transforms/ExtractInstances.cpp b/lib/Dialect/FIRRTL/Transforms/ExtractInstances.cpp
@@ -1025,7 +1025,7 @@ void ExtractInstancesPass::createTraceFiles() {
     };
 
     auto file = getOrCreateFile(fileName);
-    auto builder = OpBuilder::atBlockEnd(file.getBodyBlock());
+    auto builder = OpBuilder::atBlockEnd(file.getBody());
     for (auto inst : insts) {
       StringRef prefix(instPrefices[inst]);
       if (prefix.empty()) {