When generating C++ code, use C++ string escaping.

[jpienaar]

Could you add a test where this difference let to a bug that could be used for regression testing?

[rdzhabarov]

I also see similar method used here and there across the codebase. Might be good to expose this as a utility method and reuse.

[Mogball]

Yeah, I agree. You can probably move this to mlir/TableGen/CodeGenHelpers.h and unify it with the other version in RewriterGen.cpp.

[matthiaskramm]

Thanks for the quick review!

Moved escapeString() into CodeGenHelpers.cpp, and added a test.

[matthiaskramm]

Adjust commit description.

[Mogball]

mlir/tools/mlir-tblgen/CodeGenHelpers.cpp

141–149 ↗

(On Diff #382127)

Function definitions shouldn't be enclosed in namespaces.

[matthiaskramm]

Fold namespaces into prototype.

[matthiaskramm]

Make opL test case slightly more realistic.

[Mogball]

Thanks

mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp

static std::string replaceAllSubstrs(std::string str, const std::string &match,
   std::string::size_type scanLoc = 0, matchLoc = std::string::npos;
   while ((matchLoc = str.find(match, scanLoc)) != std::string::npos) {
     str = str.replace(matchLoc, match.size(), substitute);
     scanLoc = matchLoc + substitute.size();
   }
   return str;
 }
 
-// Escape a string using LLVM/MLIR encoding. E.g. foo"bar -> foo\22bar.
+// Escape a string using C++ encoding. E.g. foo"bar -> foo\x22bar.
 static std::string escapeString(StringRef value) {
   std::string ret;
   llvm::raw_string_ostream os(ret);
-  llvm::printEscapedString(value, os);
+  os.write_escaped(value);
   return os.str();
 }
 
 // Returns whether the record has a value of the given name that can be returned
 // via getValueAsString.
 static inline bool hasStringAttribute(const Record &record,
                                       StringRef fieldName) {
   auto valueInit = record.getValueInit(fieldName);