[clang] [CIR] Avoid duplicate name collisions in LoweringPrepare (PR #194469)

[via cfe-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff origin/main HEAD --extensions cpp -- clang/test/CIR/CodeGen/local-const-aggregate-name-clash.cpp clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp --diff_from_common_commit
``````````

:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp b/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
index 782a7a747..06a7e6064 100644
--- a/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
+++ b/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
@@ -1720,8 +1720,8 @@ cir::GlobalOp LoweringPreparePass::getOrCreateConstAggregateGlobal(
       name.push_back('.');
       llvm::Twine(version).toVector(name);
     }
-    auto existingGv = dyn_cast_or_null<cir::GlobalOp>(
-        mlir::SymbolTable::lookupSymbolIn(
+    auto existingGv =
+        dyn_cast_or_null<cir::GlobalOp>(mlir::SymbolTable::lookupSymbolIn(
             mlirModule, mlir::StringAttr::get(&getContext(), name)));
     if (!existingGv)
       break;
@@ -1735,12 +1735,12 @@ cir::GlobalOp LoweringPreparePass::getOrCreateConstAggregateGlobal(
   // No match found, create a new global. The loop above found an unused name.
   mlir::OpBuilder::InsertionGuard guard(builder);
   builder.setInsertionPointToStart(mlirModule.getBody());
-  auto gv = cir::GlobalOp::create(
-      builder, loc, name, ty,
-      /*isConstant=*/true,
-      cir::LangAddressSpaceAttr::get(&getContext(),
-                                     cir::LangAddressSpace::Default),
-      cir::GlobalLinkageKind::PrivateLinkage);
+  auto gv =
+      cir::GlobalOp::create(builder, loc, name, ty,
+                            /*isConstant=*/true,
+                            cir::LangAddressSpaceAttr::get(
+                                &getContext(), cir::LangAddressSpace::Default),
+                            cir::GlobalLinkageKind::PrivateLinkage);
   mlir::SymbolTable::setSymbolVisibility(
       gv, mlir::SymbolTable::Visibility::Private);
   gv.setInitialValueAttr(constant);
@@ -1792,7 +1792,7 @@ void LoweringPreparePass::lowerStoreOfConstAggregate(cir::StoreOp op) {
   // Check for existing globals and create a new global with a unique name
   // if no match is found.
   cir::GlobalOp gv = getOrCreateConstAggregateGlobal(builder, op.getLoc(),
-                                                    baseName, ty, constant);
+                                                     baseName, ty, constant);
 
   // Now replace the store with get_global + copy.
   builder.setInsertionPoint(op);

``````````

</details>


https://github.com/llvm/llvm-project/pull/194469