Do not serialize the input Twine more than once

Author: jurahul

llvm/include/llvm/TableGen/CodeGenHelpers.h

@@ -13,6 +13,7 @@
 #ifndef LLVM_TABLEGEN_CODEGENHELPERS_H
 #define LLVM_TABLEGEN_CODEGENHELPERS_H
 
+#include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/raw_ostream.h"
@@ -23,8 +24,8 @@ namespace llvm {
 class IfDefEmitter {
 public:
   IfDefEmitter(raw_ostream &OS, const Twine &Name) : Name(Name.str()), OS(OS) {
-    OS << "#ifdef " << Name << "\n"
-       << "#undef " << Name << "\n\n";
+    OS << "#ifdef " << this->Name << "\n"
+       << "#undef " << this->Name << "\n\n";
   }
   ~IfDefEmitter() { OS << "\n#endif // " << Name << "\n\n"; }
 
@@ -38,8 +39,8 @@ class IncludeGuardEmitter {
 public:
   IncludeGuardEmitter(raw_ostream &OS, const Twine &Name)
       : Name(Name.str()), OS(OS) {
-    OS << "#ifndef " << Name << "\n"
-       << "#define " << Name << "\n\n";
+    OS << "#ifndef " << this->Name << "\n"
+       << "#define " << this->Name << "\n\n";
   }
   ~IncludeGuardEmitter() { OS << "\n#endif // " << Name << "\n"; }
 
@@ -53,10 +54,10 @@ class IncludeGuardEmitter {
 // namespace scope.
 class NamespaceEmitter {
 public:
-  NamespaceEmitter(raw_ostream &OS, const Twine &NameUntrimmed)
-      : Name(trim(NameUntrimmed)), OS(OS) {
-    if (!Name.empty())
-      OS << "namespace " << Name << " {\n";
+  NamespaceEmitter(raw_ostream &OS, const Twine &Name)
+      : Name(trim(Name)), OS(OS) {
+    if (!this->Name.empty())
+      OS << "namespace " << this->Name << " {\n";
   }
 
   ~NamespaceEmitter() { close(); }
@@ -76,9 +77,9 @@ class NamespaceEmitter {
   // }
   //
   // and cannot use "namespace ::mlir::toy".
-  static std::string trim(const Twine &NameUntrimmed) {
-    std::string Name = NameUntrimmed.str();
-    StringRef StrRef = Name;
+  static std::string trim(const Twine &Name) {
+    SmallString<64> Storage;
+    StringRef StrRef = Name.toStringRef(Storage);
     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 =