2 files changed, 4 insertions, 7 deletions
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 2ecca33cf5..c8856198fd 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -540,7 +540,9 @@ Parser::ExprResult Parser::ParseCastExpression(bool isUnaryExpression) {
   case tok::kw_static_cast:
     return ParseCXXCasts();
   case tok::kw_this:
-    return ParseCXXThis();
+    Res = ParseCXXThis();
+    // This can be followed by postfix-expr pieces.
+    return ParsePostfixExpressionSuffix(Res);
   case tok::at: {
     SourceLocation AtLoc = ConsumeToken();
     return ParseObjCAtExpression(AtLoc);
diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp
index 93eaa2dedd..45f482792d 100644
--- a/lib/Parse/ParseExprCXX.cpp
+++ b/lib/Parse/ParseExprCXX.cpp
@@ -112,10 +112,5 @@ Parser::ExprResult Parser::ParseThrowExpression() {
 Parser::ExprResult Parser::ParseCXXThis() {
   assert(Tok.is(tok::kw_this) && "Not 'this'!");
   SourceLocation ThisLoc = ConsumeToken();
-
-  ExprResult Res = Actions.ActOnCXXThis(ThisLoc);
-  if (Res.isInvalid)
-    return Res;
-
-  return ParsePostfixExpressionSuffix(Res);
+  return Actions.ActOnCXXThis(ThisLoc);
 }