Improve support for irgen of references.

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

2 files changed, 26 insertions, 4 deletions

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index f7c3fd0976..ad0baa32f9 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -634,8 +634,10 @@ LValue CodeGenFunction::EmitDeclRefLValue(const DeclRefExpr *E) {
     LValue LV;
     bool GCable = VD->hasLocalStorage() && !VD->hasAttr<BlocksAttr>();
     if (VD->hasExternalStorage()) {
-      LV = LValue::MakeAddr(CGM.GetAddrOfGlobalVar(VD),
-                            E->getType().getCVRQualifiers(),
+      llvm::Value *V = CGM.GetAddrOfGlobalVar(VD);
+      if (VD->getType()->isReferenceType())
+        V = Builder.CreateLoad(V, "tmp");
+      LV = LValue::MakeAddr(V, E->getType().getCVRQualifiers(),
                             getContext().getObjCGCAttrKind(E->getType()));
     }
     else {
@@ -657,13 +659,17 @@ LValue CodeGenFunction::EmitDeclRefLValue(const DeclRefExpr *E) {
         V = Builder.CreateBitCast(V, PtrStructTy);
         V = Builder.CreateStructGEP(V, needsCopyDispose*2 + 4, "x");
       }
+      if (VD->getType()->isReferenceType())
+        V = Builder.CreateLoad(V, "tmp");
       LV = LValue::MakeAddr(V, E->getType().getCVRQualifiers(), attr);
     }
     LValue::SetObjCNonGC(LV, GCable);
     return LV;
   } else if (VD && VD->isFileVarDecl()) {
-    LValue LV = LValue::MakeAddr(CGM.GetAddrOfGlobalVar(VD),
-                                 E->getType().getCVRQualifiers(),
+    llvm::Value *V = CGM.GetAddrOfGlobalVar(VD);
+    if (VD->getType()->isReferenceType())
+      V = Builder.CreateLoad(V, "tmp");
+    LValue LV = LValue::MakeAddr(V, E->getType().getCVRQualifiers(),
                                  getContext().getObjCGCAttrKind(E->getType()));
     if (LV.isObjCStrong())
       LV.SetGlobalObjCRef(LV, true);
diff --git a/test/CodeGenCXX/references.cpp b/test/CodeGenCXX/references.cpp
new file mode 100644
index 0000000000..26d7157e1c
--- /dev/null
+++ b/test/CodeGenCXX/references.cpp
@@ -0,0 +1,16 @@
+// RUN: clang-cc -verify -emit-llvm -o %t %s
+
+void t1() {
+  extern int& a;
+  int b = a; 
+}
+
+void t2(int& a) {
+  int b = a;
+}
+
+int g;
+int& gr = g;
+void t3() {
+  int b = gr;
+}