Fixup SourceKit and Tests

Patch up all the places that are making a syntactic judgement about the
isInvalid() bit in a ValueDecl.  They may continue to use that query,
but most guard themselves on whether the interface type has been set.

Author: CodaFi

lib/AST/AccessRequests.cpp

@@ -81,7 +81,7 @@ AccessLevelRequest::evaluate(Evaluator &evaluator, ValueDecl *D) const {
   // Special case for dtors and enum elements: inherit from container
   if (D->getKind() == DeclKind::Destructor ||
       D->getKind() == DeclKind::EnumElement) {
-    if (D->isInvalid()) {
+    if (D->hasInterfaceType() && D->isInvalid()) {
       return AccessLevel::Private;
     } else {
       auto container = cast<NominalTypeDecl>(D->getDeclContext());

lib/AST/NameLookup.cpp

@@ -69,7 +69,7 @@ void DebuggerClient::anchor() {}
 void AccessFilteringDeclConsumer::foundDecl(
     ValueDecl *D, DeclVisibilityKind reason,
     DynamicLookupInfo dynamicLookupInfo) {
-  if (D->isInvalid())
+  if (D->hasInterfaceType() && D->isInvalid())
     return;
   if (!D->isAccessibleFrom(DC))
     return;

lib/IDE/ExprContextAnalysis.cpp

@@ -160,13 +160,11 @@ Expr *swift::ide::findParsedExpr(const DeclContext *DC,
 
 Type swift::ide::getReturnTypeFromContext(const DeclContext *DC) {
   if (auto FD = dyn_cast<AbstractFunctionDecl>(DC)) {
-    if (FD->hasInterfaceType()) {
-      auto Ty = FD->getInterfaceType();
-      if (FD->getDeclContext()->isTypeContext())
-        Ty = FD->getMethodInterfaceType();
-      if (auto FT = Ty->getAs<AnyFunctionType>())
-        return DC->mapTypeIntoContext(FT->getResult());
-    }
+    auto Ty = FD->getInterfaceType();
+    if (FD->getDeclContext()->isTypeContext())
+      Ty = FD->getMethodInterfaceType();
+    if (auto FT = Ty->getAs<AnyFunctionType>())
+      return DC->mapTypeIntoContext(FT->getResult());
   } else if (auto ACE = dyn_cast<AbstractClosureExpr>(DC)) {
     if (ACE->getType() && !ACE->getType()->hasError())
       return ACE->getResultType();
@@ -743,8 +741,7 @@ class ExprContextAnalyzer {
       if (!AFD)
         return;
       auto param = AFD->getParameters()->get(initDC->getIndex());
-      if (param->hasInterfaceType())
-        recordPossibleType(AFD->mapTypeIntoContext(param->getInterfaceType()));
+      recordPossibleType(AFD->mapTypeIntoContext(param->getInterfaceType()));
       break;
     }
     }

lib/Sema/ConstraintSystem.cpp

@@ -825,11 +825,6 @@ Type ConstraintSystem::getUnopenedTypeOfReference(VarDecl *value, Type baseType,
           return getType(param);
 
         if (!var->hasInterfaceType()) {
-          if (!var->isInvalid()) {
-            TC.diagnose(var->getLoc(), diag::recursive_decl_reference,
-                        var->getDescriptiveKind(), var->getName());
-            var->setInvalid();
-          }
           return ErrorType::get(TC.Context);
         }
 

lib/Sema/TypeCheckDeclOverride.cpp

@@ -693,7 +693,8 @@ OverrideMatcher::OverrideMatcher(ValueDecl *decl)
   // The final step for this constructor is to set up the superclass type,
   // without which we will not perform an matching. Early exits therefore imply
   // that there is no way we can match this declaration.
-  if (decl->isInvalid())
+  // FIXME: Break the cycle here.
+  if (decl->hasInterfaceType() && decl->isInvalid())
     return;
 
   auto *dc = decl->getDeclContext();

lib/Sema/TypeCheckProtocol.cpp

@@ -327,13 +327,13 @@ swift::matchWitness(
   if (req->getKind() != witness->getKind())
     return RequirementMatch(witness, MatchKind::KindConflict);
 
-  // If the witness is invalid, record that and stop now.
-  if (witness->isInvalid())
-    return RequirementMatch(witness, MatchKind::WitnessInvalid);
-
   // If we're currently validating the witness, bail out.
   if (witness->isRecursiveValidation())
     return RequirementMatch(witness, MatchKind::Circularity);
+  
+  // If the witness is invalid, record that and stop now.
+  if (witness->isInvalid())
+    return RequirementMatch(witness, MatchKind::WitnessInvalid);
 
   // Get the requirement and witness attributes.
   const auto &reqAttrs = req->getAttrs();

test/Constraints/diagnostics.swift

@@ -86,7 +86,7 @@ struct A : P2 {
   func wonka() {}
 }
 let a = A()
-for j in i.wibble(a, a) { // expected-error {{for-in loop requires 'A' to conform to 'Sequence'}}  expected-error{{variable 'j' is not bound by any pattern}}
+for j in i.wibble(a, a) { // expected-error {{for-in loop requires 'A' to conform to 'Sequence'}}
 }
 
 // Generic as part of function/tuple types

test/Constraints/members.swift

@@ -316,7 +316,7 @@ struct S22490787 {
 func f22490787() {
   var path: S22490787 = S22490787()
 
-  for p in path {  // expected-error {{for-in loop requires 'S22490787' to conform to 'Sequence'}} expected-error{{variable 'p' is not bound by any pattern}}
+  for p in path {  // expected-error {{for-in loop requires 'S22490787' to conform to 'Sequence'}}
   }
 }
 

test/Constraints/patterns.swift

@@ -290,7 +290,7 @@ switch staticMembers {
 
   case .init(0): break
   case .init(_): break // expected-error{{'_' can only appear in a pattern}}
-  case .init(let x): break // expected-error{{cannot appear in an expression}} expected-error{{variable 'x' is not bound by any pattern}}
+  case .init(let x): break // expected-error{{cannot appear in an expression}}
   case .init(opt: 0): break // expected-error{{value of optional type 'StaticMembers?' must be unwrapped to a value of type 'StaticMembers'}}
   // expected-note@-1 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}
   // expected-note@-2 {{coalesce using '??' to provide a default when the optional value contains 'nil'}}
@@ -302,12 +302,12 @@ switch staticMembers {
   case .method: break // expected-error{{cannot match}}
   case .method(0): break
   case .method(_): break // expected-error{{'_' can only appear in a pattern}}
-  case .method(let x): break // expected-error{{cannot appear in an expression}} expected-error{{variable 'x' is not bound by any pattern}}
+  case .method(let x): break // expected-error{{cannot appear in an expression}}
 
   case .method(withLabel:): break // expected-error{{cannot match}}
   case .method(withLabel: 0): break
   case .method(withLabel: _): break // expected-error{{'_' can only appear in a pattern}}
-  case .method(withLabel: let x): break // expected-error{{cannot appear in an expression}} expected-error{{variable 'x' is not bound by any pattern}}
+  case .method(withLabel: let x): break // expected-error{{cannot appear in an expression}}
 
   case .optMethod: break // expected-error{{cannot match}}
   case .optMethod(0): break

test/Generics/deduction.swift

@@ -311,7 +311,7 @@ class DeducePropertyParams {
 // SR-69
 struct A {}
 func foo() {
-    for i in min(1,2) { // expected-error{{for-in loop requires 'Int' to conform to 'Sequence'}} expected-error {{variable 'i' is not bound by any pattern}}
+    for i in min(1,2) { // expected-error{{for-in loop requires 'Int' to conform to 'Sequence'}}
     }
     let j = min(Int(3), Float(2.5)) // expected-error{{cannot convert value of type 'Float' to expected argument type 'Int'}}
     let k = min(A(), A()) // expected-error{{global function 'min' requires that 'A' conform to 'Comparable'}}

test/IDE/complete_single_expression_return.swift

@@ -556,7 +556,7 @@ struct TestSingleExprSubscriptGlobal {
 
 // TestSingleExprSubscriptGlobal: Begin completions
 // TestSingleExprSubscriptGlobal-DAG: Decl[InstanceMethod]/CurrNominal:   str()[#String#];
-// TestSingleExprSubscriptGlobal-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Identical]: int()[#Int#];
+// TestSingleExprSubscriptGlobal-DAG: Decl[InstanceMethod]/CurrNominal: int()[#Int#];
 // TestSingleExprSubscriptGlobal-DAG: Decl[InstanceMethod]/CurrNominal: void()[#Void#];
 // TestSingleExprSubscriptGlobal: End completions
 }

test/NameBinding/name_lookup.swift

@@ -224,7 +224,7 @@ class ThisDerived1 : ThisBase1 {
     self.baseProp = 42 // expected-error {{member 'baseProp' cannot be used on type 'ThisDerived1'}}
     self.baseFunc0() // expected-error {{instance member 'baseFunc0' cannot be used on type 'ThisDerived1'}}
     self.baseFunc0(ThisBase1())() // expected-error {{cannot convert value of type 'ThisBase1' to expected argument type 'ThisDerived1'}}
-    
+
     self.baseFunc0(ThisDerived1())()
     self.baseFunc1(42) // expected-error {{instance member 'baseFunc1' cannot be used on type 'ThisDerived1'}}
     self.baseFunc1(ThisBase1())(42) // expected-error {{cannot convert value of type 'ThisBase1' to expected argument type 'ThisDerived1'}}
@@ -482,7 +482,7 @@ struct MyStruct {
 // <rdar://problem/19935319> QoI: poor diagnostic initializing a variable with a non-class func
 class Test19935319 {
   let i = getFoo()  // expected-error {{cannot use instance member 'getFoo' within property initializer; property initializers run before 'self' is available}}
-  
+
   func getFoo() -> Int {}
 }
 
@@ -616,18 +616,21 @@ struct PatternBindingWithTwoVars1 { var x = 3, y = x }
 // expected-error@-1 {{cannot use instance member 'x' within property initializer; property initializers run before 'self' is available}}
 
 struct PatternBindingWithTwoVars2 { var x = y, y = 3 }
-// expected-error@-1 {{property 'y' references itself}}
-// expected-error@-2 {{cannot use instance member 'y' within property initializer; property initializers run before 'self' is available}}
+// expected-error@-1 {{cannot use instance member 'y' within property initializer; property initializers run before 'self' is available}}
 
-// This one should be accepted, but for now PatternBindingDecl validation
-// circularity detection is not fine grained enough.
 struct PatternBindingWithTwoVars3 { var x = y, y = x }
 // expected-error@-1 {{cannot use instance member 'x' within property initializer; property initializers run before 'self' is available}}
 // expected-error@-2 {{cannot use instance member 'y' within property initializer; property initializers run before 'self' is available}}
-// expected-error@-3 {{property 'y' references itself}}
+// expected-error@-3 {{circular reference}}
+// expected-note@-4 {{through reference here}}
+// expected-note@-5 {{through reference here}}
+// expected-note@-6 {{through reference here}}
+// expected-note@-7 {{through reference here}}
+// expected-note@-8 {{through reference here}}
+
 
 // https://bugs.swift.org/browse/SR-9015
 func sr9015() {
-  let closure1 = { closure2() } // expected-error {{circular reference}} expected-error{{variable 'closure1' is not bound by any pattern}} expected-note {{through reference here}} expected-note {{through reference here}}
+  let closure1 = { closure2() } // expected-error {{circular reference}} expected-note {{through reference here}} expected-note {{through reference here}}
   let closure2 = { closure1() } // expected-note {{through reference here}} expected-note {{through reference here}} expected-note {{through reference here}}
 }

test/Parse/EOF/unfinished-for-at-eof.swift

@@ -5,5 +5,4 @@ func fuzz() { for var H
 // expected-error@-2{{expected Sequence expression for for-each loop}}
 // expected-error@-3{{expected '{' to start the body of for-each loop}}
 // expected-note@-4 {{to match this opening '{'}}
-// expected-error@-5 {{variable 'H' is not bound by any pattern}}
 // expected-error@+1{{expected '}' at end of brace statement}}

test/Parse/enum_element_pattern_swift4.swift

@@ -43,7 +43,6 @@ func testE(e: E) {
                    // expected-note@-1 {{remove associated values to make the pattern match}} {{12-14=}}
     case .D(let payload) = e // expected-error {{pattern with associated values does not match enum case 'D'}}
                              // expected-note@-1 {{remove associated values to make the pattern match}} {{12-25=}}
-                             // expected-error@-2 {{variable 'payload' is not bound by any pattern}}
   else { return }
 }
 

test/Parse/foreach.swift

@@ -36,6 +36,5 @@ func for_each(r: Range<Int>, iir: IntRange<Int>) { // expected-note {{'r' declar
             // expected-note @-2 {{join the identifiers together with camel-case}}
             // expected-error @-3 {{expected 'in' after for-each pattern}}
             // expected-error @-4 {{expected Sequence expression for for-each loop}}
-            // expected-error @-5 {{variable 'i' is not bound by any pattern}}
   for i in r sum = sum + i; // expected-error{{expected '{' to start the body of for-each loop}}
 }

test/Parse/matching_patterns.swift

@@ -118,10 +118,8 @@ enum Voluntary<T> : Equatable {
 var n : Voluntary<Int> = .Naught
 if case let .Naught(value) = n {} // expected-error{{pattern with associated values does not match enum case 'Naught'}}
                                   // expected-note@-1 {{remove associated values to make the pattern match}} {{20-27=}}
-                                  // expected-error@-2 {{variable 'value' is not bound by any pattern}}
 if case let .Naught(value1, value2, value3) = n {} // expected-error{{pattern with associated values does not match enum case 'Naught'}}
                                                    // expected-note@-1 {{remove associated values to make the pattern match}} {{20-44=}}
-                                                   // expected-error@-2 {{variable 'value1' is not bound by any pattern}}
 
 
 
@@ -284,12 +282,10 @@ case (1, 2, 3):
 case +++(_, var d, 3):
 // expected-error@-1{{'_' can only appear in a pattern or on the left side of an assignment}}
 // expected-error@-2{{'var' binding pattern cannot appear in an expression}}
-// expected-error@-3 {{variable 'd' is not bound by any pattern}}
   ()
 case (_, var e, 3) +++ (1, 2, 3):
 // expected-error@-1{{'_' can only appear in a pattern}}
 // expected-error@-2{{'var' binding pattern cannot appear in an expression}}
-// expected-error@-3 {{variable 'e' is not bound by any pattern}}
   ()
 case (let (_, _, _)) + 1:
 // expected-error@-1 2 {{'var' binding pattern cannot appear in an expression}}
@@ -305,7 +301,6 @@ class Derived : Base { }
 
 switch [Derived(), Derived(), Base()] {
 case let ds as [Derived]: // expected-error{{collection downcast in cast pattern is not implemented; use an explicit downcast to '[Derived]' instead}}
-  // expected-error@-1 {{variable 'ds' is not bound by any pattern}}
   ()
 case is [Derived]: // expected-error{{collection downcast in cast pattern is not implemented; use an explicit downcast to '[Derived]' instead}}
   ()

test/Parse/recovery.swift

@@ -152,7 +152,7 @@ func missingControllingExprInFor() {
   for ; true { // expected-error {{C-style for statement has been removed in Swift 3}}
   }
 
-  for var i = 0; true { // expected-error {{C-style for statement has been removed in Swift 3}} expected-error{{variable 'i' is not bound by any pattern}}
+  for var i = 0; true { // expected-error {{C-style for statement has been removed in Swift 3}}
     i += 1
   }
 }
@@ -174,13 +174,11 @@ func missingControllingExprInForEach() {
   {
   }
 
-  // expected-error @+3 {{variable 'i' is not bound by any pattern}}
   // expected-error @+2 {{expected 'in' after for-each pattern}}
   // expected-error @+1 {{expected Sequence expression for for-each loop}}
   for i {
   }
 
-  // expected-error @+3 {{variable 'i' is not bound by any pattern}}
   // expected-error @+2 {{expected 'in' after for-each pattern}}
   // expected-error @+1 {{expected Sequence expression for for-each loop}}
   for var i {
@@ -201,7 +199,6 @@ func missingControllingExprInForEach() {
   for for in {
   }
 
-  // expected-error @+1 {{variable 'i' is not bound by any pattern}}
   for i in { // expected-error {{expected Sequence expression for for-each loop}}
   }
 

test/Parse/toplevel_library_invalid.swift

@@ -10,7 +10,6 @@ x + x; // expected-error {{expressions are not allowed at the top level}} expect
 // expected-warning @-1 {{result of call to closure returning 'Int' is unused}}
 
 
-// expected-error @+4 {{variable 'i' is not bound by any pattern}}
 // expected-error @+3 {{expected 'in' after for-each pattern}}
 // expected-error @+2 {{expected Sequence expression for for-each loop}}
 // expected-error @+1 {{expected '{' to start the body of for-each loop}}

test/Sema/editor_placeholders.swift

@@ -27,5 +27,5 @@ f(<#T##Int#>) // expected-error{{editor placeholder in source file}}
 f(<#T##String#>) // expected-error{{editor placeholder in source file}} expected-error{{cannot convert value of type 'String' to expected argument type 'Int'}}
 
 for x in <#T#> { // expected-error{{editor placeholder in source file}} expected-error{{for-in loop requires '()' to conform to 'Sequence'}}
-  // expected-error@-1{{variable 'x' is not bound by any pattern}}
+
 }

test/SourceKit/Sema/placeholders.swift.placeholders.response

@@ -14,14 +14,6 @@
       }
     ]
   },
-  {
-    key.line: 4,
-    key.column: 7,
-    key.filepath: placeholders.swift,
-    key.severity: source.diagnostic.severity.error,
-    key.description: "variable '<#name#>' is not bound by any pattern",
-    key.diagnostic_stage: source.diagnostic.stage.swift.sema
-  },
   {
     key.line: 4,
     key.column: 19,

test/attr/attr_dynamic_member_lookup.swift

@@ -604,7 +604,6 @@ func keypath_with_incorrect_return_type(_ arr: Lens<Array<Int>>) {
     // expected-error@-2 {{protocol 'Sequence' requires that 'Lens<Int>.Stride' conform to 'SignedInteger'}}
     // expected-error@-3 {{cannot convert value of type 'Int' to expected argument type 'Lens<Int>'}}
     // expected-error@-4 {{referencing operator function '..<' on 'Comparable' requires that 'Lens<Int>' conform to 'Comparable'}}
-    // expected-error@-5 {{variable 'idx' is not bound by any pattern}}
     let _ = arr[idx]
   }
 }

test/decl/var/variables.swift

@@ -66,13 +66,12 @@ class SomeClass {}
 weak let V = SomeClass()  // expected-error {{'weak' must be a mutable variable, because it may change at runtime}}
 
 let a = b ; let b = a
-// expected-error@-1 {{variable 'a' is not bound by any pattern}}
-// expected-error@-2 {{circular reference}}
+// expected-error@-1 {{circular reference}}
+// expected-note@-2 {{through reference here}}
 // expected-note@-3 {{through reference here}}
 // expected-note@-4 {{through reference here}}
 // expected-note@-5 {{through reference here}}
 // expected-note@-6 {{through reference here}}
-// expected-note@-7 {{through reference here}}
 
 // <rdar://problem/17501765> Swift should warn about immutable default initialized values
 let uselessValue : String?

test/stmt/c_style_for.swift

@@ -2,35 +2,27 @@
 
 for var i = 0; i < 10; i++ {}
 // expected-error @-1 {{C-style for statement has been removed in Swift 3}}  {{none}}
-// expected-error @-2 {{variable 'i' is not bound by any pattern}}
 
 for var i = 0; i < 10; i += 1 {}
 // expected-error @-1 {{C-style for statement has been removed in Swift 3}}  {{none}}
-// expected-error @-2 {{variable 'i' is not bound by any pattern}}
 
 for var i = 0; i <= 10; i++ {}
 // expected-error @-1 {{C-style for statement has been removed in Swift 3}}  {{none}}
-// expected-error @-2 {{variable 'i' is not bound by any pattern}}
 
 for var i = 0; i <= 10; i += 1 {}
 // expected-error @-1 {{C-style for statement has been removed in Swift 3}}  {{none}}
-// expected-error @-2 {{variable 'i' is not bound by any pattern}}
 
 for var i = 10; i > 0; i-- {}
 // expected-error @-1 {{C-style for statement has been removed in Swift 3}}  {{none}}
-// expected-error @-2 {{variable 'i' is not bound by any pattern}}
 
 for var i = 10; i > 0; i -= 1 {}
 // expected-error @-1 {{C-style for statement has been removed in Swift 3}}  {{none}}
-// expected-error @-2 {{variable 'i' is not bound by any pattern}}
 
 for var i = 10; i >= 0; i-- {}
 // expected-error @-1 {{C-style for statement has been removed in Swift 3}}  {{none}}
-// expected-error @-2 {{variable 'i' is not bound by any pattern}}
 
 for var i = 10; i >= 0; i -= 1 {}
 // expected-error @-1 {{C-style for statement has been removed in Swift 3}}  {{none}}
-// expected-error @-2 {{variable 'i' is not bound by any pattern}}
 
 let start = Int8(4)
 let count = Int8(10)