From 03fc0aaedae03519619b10d2335f3839b9330665 Mon Sep 17 00:00:00 2001
From: ghehg <he.guojin@gmail.com>
Date: Fri, 13 Sep 2024 13:44:40 -0700
Subject: [PATCH] some more invalid tests and tidy

---
 clang/lib/CIR/Dialect/IR/CIRAttrs.cpp               | 1 +
 clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp | 2 +-
 clang/test/CIR/IR/invalid-annotations.cir           | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/clang/lib/CIR/Dialect/IR/CIRAttrs.cpp b/clang/lib/CIR/Dialect/IR/CIRAttrs.cpp
index 0cdb8d36b5bc..2dfc0db372f6 100644
--- a/clang/lib/CIR/Dialect/IR/CIRAttrs.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRAttrs.cpp
@@ -547,6 +547,7 @@ void MethodAttr::print(AsmPrinter &printer) const {
 //===----------------------------------------------------------------------===//
 // GlobalAnnotationValuesAttr definitions
 //===----------------------------------------------------------------------===//
+
 LogicalResult GlobalAnnotationValuesAttr::verify(
     function_ref<::mlir::InFlightDiagnostic()> emitError,
     mlir::ArrayAttr annotations) {
diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
index fd2db0cae225..c0df80c7e947 100644
--- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
+++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
@@ -2044,7 +2044,7 @@ class CIRGlobalOpLowering
     // Rewrite op.
     auto llvmGlobalOp = rewriter.replaceOpWithNewOp<mlir::LLVM::GlobalOp>(
         op, llvmType, isConst, linkage, symbol, init.value(),
-        /*alignment*/op.getAlignment().value_or(0),
+        /*alignment*/ op.getAlignment().value_or(0),
         /*addrSpace*/ getGlobalOpTargetAddrSpace(op),
         /*dsoLocal*/ false, /*threadLocal*/ (bool)op.getTlsModelAttr(),
         /*comdat*/ mlir::SymbolRefAttr(), attributes);
diff --git a/clang/test/CIR/IR/invalid-annotations.cir b/clang/test/CIR/IR/invalid-annotations.cir
index 6d9f11a7ecfa..e67efaa9dbbf 100644
--- a/clang/test/CIR/IR/invalid-annotations.cir
+++ b/clang/test/CIR/IR/invalid-annotations.cir
@@ -1,6 +1,13 @@
 // Test attempt to construct ill-formed global annotations
 // RUN: cir-opt %s -verify-diagnostics -split-input-file
 
+
+// expected-error @below {{invalid kind of attribute specified}}
+// expected-error @below {{failed to parse AnnotationAttr parameter 'name' which is to be a `StringAttr`}}
+cir.global  external @a = #cir.ptr<null> : !cir.ptr<!cir.double> [#cir.annotation<name = 18, args = ["21", 12 : i32]>]
+
+// -----
+
 // expected-error @below {{GlobalAnnotationValuesAttr should at least have one annotation}}
 module attributes {cir.global_annotations = #cir<annotation_values []>} {}