Sema: Don't diagnose availability errors twice in non-single-expression closures

Author: slavapestov

lib/Sema/TypeCheckAvailability.cpp

@@ -2267,6 +2267,10 @@ class AvailabilityWalker : public ASTWalker {
         = TC.getFragileFunctionKind(DC);
   }
 
+  bool shouldWalkIntoNonSingleExpressionClosure() override {
+    return false;
+  }
+
   std::pair<bool, Expr *> walkToExprPre(Expr *E) override {
     ExprStack.push_back(E);
 

test/attr/attr_availability_transitive_osx.swift

@@ -49,9 +49,8 @@ var osx_extension_init_osx = osx() // expected-error {{'osx()' is unavailable}}
 @available(OSX, unavailable)
 var osx_inner_init_osx = { let inner_var = osx() } // OK
 
-// FIXME: I'm not sure why this produces two errors instead of just one.
 @available(OSXApplicationExtension, unavailable)
-var osx_extension_inner_init_osx = { let inner_var = osx() } // expected-error 2 {{'osx()' is unavailable}}
+var osx_extension_inner_init_osx = { let inner_var = osx() } // expected-error {{'osx()' is unavailable}}
 
 struct Outer {
   @available(OSX, unavailable)
@@ -93,9 +92,8 @@ struct Outer {
   @available(OSX, unavailable)
   var osx_inner_init_osx = { let inner_var = osx() } // OK
 
-  // FIXME: I'm not sure why this produces two errors instead of just one.
   @available(OSXApplicationExtension, unavailable)
-  var osx_extension_inner_init_osx = { let inner_var = osx() } // expected-error 2 {{'osx()' is unavailable}}
+  var osx_extension_inner_init_osx = { let inner_var = osx() } // expected-error {{'osx()' is unavailable}}
 }
 
 extension Outer {

test/decl/func/default-values-swift4.swift

@@ -2,24 +2,24 @@
 // RUN: %target-typecheck-verify-swift -swift-version 4 -enable-testing
 
 private func privateFunction() {}
-// expected-note@-1 4{{global function 'privateFunction()' is not public}}
+// expected-note@-1 2{{global function 'privateFunction()' is not public}}
 fileprivate func fileprivateFunction() {}
-// expected-note@-1 4{{global function 'fileprivateFunction()' is not public}}
+// expected-note@-1 2{{global function 'fileprivateFunction()' is not public}}
 func internalFunction() {}
-// expected-note@-1 4{{global function 'internalFunction()' is not public}}
+// expected-note@-1 2{{global function 'internalFunction()' is not public}}
 @usableFromInline func versionedFunction() {}
-// expected-note@-1 7{{global function 'versionedFunction()' is not public}}
+// expected-note@-1 4{{global function 'versionedFunction()' is not public}}
 public func publicFunction() {}
 
 func internalIntFunction() -> Int {}
 // expected-note@-1 {{global function 'internalIntFunction()' is not public}}
 
 private func privateFunction2() {}
-// expected-note@-1 2{{global function 'privateFunction2()' is not '@usableFromInline' or public}}
+// expected-note@-1 {{global function 'privateFunction2()' is not '@usableFromInline' or public}}
 fileprivate func fileprivateFunction2() {}
-// expected-note@-1 2{{global function 'fileprivateFunction2()' is not '@usableFromInline' or public}}
+// expected-note@-1 {{global function 'fileprivateFunction2()' is not '@usableFromInline' or public}}
 func internalFunction2() {}
-// expected-note@-1 2{{global function 'internalFunction2()' is not '@usableFromInline' or public}}
+// expected-note@-1 {{global function 'internalFunction2()' is not '@usableFromInline' or public}}
 
 func internalIntFunction2() -> Int {}
 // expected-note@-1 {{global function 'internalIntFunction2()' is not '@usableFromInline' or public}}
@@ -56,11 +56,11 @@ func internalFunctionWithDefaultValue(
       versionedFunction()
       // OK
       internalFunction2()
-      // expected-error@-1 2{{global function 'internalFunction2()' is internal and cannot be referenced from a default argument value}}
+      // expected-error@-1 {{global function 'internalFunction2()' is internal and cannot be referenced from a default argument value}}
       fileprivateFunction2()
-      // expected-error@-1 2{{global function 'fileprivateFunction2()' is fileprivate and cannot be referenced from a default argument value}}
+      // expected-error@-1 {{global function 'fileprivateFunction2()' is fileprivate and cannot be referenced from a default argument value}}
       privateFunction2()
-      // expected-error@-1 2{{global function 'privateFunction2()' is private and cannot be referenced from a default argument value}}
+      // expected-error@-1 {{global function 'privateFunction2()' is private and cannot be referenced from a default argument value}}
 
       return 0
     }(),
@@ -77,16 +77,16 @@ public func publicFunctionWithDefaultValue(
       publicFunction()
 
       versionedFunction()
-      // expected-error@-1 2{{global function 'versionedFunction()' is internal and cannot be referenced from a default argument value}}
+      // expected-error@-1 {{global function 'versionedFunction()' is internal and cannot be referenced from a default argument value}}
 
       internalFunction()
-      // expected-error@-1 2{{global function 'internalFunction()' is internal and cannot be referenced from a default argument value}}
+      // expected-error@-1 {{global function 'internalFunction()' is internal and cannot be referenced from a default argument value}}
 
       fileprivateFunction()
-      // expected-error@-1 2{{global function 'fileprivateFunction()' is fileprivate and cannot be referenced from a default argument value}}
+      // expected-error@-1 {{global function 'fileprivateFunction()' is fileprivate and cannot be referenced from a default argument value}}
 
       privateFunction()
-      // expected-error@-1 2{{global function 'privateFunction()' is private and cannot be referenced from a default argument value}}
+      // expected-error@-1 {{global function 'privateFunction()' is private and cannot be referenced from a default argument value}}
 
       return 0
     }(),
@@ -102,7 +102,7 @@ public func evilCode(
   x: Int = {
     let _ = publicFunction()
     let _ = versionedFunction()
-    // expected-error@-1 2{{global function 'versionedFunction()' is internal and cannot be referenced from a default argument value}}
+    // expected-error@-1 {{global function 'versionedFunction()' is internal and cannot be referenced from a default argument value}}
 
     func localFunction() {
       publicFunction()
@@ -122,16 +122,16 @@ public struct HasSubscript {
     publicFunction()
 
     versionedFunction()
-    // expected-error@-1 2{{global function 'versionedFunction()' is internal and cannot be referenced from a default argument value}}
+    // expected-error@-1 {{global function 'versionedFunction()' is internal and cannot be referenced from a default argument value}}
 
     internalFunction()
-    // expected-error@-1 2{{global function 'internalFunction()' is internal and cannot be referenced from a default argument value}}
+    // expected-error@-1 {{global function 'internalFunction()' is internal and cannot be referenced from a default argument value}}
 
     fileprivateFunction()
-    // expected-error@-1 2{{global function 'fileprivateFunction()' is fileprivate and cannot be referenced from a default argument value}}
+    // expected-error@-1 {{global function 'fileprivateFunction()' is fileprivate and cannot be referenced from a default argument value}}
 
     privateFunction()
-    // expected-error@-1 2{{global function 'privateFunction()' is private and cannot be referenced from a default argument value}}
+    // expected-error@-1 {{global function 'privateFunction()' is private and cannot be referenced from a default argument value}}
 
     return 0
   }()) -> Int {