Do not serialize the input Twine more than once

Author: jurahul

llvm/include/llvm/TableGen/CodeGenHelpers.h

@@ -22,7 +22,8 @@ namespace llvm {
 // Simple RAII helper for emitting ifdef-undef-endif scope.
 class IfDefEmitter {
 public:
-  IfDefEmitter(raw_ostream &OS, const Twine &Name) : Name(Name.str()), OS(OS) {
+  IfDefEmitter(raw_ostream &OS, const Twine &NameTwine)
+      : Name(NameTwine.str()), OS(OS) {
     OS << "#ifdef " << Name << "\n"
        << "#undef " << Name << "\n\n";
   }
@@ -36,8 +37,8 @@ class IfDefEmitter {
 // Simple RAII helper for emitting header include guard (ifndef-define-endif).
 class IncludeGuardEmitter {
 public:
-  IncludeGuardEmitter(raw_ostream &OS, const Twine &Name)
-      : Name(Name.str()), OS(OS) {
+  IncludeGuardEmitter(raw_ostream &OS, const Twine &NameTwine)
+      : Name(NameTwine.str()), OS(OS) {
     OS << "#ifndef " << Name << "\n"
        << "#define " << Name << "\n\n";
   }
@@ -53,8 +54,8 @@ class IncludeGuardEmitter {
 // namespace scope.
 class NamespaceEmitter {
 public:
-  NamespaceEmitter(raw_ostream &OS, const Twine &NameUntrimmed)
-      : Name(trim(NameUntrimmed)), OS(OS) {
+  NamespaceEmitter(raw_ostream &OS, const Twine &NameTwine)
+      : Name(trim(NameTwine)), OS(OS) {
     if (!Name.empty())
       OS << "namespace " << Name << " {\n";
   }
@@ -76,8 +77,8 @@ class NamespaceEmitter {
   // }
   //
   // and cannot use "namespace ::mlir::toy".
-  static std::string trim(const Twine &NameUntrimmed) {
-    std::string Name = NameUntrimmed.str();
+  static std::string trim(const Twine &NameTwine) {
+    std::string Name = NameTwine.str();
     StringRef StrRef = Name;
     StrRef.consume_front("::");
     return StrRef.str();

mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp

@@ -4938,7 +4938,7 @@ static void emitOpDefShard(const RecordKeeper &records,
                            ArrayRef<const Record *> defs,
                            const Dialect &dialect, unsigned shardIndex,
                            unsigned shardCount, raw_ostream &os) {
-  IfDefEmitter scope(os, Twine("GET_OP_DEFS_") + Twine(shardIndex));
+  IfDefEmitter scope(os, "GET_OP_DEFS_" + Twine(shardIndex));
 
   // Emit the op registration hook in the first shard.
   const char *const opRegistrationHook =