Handle emitting static variables that have reference type.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91027 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGDeclCXX.cpp b/lib/CodeGen/CGDeclCXX.cpp
index 44038da7d184752ae92507273dabbcab164bb9a5..d240a3b933f68df7f96f9da93a70735548232c67 100644 (file)
--- a/lib/CodeGen/CGDeclCXX.cpp
+++ b/lib/CodeGen/CGDeclCXX.cpp
@@ -193,7 +193,10 @@ CodeGenFunction::EmitStaticCXXBlockVarDeclInit(const VarDecl &D,
   EmitBlock(InitBlock);
 
   if (D.getType()->isReferenceType()) {
-    ErrorUnsupported(D.getInit(), "static variable that binds to a reference");
+    // We don't want to pass true for IsInitializer here, because a static
+    // reference to a temporary does not extend its lifetime.
+    EmitReferenceBindingToExpr(D.getInit(), D.getType(),
+                               /*IsInitializer=*/false);
   } else
     EmitDeclInit(*this, D, GV);
 

diff --git a/test/CodeGenCXX/static-init.cpp b/test/CodeGenCXX/static-init.cpp
index 55877b2a71a9937cfb4794d05a8afb3d15937ad2..91085440ae78dbd374bf9e199f6b822f8796ae3f 100644 (file)
--- a/test/CodeGenCXX/static-init.cpp
+++ b/test/CodeGenCXX/static-init.cpp
@@ -1,13 +1,17 @@
-// RUN: clang-cc -triple=x86_64-apple-darwin9 -emit-llvm %s -o %t
-// RUN: grep "call void @_ZN1AC1Ev" %t | count 1
-// RUN: grep "call i32 @__cxa_atexit(void (i8\*)\* bitcast (void (%.truct.A\*)\* @_ZN1AD1Ev to void (i8\*)\*), i8\* getelementptr inbounds (%.truct.A\* @_ZZ1fvE1a, i32 0, i32 0), i8\* bitcast (i8\*\* @__dso_handle to i8\*))" %t | count 1 
-
+// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
 struct A {
   A();
   ~A();
 };
 
 void f() {
+  // CHECK: call void @_ZN1AC1Ev(
+  // CHECK: call i32 @__cxa_atexit(void (i8*)* bitcast (void (%struct.A*)* @_ZN1AD1Ev to void (i8*)*), i8* getelementptr inbounds (%struct.A* @_ZZ1fvE1a, i32 0, i32 0), i8* bitcast (i8** @__dso_handle to i8*))
   static A a;
 }
 
+void g() {
+  // CHECK: call i8* @_Znwm(i64 1)
+  // CHECK: call void @_ZN1AC1Ev(
+  static A& a = *new A;
+}