Skip to content

Commit

Permalink
[clang codegen][regression] Add dso_local/hidden/etc. markings to VTT…
Browse files Browse the repository at this point in the history
… definitions and declarations (#72452)

https://reviews.llvm.org/D128482 regressed certain cases of VTT emission
which are no longer hidden with -fvisibility=hidden.

Fix this regression by marking both declarations and definitions.

Fixes [clang codegen][regression] VTT definitions missing
dso_local/hidden/etc markings #72451
  • Loading branch information
bd1976bris committed Nov 21, 2023
1 parent c9fd76f commit 36e5388
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
5 changes: 5 additions & 0 deletions clang/lib/CodeGen/CGVTT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ CodeGenVTables::EmitVTTDefinition(llvm::GlobalVariable *VTT,

if (CGM.supportsCOMDAT() && VTT->isWeakForLinker())
VTT->setComdat(CGM.getModule().getOrInsertComdat(VTT->getName()));

// Set the visibility. This will already have been set on the VTT declaration.
// Set it again, now that we have a definition, as the implicit visibility can
// apply differently to definitions.
CGM.setGVProperties(VTT, RD);
}

llvm::GlobalVariable *CodeGenVTables::GetAddrOfVTT(const CXXRecordDecl *RD) {
Expand Down
9 changes: 9 additions & 0 deletions clang/test/CodeGenCXX/visibility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@ namespace test27 {
// CHECK: @_ZGVZN6test681fC1EvE4test = linkonce_odr global
// CHECK-HIDDEN: @_ZGVZN6test681fC1EvE4test = linkonce_odr hidden global

// CHECK-HIDDEN: @_ZTVN6test701DE = linkonce_odr hidden unnamed_addr constant { [3 x ptr] } { [3 x ptr] [ptr null, ptr null, ptr @_ZTIN6test701DE] }, align 8
// CHECK-HIDDEN: @_ZTTN6test701DE = linkonce_odr hidden unnamed_addr constant [1 x ptr] [ptr getelementptr inbounds ({ [3 x ptr] }, ptr @_ZTVN6test701DE, i32 0, inrange i32 0, i32 3)], align 8

// CHECK: @_ZZN6Test193fooIiEEvvE1a = linkonce_odr global
// CHECK-HIDDEN: @_ZZN6Test193fooIiEEvvE1a = linkonce_odr hidden global

Expand Down Expand Up @@ -1422,6 +1425,12 @@ namespace test70 {
~B();
};
B::~B() {}

// Make sure both the vtable and VTT declarations are marked "hidden"
// when "-fvisibilty=hidden" is in use.
class C {};
class D : virtual C {};
D d;
// Check lines at top of file.
}

Expand Down

0 comments on commit 36e5388

Please sign in to comment.