From ca0d0cedb61e9d56baf1ea1cd83ae16817e578ef Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 21 Mar 2018 01:30:16 +0000 Subject: [PATCH] Set dso_local on runtime variables. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@328068 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenModule.cpp | 5 ++++- test/CodeGenCXX/ubsan-vtable-checks.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 53177d2640..e7efd410db 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -2953,7 +2953,10 @@ llvm::Constant *CodeGenModule::GetAddrOfGlobalVar(const VarDecl *D, llvm::Constant * CodeGenModule::CreateRuntimeVariable(llvm::Type *Ty, StringRef Name) { - return GetOrCreateLLVMGlobal(Name, llvm::PointerType::getUnqual(Ty), nullptr); + auto *Ret = + GetOrCreateLLVMGlobal(Name, llvm::PointerType::getUnqual(Ty), nullptr); + setDSOLocal(cast(Ret->stripPointerCasts())); + return Ret; } void CodeGenModule::EmitTentativeDefinition(const VarDecl *D) { diff --git a/test/CodeGenCXX/ubsan-vtable-checks.cpp b/test/CodeGenCXX/ubsan-vtable-checks.cpp index 96f128918c..ec4a21a2b2 100644 --- a/test/CodeGenCXX/ubsan-vtable-checks.cpp +++ b/test/CodeGenCXX/ubsan-vtable-checks.cpp @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -std=c++11 -triple x86_64-unknown-linux -emit-llvm -fsanitize=null %s -o - | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-NULL --check-prefix=ITANIUM // RUN: %clang_cc1 -std=c++11 -triple x86_64-windows -emit-llvm -fsanitize=null %s -o - | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-NULL --check-prefix=MSABI // RUN: %clang_cc1 -std=c++11 -triple x86_64-unknown-linux -emit-llvm -fsanitize=null,vptr %s -o - | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-VPTR --check-prefix=ITANIUM -// RUN: %clang_cc1 -std=c++11 -triple x86_64-windows -emit-llvm -fsanitize=null,vptr %s -o - | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-VPTR --check-prefix=MSABI +// RUN: %clang_cc1 -std=c++11 -triple x86_64-windows -emit-llvm -fsanitize=null,vptr %s -o - | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-VPTR --check-prefix=MSABI --check-prefix=CHECK-VPTR-MS struct T { virtual ~T() {} virtual int v() { return 1; } @@ -14,6 +14,8 @@ struct U : T { U::~U() {} +// CHECK-VPTR-MS: @__ubsan_vptr_type_cache = external dso_local + // ITANIUM: define i32 @_Z5get_vP1T // MSABI: define dso_local i32 @"?get_v int get_v(T* t) { -- 2.40.0