[Sema] Run structural/availability diagnostics on tap bodies

Since interpolations are now type-checked using conjunctions
these diagnostics could be rank as part of the root expression
or statement verification.

Author: xedin

lib/Sema/ConstantnessSemaDiagnostics.cpp

@@ -349,14 +349,7 @@ void swift::diagnoseConstantArgumentRequirement(
         return walkToClosureExprPre(closureExpr);
       }
 
-      // Interpolated expressions' bodies will be type checked
-      // separately so exit early to avoid duplicate diagnostics.
-      // The caveat is that they won't be checked inside closure
-      // bodies because we manually check all closures to avoid
-      // duplicate diagnostics. Therefore we must still descend into
-      // interpolated expressions if we are inside of a closure.
-      if (!expr || isa<ErrorExpr>(expr) || !expr->getType() ||
-          (isa<InterpolatedStringLiteralExpr>(expr) && !insideClosure))
+      if (!expr || isa<ErrorExpr>(expr) || !expr->getType())
         return Action::SkipChildren(expr);
       if (auto *callExpr = dyn_cast<CallExpr>(expr)) {
         diagnoseConstantArgumentRequirementOfCall(callExpr, DC->getASTContext());

lib/Sema/MiscDiagnostics.cpp

@@ -132,8 +132,6 @@ static void diagSyntacticUseRestrictions(const Expr *E, const DeclContext *DC,
 
     bool shouldWalkCaptureInitializerExpressions() override { return true; }
 
-    bool shouldWalkIntoTapExpression() override { return false; }
-
     PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
       if (auto collection = dyn_cast<CollectionExpr>(E)) {
         if (collection->isTypeDefaulted()) {
@@ -1459,8 +1457,6 @@ static void diagRecursivePropertyAccess(const Expr *E, const DeclContext *DC) {
 
     bool shouldWalkCaptureInitializerExpressions() override { return true; }
 
-    bool shouldWalkIntoTapExpression() override { return false; }
-
     PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
       Expr *subExpr;
       bool isStore = false;
@@ -1756,8 +1752,6 @@ static void diagnoseImplicitSelfUseInClosure(const Expr *E,
 
     bool shouldWalkCaptureInitializerExpressions() override { return true; }
 
-    bool shouldWalkIntoTapExpression() override { return false; }
-
     PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
       if (auto *CE = dyn_cast<AbstractClosureExpr>(E)) {
         // If this is a potentially-escaping closure expression, start looking
@@ -4154,8 +4148,6 @@ static void checkStmtConditionTrailingClosure(ASTContext &ctx, const Expr *E) {
 
     bool shouldWalkCaptureInitializerExpressions() override { return true; }
 
-    bool shouldWalkIntoTapExpression() override { return false; }
-
     PreWalkResult<ArgumentList *>
     walkToArgumentListPre(ArgumentList *args) override {
       // Don't walk into an explicit argument list, as trailing closures that
@@ -4280,8 +4272,6 @@ class ObjCSelectorWalker : public ASTWalker {
 
   bool shouldWalkCaptureInitializerExpressions() override { return true; }
 
-  bool shouldWalkIntoTapExpression() override { return false; }
-
   PreWalkResult<Expr *> walkToExprPre(Expr *expr) override {
     auto *stringLiteral = dyn_cast<StringLiteralExpr>(expr);
     bool fromStringLiteral = false;
@@ -5137,8 +5127,6 @@ static void diagnoseUnintendedOptionalBehavior(const Expr *E,
 
     bool shouldWalkCaptureInitializerExpressions() override { return true; }
 
-    bool shouldWalkIntoTapExpression() override { return false; }
-
     PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
       if (!E || isa<ErrorExpr>(E) || !E->getType())
         return Action::SkipChildren(E);
@@ -5214,8 +5202,6 @@ static void diagnoseDeprecatedWritableKeyPath(const Expr *E,
 
     bool shouldWalkCaptureInitializerExpressions() override { return true; }
 
-    bool shouldWalkIntoTapExpression() override { return false; }
-
     PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
       if (!E || isa<ErrorExpr>(E) || !E->getType())
         return Action::SkipChildren(E);
@@ -5494,8 +5480,6 @@ static void diagUnqualifiedAccessToMethodNamedSelf(const Expr *E,
       return false;
     }
 
-    bool shouldWalkIntoTapExpression() override { return false; }
-
     PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
       if (!E || isa<ErrorExpr>(E) || !E->getType())
         return Action::SkipChildren(E);
@@ -5651,8 +5635,6 @@ diagnoseDictionaryLiteralDuplicateKeyEntries(const Expr *E,
       return false;
     }
 
-    bool shouldWalkIntoTapExpression() override { return false; }
-
     PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
       const auto *DLE = dyn_cast_or_null<DictionaryExpr>(E);
       if (!DLE)

lib/Sema/TypeCheckAvailability.cpp

@@ -3223,8 +3223,6 @@ class ExprAvailabilityWalker : public ASTWalker {
     return false;
   }
 
-  bool shouldWalkIntoTapExpression() override { return false; }
-
   PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
     auto *DC = Where.getDeclContext();