Merge pull request #7203 from rintaro/parse-typeof-tweak

Author: swift-ci

lib/Parse/ParseExpr.cpp

@@ -668,19 +668,9 @@ ParserResult<Expr> Parser::parseExprSelector() {
   }
 
   // If the subexpression was in error, just propagate the error.
-  if (subExpr.isParseError()) {
-    if (subExpr.hasCodeCompletion()) {
-      auto res = makeParserResult(
-                   new (Context) ObjCSelectorExpr(selectorKind, keywordLoc,
-                                                  lParenLoc, modifierLoc,
-                                                  subExpr.get(), rParenLoc));
-      res.setHasCodeCompletion();
-      return res;
-    } else {
-      return makeParserResult<Expr>(
-               new (Context) ErrorExpr(SourceRange(keywordLoc, rParenLoc)));
-    }
-  }
+  if (subExpr.isParseError())
+    return makeParserResult<Expr>(
+      new (Context) ErrorExpr(SourceRange(keywordLoc, rParenLoc)));
 
   return makeParserResult<Expr>(
     new (Context) ObjCSelectorExpr(selectorKind, keywordLoc, lParenLoc,
@@ -3130,26 +3120,16 @@ ParserResult<Expr> Parser::parseExprTypeOf() {
     if (Tok.is(tok::r_paren))
       rParenLoc = consumeToken();
     else
-      rParenLoc = Tok.getLoc();
+      rParenLoc = PreviousLoc;
   } else {
     parseMatchingToken(tok::r_paren, rParenLoc,
                        diag::expr_typeof_expected_rparen, lParenLoc);
   }
 
   // If the subexpression was in error, just propagate the error.
-  if (subExpr.isParseError()) {
-    if (subExpr.hasCodeCompletion()) {
-      auto res = makeParserResult(
-                   new (Context) DynamicTypeExpr(keywordLoc, lParenLoc,
-                                                 subExpr.get(), rParenLoc,
-                                                 Type()));
-      res.setHasCodeCompletion();
-      return res;
-    } else {
-      return makeParserResult<Expr>(
-               new (Context) ErrorExpr(SourceRange(keywordLoc, rParenLoc)));
-    }
-  }
+  if (subExpr.isParseError())
+    return makeParserResult<Expr>(
+      new (Context) ErrorExpr(SourceRange(keywordLoc, rParenLoc)));
 
   return makeParserResult(
            new (Context) DynamicTypeExpr(keywordLoc, lParenLoc,

validation-test/compiler_crashers_2_fixed/0067-typeof-check-source-ranges.swift

@@ -0,0 +1,3 @@
+// RUN: not %target-swift-frontend %s -emit-ir
+
+(!type(of: