Skip to content

Commit 59d0f7f

Browse files
committed
[CIR] Clean up visibility conversion (NFC)
1 parent 830ef4e commit 59d0f7f

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,9 +2015,8 @@ mlir::LogicalResult CIRToLLVMFuncOpLowering::matchAndRewrite(
20152015
fn.setAlwaysInline(*inlineKind == cir::InlineKind::AlwaysInline);
20162016
}
20172017

2018-
fn.setVisibility_Attr(mlir::LLVM::VisibilityAttr::get(
2019-
getContext(), lowerCIRVisibilityToLLVMVisibility(
2020-
op.getGlobalVisibilityAttr().getValue())));
2018+
fn.setVisibility_(
2019+
lowerCIRVisibilityToLLVMVisibility(op.getGlobalVisibility()));
20212020

20222021
rewriter.inlineRegionBefore(op.getBody(), fn.getBody(), fn.end());
20232022
if (failed(rewriter.convertRegionTypes(&fn.getBody(), *typeConverter,
@@ -2161,14 +2160,13 @@ mlir::LogicalResult CIRToLLVMGlobalOpLowering::matchAndRewrite(
21612160
}
21622161
}
21632162

2164-
// Rewrite op.
2163+
mlir::LLVM::Visibility visibility =
2164+
lowerCIRVisibilityToLLVMVisibility(op.getGlobalVisibility());
21652165
mlir::SymbolRefAttr comdatAttr = getComdatAttr(op, rewriter);
21662166
auto newOp = rewriter.replaceOpWithNewOp<mlir::LLVM::GlobalOp>(
21672167
op, llvmType, isConst, linkage, symbol, init.value_or(mlir::Attribute()),
21682168
alignment, addrSpace, isDsoLocal, isThreadLocal, comdatAttr, attributes);
2169-
newOp.setVisibility_Attr(mlir::LLVM::VisibilityAttr::get(
2170-
getContext(), lowerCIRVisibilityToLLVMVisibility(
2171-
op.getGlobalVisibilityAttr().getValue())));
2169+
newOp.setVisibility_(visibility);
21722170

21732171
return mlir::success();
21742172
}

0 commit comments

Comments
 (0)