fixup! [MLIR][LLVM] Fix #llvm.constant_range crashing in storage uniquer

Author: Jezurko

mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td

@@ -1094,10 +1094,8 @@ def LLVM_TBAATagArrayAttr
 // ConstantRangeAttr
 //===----------------------------------------------------------------------===//
 def LLVM_ConstantRangeAttr : LLVM_Attr<"ConstantRange", "constant_range"> {
-  let parameters = (ins
-    "uint32_t":$width,
-    "::llvm::APInt":$lower,
-    "::llvm::APInt":$upper
+  let parameters = (ins APIntParameter<"">:$lower,
+    APIntParameter<"">:$upper
   );
   let summary = "A range of two integers, corresponding to LLVM's ConstantRange";
   let description = [{
@@ -1111,16 +1109,13 @@ def LLVM_ConstantRangeAttr : LLVM_Attr<"ConstantRange", "constant_range"> {
 
     Syntax:
     ```
-    `<` `i`(width) $lower `,` $upper `>`
+    `<` `i`(wdith($lower)), $lower `,` $upper `>`
     ```
   }];
 
   let builders = [
     AttrBuilder<(ins "uint32_t":$bitWidth, "int64_t":$lower, "int64_t":$upper), [{
-      return $_get($_ctxt, bitWidth, ::llvm::APInt(bitWidth, lower), ::llvm::APInt(bitWidth, upper));
-    }]>,
-    AttrBuilder<(ins "::llvm::APInt":$lower, "::llvm::APInt":$upper), [{
-      return $_get($_ctxt, lower.getBitWidth(), lower, upper);
+      return $_get($_ctxt, ::llvm::APInt(bitWidth, lower), ::llvm::APInt(bitWidth, upper));
     }]>
   ];
 

mlir/include/mlir/IR/AttrTypeBase.td

@@ -383,6 +383,12 @@ class StringRefParameter<string desc = "", string value = ""> :
   let defaultValue = value;
 }
 
+// For APInts, which require comparison over different bitwidths
+class APIntParameter<string desc> :
+    AttrOrTypeParameter<"::llvm::APInt", desc> {
+  let comparator = "$_lhs.getBitWidth() == $_rhs.getBitWidth() && $_lhs == $_rhs";
+}
+
 // For APFloats, which require comparison.
 class APFloatParameter<string desc> :
     AttrOrTypeParameter<"::llvm::APFloat", desc> {

mlir/lib/Dialect/LLVMIR/IR/LLVMAttrs.cpp

@@ -278,18 +278,13 @@ Attribute ConstantRangeAttr::parse(AsmParser &parser, Type odsType) {
 }
 
 void ConstantRangeAttr::print(AsmPrinter &printer) const {
-  printer << "<i" << getWidth() << ", " << getLower() << ", " << getUpper()
-          << ">";
+  printer << "<i" << getLower().getBitWidth() << ", " << getLower() << ", "
+          << getUpper() << ">";
 }
 
 LogicalResult
 ConstantRangeAttr::verify(llvm::function_ref<InFlightDiagnostic()> emitError,
-                          uint32_t width, llvm::APInt lower,
-                          llvm::APInt upper) {
-  if (width != lower.getBitWidth())
-    return emitError()
-           << "expected type and value to have matching bitwidths but got "
-           << width << " vs. " << lower.getBitWidth();
+                          llvm::APInt lower, llvm::APInt upper) {
   if (lower.getBitWidth() != upper.getBitWidth())
     return emitError()
            << "expected lower and upper to have matching bitwidths but got "