super and class property reference expressions don't need to be

rebuilt. Fixes <rdar://problem/11052352>. 

llvm-svn: 154667

1 files changed, 7 insertions, 2 deletions

diff --git a/clang/lib/Sema/SemaPseudoObject.cpp b/clang/lib/Sema/SemaPseudoObject.cpp
index d52c912457a..3b2cf8d7350 100644
--- a/clang/lib/Sema/SemaPseudoObject.cpp
+++ b/clang/lib/Sema/SemaPseudoObject.cpp
@@ -1300,8 +1300,13 @@ static Expr *stripOpaqueValuesFromPseudoObjectRef(Sema &S, Expr *E) {
   Expr *opaqueRef = E->IgnoreParens();
   if (ObjCPropertyRefExpr *refExpr
         = dyn_cast<ObjCPropertyRefExpr>(opaqueRef)) {
-    OpaqueValueExpr *baseOVE = cast<OpaqueValueExpr>(refExpr->getBase());
-    return ObjCPropertyRefRebuilder(S, baseOVE->getSourceExpr()).rebuild(E);
+    if (refExpr->isObjectReceiver()) {
+      OpaqueValueExpr *baseOVE = cast<OpaqueValueExpr>(refExpr->getBase());
+      return ObjCPropertyRefRebuilder(S, baseOVE->getSourceExpr()).rebuild(E);
+    }
+
+    // Neither class or super property references need a rebuild.
+    return E;
   } else if (ObjCSubscriptRefExpr *refExpr
                = dyn_cast<ObjCSubscriptRefExpr>(opaqueRef)) {
     OpaqueValueExpr *baseOVE = cast<OpaqueValueExpr>(refExpr->getBaseExpr());