[clang] 52bc117 - [CIR] Derive lowering attr names from cppClassName, not the def name (#220891)

[via cfe-commits]

Author: Henrich Lauko
Date: 2026-09-07T22:54:03+02:00
New Revision: 52bc117e7930694fed38d2ffb327f77e8bd8a474

URL: https://github.com/llvm/llvm-project/commit/52bc117e7930694fed38d2ffb327f77e8bd8a474
DIFF: https://github.com/llvm/llvm-project/commit/52bc117e7930694fed38d2ffb327f77e8bd8a474.diff

LOG: [CIR] Derive lowering attr names from cppClassName, not the def name (#220891)

CIRLoweringEmitter built its CXX_ABI_ALWAYS_LEGAL_ATTRS entries with
GetOpCppClassName, which splits the TableGen def name at the first
underscore. That works only while every def is named
CIR_<CppClassName>Attr.
When one is not, the emitter writes an `isa<>` for a class that does not
exist, and the failure lands as a compile error in generated code.

Attributes carry the authoritative name in cppClassName, which
GenerateAttrToValueVisitor was already reading. Factor that out as
GetAttrCppClassRef and use it for both attribute paths.
GetOpCppClassName
stays for operations.

Added: 
    

Modified: 
    clang/utils/TableGen/CIRLoweringEmitter.cpp

Removed: 
    


################################################################################
diff  --git a/clang/utils/TableGen/CIRLoweringEmitter.cpp b/clang/utils/TableGen/CIRLoweringEmitter.cpp
index f67c37b9e1870..39be43a337c74 100644
--- a/clang/utils/TableGen/CIRLoweringEmitter.cpp
+++ b/clang/utils/TableGen/CIRLoweringEmitter.cpp
@@ -62,6 +62,19 @@ std::string GetOpCppClassName(const Record *OpRecord) {
   return CppClassName.str();
 }
 
+// Returns the namespace-qualified C++ class name of an attribute. Unlike
+// operations, attributes carry the authoritative name in cppClassName, so the
+// def name is free to 
diff er from it.
+std::string GetAttrCppClassRef(const Record *AttrRecord) {
+  StringRef Ns =
+      AttrRecord->getValueAsDef("dialect")->getValueAsString("cppNamespace");
+  Ns.consume_front("::");
+  std::string CppClassRef = Ns.str();
+  CppClassRef += "::";
+  CppClassRef += AttrRecord->getValueAsString("cppClassName");
+  return CppClassRef;
+}
+
 std::string GetOpABILoweringPatternName(llvm::StringRef OpName) {
   std::string Name = "CIR";
   Name += OpName;
@@ -286,19 +299,13 @@ void Generate(const Record *OpRecord) {
 }
 
 void GenerateCIREnumAttrs(const Record *Record) {
-  std::string OpName = GetOpCppClassName(Record);
   // EnumAttr is in a separate hierarchy, so we have to set these separately, as
   // they never have an 'illegal' CXXABI type in them.
-  CXXABILoweringAttrAlwaysLegal.push_back("cir::" + OpName);
+  CXXABILoweringAttrAlwaysLegal.push_back(GetAttrCppClassRef(Record));
 }
 
 void GenerateAttrToValueVisitor(const Record *Rec) {
-  const Record *DialectRec = Rec->getValueAsDef("dialect");
-  llvm::StringRef Ns = DialectRec->getValueAsString("cppNamespace");
-  Ns.consume_front("::");
-  std::string CppClassRef = Ns.str();
-  CppClassRef += "::";
-  CppClassRef += Rec->getValueAsString("cppClassName");
+  std::string CppClassRef = GetAttrCppClassRef(Rec);
 
   std::string CodeBuffer;
   llvm::raw_string_ostream Code(CodeBuffer);
@@ -327,9 +334,8 @@ void GenerateAttrToValueVisitFunc() {
 }
 
 void GenerateCIRAttrs(const Record *Record) {
-  std::string OpName = GetOpCppClassName(Record);
   if (!Record->getValueAsBit("canHaveIllegalCXXABIType"))
-    CXXABILoweringAttrAlwaysLegal.push_back("cir::" + OpName);
+    CXXABILoweringAttrAlwaysLegal.push_back(GetAttrCppClassRef(Record));
   if (Record->getValueAsBit("hasAttrToValueLowering"))
     GenerateAttrToValueVisitor(Record);
 }