1 files changed, 5 insertions, 1 deletions
diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp
index 444062bbff..839ff90940 100644
--- a/lib/CodeGen/CGRTTI.cpp
+++ b/lib/CodeGen/CGRTTI.cpp
@@ -640,8 +640,12 @@ llvm::Constant *RTTIBuilder::BuildTypeInfo(QualType Ty, bool Force) {
                           /*ForRTTI*/ true, /*ForDefinition*/ true);
   else if (Hidden || 
            (CGM.getCodeGenOpts().HiddenWeakVTables &&
-            Linkage == llvm::GlobalValue::WeakODRLinkage))
+            Linkage == llvm::GlobalValue::WeakODRLinkage)) {
     GV->setVisibility(llvm::GlobalValue::HiddenVisibility);
+
+    // FIXME: Should we set this for all type infos?
+    GV->setUnnamedAddr(true);
+  }
   
   return llvm::ConstantExpr::getBitCast(GV, Int8PtrTy);
 }