[CIR] Clean up visibility conversion (NFC)

[xlauko]

No description provided.

[xlauko]

• [CIR] Make CIR-to-LLVM a one shot conversion #171083
• [CIR] Implement function personality attribute and its lowering #171001
• [CIR] Clean up visibility conversion (NFC) #171000 👈 (View in Graphite)
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[llvmbot]

@llvm/pr-subscribers-clangir

Author: Henrich Lauko (xlauko)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/171000.diff

1 Files Affected:

• (modified) clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp (+5-7)

diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
index 97bd3cf850daa..cf1a7dcd77ecd 100644
--- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
+++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
@@ -2015,9 +2015,8 @@ mlir::LogicalResult CIRToLLVMFuncOpLowering::matchAndRewrite(
     fn.setAlwaysInline(*inlineKind == cir::InlineKind::AlwaysInline);
   }
 
-  fn.setVisibility_Attr(mlir::LLVM::VisibilityAttr::get(
-      getContext(), lowerCIRVisibilityToLLVMVisibility(
-                        op.getGlobalVisibilityAttr().getValue())));
+  fn.setVisibility_(lowerCIRVisibilityToLLVMVisibility(
+                        op.getGlobalVisibility()));
 
   rewriter.inlineRegionBefore(op.getBody(), fn.getBody(), fn.end());
   if (failed(rewriter.convertRegionTypes(&fn.getBody(), *typeConverter,
@@ -2161,14 +2160,13 @@ mlir::LogicalResult CIRToLLVMGlobalOpLowering::matchAndRewrite(
     }
   }
 
-  // Rewrite op.
+  mlir::LLVM::Visibility visibility = lowerCIRVisibilityToLLVMVisibility(
+      op.getGlobalVisibility());
   mlir::SymbolRefAttr comdatAttr = getComdatAttr(op, rewriter);
   auto newOp = rewriter.replaceOpWithNewOp<mlir::LLVM::GlobalOp>(
       op, llvmType, isConst, linkage, symbol, init.value_or(mlir::Attribute()),
       alignment, addrSpace, isDsoLocal, isThreadLocal, comdatAttr, attributes);
-  newOp.setVisibility_Attr(mlir::LLVM::VisibilityAttr::get(
-      getContext(), lowerCIRVisibilityToLLVMVisibility(
-                        op.getGlobalVisibilityAttr().getValue())));
+  newOp.setVisibility_(visibility);
 
   return mlir::success();
 }

[llvmbot]

@llvm/pr-subscribers-clang

Author: Henrich Lauko (xlauko)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/171000.diff

1 Files Affected:

• (modified) clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp (+5-7)

diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
index 97bd3cf850daa..cf1a7dcd77ecd 100644
--- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
+++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
@@ -2015,9 +2015,8 @@ mlir::LogicalResult CIRToLLVMFuncOpLowering::matchAndRewrite(
     fn.setAlwaysInline(*inlineKind == cir::InlineKind::AlwaysInline);
   }
 
-  fn.setVisibility_Attr(mlir::LLVM::VisibilityAttr::get(
-      getContext(), lowerCIRVisibilityToLLVMVisibility(
-                        op.getGlobalVisibilityAttr().getValue())));
+  fn.setVisibility_(lowerCIRVisibilityToLLVMVisibility(
+                        op.getGlobalVisibility()));
 
   rewriter.inlineRegionBefore(op.getBody(), fn.getBody(), fn.end());
   if (failed(rewriter.convertRegionTypes(&fn.getBody(), *typeConverter,
@@ -2161,14 +2160,13 @@ mlir::LogicalResult CIRToLLVMGlobalOpLowering::matchAndRewrite(
     }
   }
 
-  // Rewrite op.
+  mlir::LLVM::Visibility visibility = lowerCIRVisibilityToLLVMVisibility(
+      op.getGlobalVisibility());
   mlir::SymbolRefAttr comdatAttr = getComdatAttr(op, rewriter);
   auto newOp = rewriter.replaceOpWithNewOp<mlir::LLVM::GlobalOp>(
       op, llvmType, isConst, linkage, symbol, init.value_or(mlir::Attribute()),
       alignment, addrSpace, isDsoLocal, isThreadLocal, comdatAttr, attributes);
-  newOp.setVisibility_Attr(mlir::LLVM::VisibilityAttr::get(
-      getContext(), lowerCIRVisibilityToLLVMVisibility(
-                        op.getGlobalVisibilityAttr().getValue())));
+  newOp.setVisibility_(visibility);
 
   return mlir::success();
 }

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.

[AmrDeveloper]

LGTM

[xlauko]

Merge activity

• Dec 8, 3:14 PM UTC: A user started a stack merge that includes this pull request via Graphite.
• Dec 8, 3:16 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 3:19 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 3:22 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 3:26 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 3:29 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 3:49 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 3:54 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 4:17 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 4:21 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 4:24 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 4:29 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 4:32 PM UTC: Graphite rebased this pull request as part of a merge.
• Dec 8, 4:41 PM UTC: Graphite couldn't merge this PR because it was not satisfying all requirements (Failed CI: 'Build and Test Linux', 'Build and Test Linux AArch64').

[github-actions]

🐧 Linux x64 Test Results

• 112638 tests passed
• 4087 tests skipped

✅ The build succeeded and all tests passed.

[andykaylor]

lgtm