[cfe-commits] r103115 - in /cfe/trunk: lib/CodeGen/CodeGenModule.cpp test/CodeGenCXX/static-init-3.cpp

[Douglas Gregor]

Author: dgregor
Date: Wed May  5 15:15:55 2010
New Revision: 103115

URL: http://llvm.org/viewvc/llvm-project?rev=103115&view=rev
Log:
When we emit a non-constant initializer for a global variable of
reference type, make sure that the initializer we build is the
of the appropriate type for the *reference*, not for the thing that it
refers to. Fixes PR7050.

Added:
    cfe/trunk/test/CodeGenCXX/static-init-3.cpp
Modified:
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp

Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=103115&r1=103114&r2=103115&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Wed May  5 15:15:55 2010
@@ -1101,10 +1101,12 @@
     assert(!ASTTy->isIncompleteType() && "Unexpected incomplete type");
     Init = EmitNullConstant(D->getType());
   } else {
-    Init = EmitConstantExpr(InitExpr, D->getType());
-
+    Init = EmitConstantExpr(InitExpr, D->getType());       
     if (!Init) {
       QualType T = InitExpr->getType();
+      if (D->getType()->isReferenceType())
+        T = D->getType();
+      
       if (getLangOptions().CPlusPlus) {
         EmitCXXGlobalVarDeclInitFunc(D);
         Init = EmitNullConstant(T);

Added: cfe/trunk/test/CodeGenCXX/static-init-3.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/static-init-3.cpp?rev=103115&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/static-init-3.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/static-init-3.cpp Wed May  5 15:15:55 2010
@@ -0,0 +1,28 @@
+// RUN: %clang_cc1 -emit-llvm -triple x86_64-apple-darwin10.0.0 -o - %s | FileCheck %s
+
+// PR7050
+template<class T> struct X0 : public T { };
+
+template <class T>
+struct X1
+{
+     static T & instance;
+    // include this to provoke instantiation at pre-execution time
+    static void use(T const &) {}
+     static T & get() {
+        static X0<T> t;
+        use(instance);
+        return static_cast<T &>(t);
+    }
+};
+
+// CHECK: @_ZN2X1I2X2I1BEE8instanceE = weak global %struct.X0* null, align 8
+// CHECJ: @_ZN2X1I2X2I1AEE8instanceE = weak global %struct.X0* null, align 8
+template<class T> T & X1<T>::instance = X1<T>::get();
+
+class A { };
+class B : public A { };
+
+template<typename T> struct X2 {};
+X2< B > bg = X1< X2< B > >::get(); 
+X2< A > ag = X1< X2< A > >::get();