From 7747ce226051791be0a03ec106d9502e3564c1af Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 19 Aug 2015 20:49:38 +0000 Subject: [PATCH] Internal-linkage variables with constant-evaluatable initializers do not need to be emitted. (Also reduces the set of variables that need to be eagerly deserialized when using PCH / modules.) llvm-svn: 245497 --- clang/lib/AST/ASTContext.cpp | 6 +++++- clang/test/CodeGen/block-with-perdefinedexpr.c | 1 + clang/test/CodeGenCXX/const-init-cxx11.cpp | 1 + clang/test/CodeGenCXX/dllimport.cpp | 2 +- clang/test/CodeGenCXX/typeid-cxx11.cpp | 4 ++-- clang/test/CodeGenObjC/local-static-block.m | 10 +++++++++- clang/test/PCH/check-deserializations.cpp | 15 ++++++++++++--- 7 files changed, 31 insertions(+), 8 deletions(-) diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index 192120abf1b3..f679377b8452 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -8311,6 +8311,9 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) { // Global named register variables (GNU extension) are never emitted. if (VD->getStorageClass() == SC_Register) return false; + if (VD->getDescribedVarTemplate() || + isa(VD)) + return false; } else if (const FunctionDecl *FD = dyn_cast(D)) { // We never need to emit an uninstantiated function template. if (FD->getTemplatedKind() == FunctionDecl::TK_FunctionTemplate) @@ -8383,7 +8386,8 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) { return true; // Variables that have initialization with side-effects are required. - if (VD->getInit() && VD->getInit()->HasSideEffects(*this)) + if (VD->getInit() && VD->getInit()->HasSideEffects(*this) && + !VD->evaluateValue()) return true; return false; diff --git a/clang/test/CodeGen/block-with-perdefinedexpr.c b/clang/test/CodeGen/block-with-perdefinedexpr.c index 68fdea60f379..94d67c3b93b5 100644 --- a/clang/test/CodeGen/block-with-perdefinedexpr.c +++ b/clang/test/CodeGen/block-with-perdefinedexpr.c @@ -5,6 +5,7 @@ void syslog(const char *, ...); void handler( ); +__attribute__((used)) static void (^spd)() = ^() { handler( ^(){ syslog("%s", __FUNCTION__); } ); diff --git a/clang/test/CodeGenCXX/const-init-cxx11.cpp b/clang/test/CodeGenCXX/const-init-cxx11.cpp index 5127c302aa0d..99be265e2126 100644 --- a/clang/test/CodeGenCXX/const-init-cxx11.cpp +++ b/clang/test/CodeGenCXX/const-init-cxx11.cpp @@ -350,6 +350,7 @@ namespace VirtualMembers { virtual void f(); }; // CHECK: @_ZN14VirtualMembersL13sGlobalMemoryE = internal global { i8** } { i8** getelementptr inbounds ([3 x i8*], [3 x i8*]* @_ZTVN14VirtualMembers12nsMemoryImplE, i64 0, i64 2) } + __attribute__((used)) static nsMemoryImpl sGlobalMemory; template diff --git a/clang/test/CodeGenCXX/dllimport.cpp b/clang/test/CodeGenCXX/dllimport.cpp index da8fb8d3802d..c87d959c5b35 100644 --- a/clang/test/CodeGenCXX/dllimport.cpp +++ b/clang/test/CodeGenCXX/dllimport.cpp @@ -581,7 +581,7 @@ struct __declspec(dllimport) KeyFuncClass { constexpr KeyFuncClass() {} virtual void foo(); }; -constexpr KeyFuncClass keyFuncClassVar; +extern constexpr KeyFuncClass keyFuncClassVar = {}; // G32-DAG: @_ZTV12KeyFuncClass = external dllimport unnamed_addr constant [3 x i8*] struct __declspec(dllimport) X : public virtual W {}; diff --git a/clang/test/CodeGenCXX/typeid-cxx11.cpp b/clang/test/CodeGenCXX/typeid-cxx11.cpp index 4e32d2dcb5a5..5c10ca5b21a5 100644 --- a/clang/test/CodeGenCXX/typeid-cxx11.cpp +++ b/clang/test/CodeGenCXX/typeid-cxx11.cpp @@ -18,8 +18,8 @@ struct A { virtual ~A(); }; struct B : virtual A {}; struct C { int n; }; -// CHECK: @_ZN5Test1L5itemsE = internal constant [4 x {{.*}}] [{{.*}} @_ZTIN5Test11AE {{.*}}, {{.*}}, {{.*}} @_ZN5Test19make_implINS_1AEEEPvv }, {{.*}} @_ZTIN5Test11BE {{.*}} @_ZN5Test19make_implINS_1BEEEPvv {{.*}} @_ZTIN5Test11CE {{.*}} @_ZN5Test19make_implINS_1CEEEPvv {{.*}} @_ZTIi {{.*}} @_ZN5Test19make_implIiEEPvv }] -constexpr Item items[] = { +// CHECK: @_ZN5Test15itemsE = constant [4 x {{.*}}] [{{.*}} @_ZTIN5Test11AE {{.*}}, {{.*}}, {{.*}} @_ZN5Test19make_implINS_1AEEEPvv }, {{.*}} @_ZTIN5Test11BE {{.*}} @_ZN5Test19make_implINS_1BEEEPvv {{.*}} @_ZTIN5Test11CE {{.*}} @_ZN5Test19make_implINS_1CEEEPvv {{.*}} @_ZTIi {{.*}} @_ZN5Test19make_implIiEEPvv }] +extern constexpr Item items[] = { item("A"), item("B"), item("C"), item("int") }; diff --git a/clang/test/CodeGenObjC/local-static-block.m b/clang/test/CodeGenObjC/local-static-block.m index b55cc6af4d65..73c670f5c925 100644 --- a/clang/test/CodeGenObjC/local-static-block.m +++ b/clang/test/CodeGenObjC/local-static-block.m @@ -14,8 +14,13 @@ static NSArray *(^ArrayRecurs)(NSArray *addresses, unsigned long level) = ^(NSA return (NSArray *)0; }; +extern NSArray *address; +extern unsigned long level; + void FUNC() { + ArrayRecurs(address, level); + static NSArray *(^ArrayRecurs)(NSArray *addresses, unsigned long level) = ^(NSArray *addresses, unsigned long level) { for(id rawAddress in addresses) @@ -25,6 +30,7 @@ void FUNC() } return (NSArray *)0; }; + ArrayRecurs(address, level); if (ArrayRecurs) { static NSArray *(^ArrayRecurs)(NSArray *addresses, unsigned long level) = ^(NSArray *addresses, unsigned long level) { @@ -36,6 +42,7 @@ void FUNC() } return (NSArray *)0; }; + ArrayRecurs(address, level); } } @@ -50,8 +57,9 @@ void FUNC1() } return (NSArray *)0; }; + ArrayRecurs(address, level); } // CHECK-LP64: @ArrayRecurs = internal global // CHECK-LP64: @FUNC.ArrayRecurs = internal global -// CHECK-LP64: @FUNC.ArrayRecurs.3 = internal global +// CHECK-LP64: @FUNC.ArrayRecurs.1 = internal global // CHECK-LP64: @FUNC1.ArrayRecurs = internal global diff --git a/clang/test/PCH/check-deserializations.cpp b/clang/test/PCH/check-deserializations.cpp index e24d20549385..50c84c89d1cd 100644 --- a/clang/test/PCH/check-deserializations.cpp +++ b/clang/test/PCH/check-deserializations.cpp @@ -1,6 +1,6 @@ -// RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-pch -o %t.1 %s -// RUN: %clang_cc1 -triple x86_64-linux-gnu -error-on-deserialized-decl S1_keyfunc -error-on-deserialized-decl S3 -include-pch %t.1 -emit-pch -o %t.2 %s -// RUN: %clang_cc1 -triple x86_64-linux-gnu -error-on-deserialized-decl S1_method -error-on-deserialized-decl S3 -include-pch %t.2 -emit-llvm-only %s +// RUN: %clang_cc1 -triple x86_64-linux-gnu -std=c++11 -emit-pch -o %t.1 %s +// RUN: %clang_cc1 -triple x86_64-linux-gnu -error-on-deserialized-decl S1_keyfunc -error-on-deserialized-decl S3 -error-on-deserialized-decl DND -std=c++11 -include-pch %t.1 -emit-pch -o %t.2 %s +// RUN: %clang_cc1 -triple x86_64-linux-gnu -error-on-deserialized-decl S1_method -error-on-deserialized-decl S3 -error-on-deserialized-decl DND -std=c++11 -include-pch %t.2 -emit-llvm-only %s // FIXME: Why does this require an x86 target? // REQUIRES: x86-registered-target @@ -20,6 +20,15 @@ struct S2 { operator S3(); }; +namespace vars { + constexpr int f() { return 0; } + struct X { constexpr X() {} }; + namespace v1 { const int DND = 0; } + namespace v2 { constexpr int DND = f(); } + namespace v3 { static X DND; } + namespace v4 { constexpr X DND = {}; } +} + #elif !defined(HEADER2) #define HEADER2