mstorsjo created this revision. mstorsjo added reviewers: rnk, hans, smeenai. Herald added a project: clang.
This makes sure that code built with headers for a statically linked libc++ also works when linking to the DLL version, when the DLL hasn't been built with --export-all-symbols. This matches what GCC for MinGW does for this test case. Repository: rC Clang https://reviews.llvm.org/D61177 Files: lib/CodeGen/ItaniumCXXABI.cpp test/CodeGenCXX/vtable-key-function-ios.cpp Index: test/CodeGenCXX/vtable-key-function-ios.cpp =================================================================== --- test/CodeGenCXX/vtable-key-function-ios.cpp +++ test/CodeGenCXX/vtable-key-function-ios.cpp @@ -1,7 +1,7 @@ -// RUN: %clang_cc1 %s -triple=armv7-apple-darwin -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 %s -triple=armv7-apple-darwin -emit-llvm -o - | FileCheck -check-prefixes=CHECK,CHECK-UNIX %s // RUN: %clang_cc1 %s -triple=armv7-apple-darwin -emit-llvm -o - | FileCheck -check-prefix=CHECK-LATE %s -// RUN: %clang_cc1 %s -triple=x86_64-pc-windows-gnu -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 %s -triple=x86_64-pc-windows-gnu -emit-llvm -o - | FileCheck -check-prefixes=CHECK,CHECK-MINGW %s // RUN: %clang_cc1 %s -triple=x86_64-pc-windows-gnu -emit-llvm -o - | FileCheck -check-prefix=CHECK-LATE %s // The 'a' variants ask for the vtable first. @@ -29,7 +29,8 @@ // V-table should be defined externally. Test0a::Test0a() { use(typeid(Test0a)); } // CHECK: @_ZTV6Test0a = external {{(dso_local )?}}unnamed_addr constant -// CHECK: @_ZTI6Test0a = external {{(dso_local )?}}constant +// CHECK-UNIX: @_ZTI6Test0a = external {{(dso_local )?}}constant +// CHECK-MINGW: @_ZTI6Test0a = linkonce_odr {{(dso_local )?}}constant // This is not a key function. void Test0a::foo() {} @@ -48,7 +49,8 @@ // V-table should be defined externally. Test0b::Test0b() { use(typeid(Test0b)); } // CHECK: @_ZTV6Test0b = external {{(dso_local )?}}unnamed_addr constant -// CHECK: @_ZTI6Test0b = external {{(dso_local )?}}constant +// CHECK-UNIX: @_ZTI6Test0b = external {{(dso_local )?}}constant +// CHECK-MINGW: @_ZTI6Test0b = linkonce_odr {{(dso_local )?}}constant /*** Test1a ******************************************************************/ Index: lib/CodeGen/ItaniumCXXABI.cpp =================================================================== --- lib/CodeGen/ItaniumCXXABI.cpp +++ lib/CodeGen/ItaniumCXXABI.cpp @@ -2959,7 +2959,7 @@ bool IsDLLImport = RD->hasAttr<DLLImportAttr>(); // Don't import the RTTI but emit it locally. - if (CGM.getTriple().isWindowsGNUEnvironment() && IsDLLImport) + if (CGM.getTriple().isWindowsGNUEnvironment()) return false; if (CGM.getVTables().isVTableExternal(RD))
Index: test/CodeGenCXX/vtable-key-function-ios.cpp =================================================================== --- test/CodeGenCXX/vtable-key-function-ios.cpp +++ test/CodeGenCXX/vtable-key-function-ios.cpp @@ -1,7 +1,7 @@ -// RUN: %clang_cc1 %s -triple=armv7-apple-darwin -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 %s -triple=armv7-apple-darwin -emit-llvm -o - | FileCheck -check-prefixes=CHECK,CHECK-UNIX %s // RUN: %clang_cc1 %s -triple=armv7-apple-darwin -emit-llvm -o - | FileCheck -check-prefix=CHECK-LATE %s -// RUN: %clang_cc1 %s -triple=x86_64-pc-windows-gnu -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 %s -triple=x86_64-pc-windows-gnu -emit-llvm -o - | FileCheck -check-prefixes=CHECK,CHECK-MINGW %s // RUN: %clang_cc1 %s -triple=x86_64-pc-windows-gnu -emit-llvm -o - | FileCheck -check-prefix=CHECK-LATE %s // The 'a' variants ask for the vtable first. @@ -29,7 +29,8 @@ // V-table should be defined externally. Test0a::Test0a() { use(typeid(Test0a)); } // CHECK: @_ZTV6Test0a = external {{(dso_local )?}}unnamed_addr constant -// CHECK: @_ZTI6Test0a = external {{(dso_local )?}}constant +// CHECK-UNIX: @_ZTI6Test0a = external {{(dso_local )?}}constant +// CHECK-MINGW: @_ZTI6Test0a = linkonce_odr {{(dso_local )?}}constant // This is not a key function. void Test0a::foo() {} @@ -48,7 +49,8 @@ // V-table should be defined externally. Test0b::Test0b() { use(typeid(Test0b)); } // CHECK: @_ZTV6Test0b = external {{(dso_local )?}}unnamed_addr constant -// CHECK: @_ZTI6Test0b = external {{(dso_local )?}}constant +// CHECK-UNIX: @_ZTI6Test0b = external {{(dso_local )?}}constant +// CHECK-MINGW: @_ZTI6Test0b = linkonce_odr {{(dso_local )?}}constant /*** Test1a ******************************************************************/ Index: lib/CodeGen/ItaniumCXXABI.cpp =================================================================== --- lib/CodeGen/ItaniumCXXABI.cpp +++ lib/CodeGen/ItaniumCXXABI.cpp @@ -2959,7 +2959,7 @@ bool IsDLLImport = RD->hasAttr<DLLImportAttr>(); // Don't import the RTTI but emit it locally. - if (CGM.getTriple().isWindowsGNUEnvironment() && IsDLLImport) + if (CGM.getTriple().isWindowsGNUEnvironment()) return false; if (CGM.getVTables().isVTableExternal(RD))
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits