From 88507ddf6f83b929454c04470924cf56b4b8147a Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 13 Apr 2012 16:05:42 +0000 Subject: [PATCH] Make control flow more explicit for rebuilding property reference expressions without their OpaqueValueExprs git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154669 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaPseudoObject.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/Sema/SemaPseudoObject.cpp b/lib/Sema/SemaPseudoObject.cpp index 3b2cf8d735..3a54876771 100644 --- a/lib/Sema/SemaPseudoObject.cpp +++ b/lib/Sema/SemaPseudoObject.cpp @@ -1300,13 +1300,13 @@ static Expr *stripOpaqueValuesFromPseudoObjectRef(Sema &S, Expr *E) { Expr *opaqueRef = E->IgnoreParens(); if (ObjCPropertyRefExpr *refExpr = dyn_cast(opaqueRef)) { - if (refExpr->isObjectReceiver()) { - OpaqueValueExpr *baseOVE = cast(refExpr->getBase()); - return ObjCPropertyRefRebuilder(S, baseOVE->getSourceExpr()).rebuild(E); - } - - // Neither class or super property references need a rebuild. - return E; + // Class and super property references don't have opaque values in them. + if (refExpr->isClassReceiver() || refExpr->isSuperReceiver()) + return E; + + assert(refExpr->isObjectReceiver() && "Unknown receiver kind?"); + OpaqueValueExpr *baseOVE = cast(refExpr->getBase()); + return ObjCPropertyRefRebuilder(S, baseOVE->getSourceExpr()).rebuild(E); } else if (ObjCSubscriptRefExpr *refExpr = dyn_cast(opaqueRef)) { OpaqueValueExpr *baseOVE = cast(refExpr->getBaseExpr()); -- 2.40.0