diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 924ca3e..9b69297 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -196,7 +196,15 @@
   if (E->isLvalue(CGF.getContext()) == Expr::LV_Valid) {
     // Emit the expression as an lvalue.
     LValue LV = CGF.EmitLValue(E);
-
+    if (LV.isPropertyRef() || LV.isKVCRef()) {
+      QualType QT = E->getType();
+      RValue RV = 
+        LV.isPropertyRef() ? CGF.EmitLoadOfPropertyRefLValue(LV, QT) 
+                           : CGF.EmitLoadOfKVCRefLValue(LV, QT);
+      assert(RV.isScalar() && "EmitExprForReferenceBinding");
+      return RV.getScalarVal();
+    }
+    
     if (LV.isSimple())
       return LV.getAddress();