[CIR] Simplify LangAttr to use enum directly (llvm#1631)

Author: xlauko

clang/include/clang/CIR/Dialect/IR/CIRAttrs.td

@@ -56,19 +56,16 @@ class CIRUnitAttr<string name, string attrMnemonic, list<Trait> traits = []>
 // LangAttr
 //===----------------------------------------------------------------------===//
 
-def C : I32EnumAttrCase<"C", 1, "c">;
-def CXX : I32EnumAttrCase<"CXX", 2, "cxx">;
-def OpenCLC : I32EnumAttrCase<"OpenCLC", 3, "opencl_c">;
-
-def SourceLanguage : I32EnumAttr<"SourceLanguage", "Source language", [
-  C, CXX, OpenCLC
+def CIR_SourceLanguage : I32EnumAttr<"SourceLanguage", "Source language", [
+  I32EnumAttrCase<"C", 1, "c">,
+  I32EnumAttrCase<"CXX", 2, "cxx">,
+  I32EnumAttrCase<"OpenCLC", 3, "opencl_c">
 ]> {
   let cppNamespace = "::cir";
 }
 
-def LangAttr : CIR_Attr<"Lang", "lang"> {
+def CIR_LangAttr : CIR_Attr<"Lang", "lang"> {
   let summary = "Module source language";
-  let parameters = (ins "SourceLanguageAttr":$lang);
   let description = [{
     Represents the source language used to generate the module.
 
@@ -80,10 +77,16 @@ def LangAttr : CIR_Attr<"Lang", "lang"> {
     module attributes {cir.lang = cir.lang<cxx>} {}
     ```
   }];
-  let hasCustomAssemblyFormat = 1;
+
+  let parameters = (ins "SourceLanguage":$lang);
+
+  let assemblyFormat = [{
+    `<` $lang `>`
+  }];
+
   let extraClassDeclaration = [{
-    bool isC() const { return getLang().getValue() == SourceLanguage::C; };
-    bool isCXX() const { return getLang().getValue() == SourceLanguage::CXX; };
+    bool isC() const { return getLang() == SourceLanguage::C; };
+    bool isCXX() const { return getLang() == SourceLanguage::CXX; };
   }];
 }
 

clang/lib/CIR/CodeGen/CIRGenModule.cpp

@@ -192,9 +192,8 @@ CIRGenModule::CIRGenModule(mlir::MLIRContext &mlirContext,
   // MLIR features.
   theModule->setAttr(cir::CIRDialect::getSOBAttrName(),
                      cir::SignedOverflowBehaviorAttr::get(&mlirContext, sob));
-  auto lang = SourceLanguageAttr::get(&mlirContext, getCIRSourceLanguage());
   theModule->setAttr(cir::CIRDialect::getLangAttrName(),
-                     cir::LangAttr::get(&mlirContext, lang));
+                     cir::LangAttr::get(&mlirContext, getCIRSourceLanguage()));
   theModule->setAttr(cir::CIRDialect::getTripleAttrName(),
                      builder.getStringAttr(getTriple().str()));
 

clang/lib/CIR/Dialect/IR/CIRAttrs.cpp

@@ -170,38 +170,6 @@ LogicalResult ConstRecordAttr::verify(
   return success();
 }
 
-//===----------------------------------------------------------------------===//
-// LangAttr definitions
-//===----------------------------------------------------------------------===//
-
-Attribute LangAttr::parse(AsmParser &parser, Type odsType) {
-  auto loc = parser.getCurrentLocation();
-  if (parser.parseLess())
-    return {};
-
-  // Parse variable 'lang'.
-  llvm::StringRef lang;
-  if (parser.parseKeyword(&lang))
-    return {};
-
-  // Check if parsed value is a valid language.
-  auto langEnum = symbolizeSourceLanguage(lang);
-  if (!langEnum.has_value()) {
-    parser.emitError(loc) << "invalid language keyword '" << lang << "'";
-    return {};
-  }
-
-  if (parser.parseGreater())
-    return {};
-
-  return get(parser.getContext(),
-             SourceLanguageAttr::get(parser.getContext(), langEnum.value()));
-}
-
-void LangAttr::print(AsmPrinter &printer) const {
-  printer << "<" << getLang().getValue() << '>';
-}
-
 //===----------------------------------------------------------------------===//
 // OptInfoAttr definitions
 //===----------------------------------------------------------------------===//

clang/test/CIR/IR/invalid.cir

@@ -690,7 +690,8 @@ module {
 
 // -----
 
-// expected-error@+1 {{invalid language keyword 'dummy'}}
+// expected-error@below {{expected one of [c, cxx, opencl_c] for Source language, got: dummy}}
+// expected-error@below {{failed to parse CIR_LangAttr parameter 'lang'}}
 module attributes {cir.lang = #cir.lang<dummy>} { }
 
 // -----