summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-05-06 22:18:21 +0000
committerDouglas Gregor <dgregor@apple.com>2010-05-06 22:18:21 +0000
commitae498b321182c8ee7c3fd29b78a3b83a72430c68 (patch)
tree407067b85841274054151788abfe5d1702bd0177
parent6eeb221f3be0378c5c939ba024c0967d2c7f2d9d (diff)
downloadbcm5719-llvm-ae498b321182c8ee7c3fd29b78a3b83a72430c68.tar.gz
bcm5719-llvm-ae498b321182c8ee7c3fd29b78a3b83a72430c68.zip
The global variable for the VTT might not have external linkage; allow
us to find local variables, too. Fixes the last remaining Boost.Rational failure. llvm-svn: 103203
-rw-r--r--clang/lib/CodeGen/CGVTT.cpp2
-rw-r--r--clang/test/CodeGenCXX/anonymous-namespaces.cpp10
2 files changed, 10 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGVTT.cpp b/clang/lib/CodeGen/CGVTT.cpp
index 15e564810f8..61c74230e11 100644
--- a/clang/lib/CodeGen/CGVTT.cpp
+++ b/clang/lib/CodeGen/CGVTT.cpp
@@ -378,7 +378,7 @@ CodeGenVTables::GenerateVTT(llvm::GlobalVariable::LinkageTypes Linkage,
D1(printf("vtt %s\n", RD->getNameAsCString()));
- llvm::GlobalVariable *GV = CGM.getModule().getGlobalVariable(Name);
+ llvm::GlobalVariable *GV = CGM.getModule().getGlobalVariable(Name, true);
if (GV == 0 || GV->isDeclaration()) {
const llvm::Type *Int8PtrTy =
llvm::Type::getInt8PtrTy(CGM.getLLVMContext());
diff --git a/clang/test/CodeGenCXX/anonymous-namespaces.cpp b/clang/test/CodeGenCXX/anonymous-namespaces.cpp
index 695f8f59def..fb3470ca9be 100644
--- a/clang/test/CodeGenCXX/anonymous-namespaces.cpp
+++ b/clang/test/CodeGenCXX/anonymous-namespaces.cpp
@@ -1,6 +1,5 @@
// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
-
int f();
namespace {
@@ -20,6 +19,13 @@ namespace {
int D::d = f();
+ // Check for generation of a VTT with internal linkage
+ // CHECK: @_ZTSN12_GLOBAL__N_11X1EE = internal constant
+ struct X {
+ struct EBase { };
+ struct E : public virtual EBase { virtual ~E() {} };
+ };
+
// CHECK: define internal i32 @_ZN12_GLOBAL__N_13fooEv()
int foo() {
return 32;
@@ -36,3 +42,5 @@ namespace {
int concrete() {
return a + foo() + A::foo();
}
+
+void test_XE() { throw X::E(); }
OpenPOWER on IntegriCloud