[CIR] Upstream attributes followup

Better parameter names for `CIRBaseBuilderTy::getConstPtrAttr`

Slightly better error handling for `IntAttr::parse`

Author: dkolsen-pgi

clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h

@@ -31,11 +31,11 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
     return getPointerTo(cir::VoidType::get(getContext()));
   }
 
-  mlir::TypedAttr getConstPtrAttr(mlir::Type t, int64_t v) {
-    auto val =
-        mlir::IntegerAttr::get(mlir::IntegerType::get(t.getContext(), 64), v);
-    return cir::ConstPtrAttr::get(getContext(), mlir::cast<cir::PointerType>(t),
-                                  val);
+  mlir::TypedAttr getConstPtrAttr(mlir::Type type, int64_t value) {
+    auto valueAttr = mlir::IntegerAttr::get(
+        mlir::IntegerType::get(type.getContext(), 64), value);
+    return cir::ConstPtrAttr::get(
+        getContext(), mlir::cast<cir::PointerType>(type), valueAttr);
   }
 };
 

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

@@ -96,23 +96,27 @@ Attribute IntAttr::parse(AsmParser &parser, Type odsType) {
 
   // Fetch arbitrary precision integer value.
   if (type.isSigned()) {
-    int64_t value;
-    if (parser.parseInteger(value))
+    int64_t value = 0;
+    if (parser.parseInteger(value)) {
       parser.emitError(parser.getCurrentLocation(), "expected integer value");
-    apValue = mlir::APInt(type.getWidth(), value, type.isSigned(),
-                          /*implicitTrunc=*/true);
-    if (apValue.getSExtValue() != value)
-      parser.emitError(parser.getCurrentLocation(),
-                       "integer value too large for the given type");
+    } else {
+      apValue = mlir::APInt(type.getWidth(), value, type.isSigned(),
+                            /*implicitTrunc=*/true);
+      if (apValue.getSExtValue() != value)
+        parser.emitError(parser.getCurrentLocation(),
+                         "integer value too large for the given type");
+    }
   } else {
-    uint64_t value;
-    if (parser.parseInteger(value))
+    uint64_t value = 0;
+    if (parser.parseInteger(value)) {
       parser.emitError(parser.getCurrentLocation(), "expected integer value");
-    apValue = mlir::APInt(type.getWidth(), value, type.isSigned(),
-                          /*implicitTrunc=*/true);
-    if (apValue.getZExtValue() != value)
-      parser.emitError(parser.getCurrentLocation(),
-                       "integer value too large for the given type");
+    } else {
+      apValue = mlir::APInt(type.getWidth(), value, type.isSigned(),
+                            /*implicitTrunc=*/true);
+      if (apValue.getZExtValue() != value)
+        parser.emitError(parser.getCurrentLocation(),
+                         "integer value too large for the given type");
+    }
   }
 
   // Consume the '>' symbol.