Fix some SourceKit assertion hits

include/swift/AST/DiagnosticsSema.def

@@ -911,8 +911,12 @@ ERROR(invalid_arg_count_for_operator,none,
       "operators must have one or two arguments", ())
 ERROR(operator_in_local_scope,none,
       "operator functions can only be declared at global or in type scope", ())
-ERROR(nonstatic_operator_in_type,none,
-      "operator %0 declared in type %1 must be 'static'", (Identifier, Type))
+ERROR(nonstatic_operator_in_nominal,none,
+      "operator %0 declared in type %1 must be 'static'",
+      (Identifier, DeclName))
+ERROR(nonstatic_operator_in_extension,none,
+      "operator %0 declared in extension of %1 must be 'static'",
+      (Identifier, TypeRepr*))
 ERROR(nonfinal_operator_in_class,none,
       "operator %0 declared in non-final class %1 must be 'final'",
       (Identifier, Type))

lib/AST/ASTVerifier.cpp

@@ -2866,15 +2866,6 @@ class Verifier : public ASTWalker {
 
     void verifyParsed(ConstructorDecl *CD) {
       PrettyStackTraceDecl debugStack("verifying ConstructorDecl", CD);
-
-      auto *DC = CD->getDeclContext();
-      if (!isa<NominalTypeDecl>(DC) && !isa<ExtensionDecl>(DC) &&
-          !CD->isInvalid()) {
-        Out << "ConstructorDecls outside nominal types and extensions "
-               "should be marked invalid";
-        abort();
-      }
-
       verifyParsedBase(CD);
     }
 
@@ -2955,15 +2946,6 @@ class Verifier : public ASTWalker {
         Out << "DestructorDecl cannot be generic";
         abort();
       }
-
-      auto *DC = DD->getDeclContext();
-      if (!isa<NominalTypeDecl>(DC) && !isa<ExtensionDecl>(DC) &&
-          !DD->isInvalid()) {
-        Out << "DestructorDecls outside nominal types and extensions "
-               "should be marked invalid";
-        abort();
-      }
-
       verifyParsedBase(DD);
     }
 

lib/IDE/SyntaxModel.cpp

@@ -904,10 +904,6 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
     pushStructureNode(SN, NTD);
 
   } else if (auto *ED = dyn_cast<ExtensionDecl>(D)) {
-    // Normally bindExtension() would take care of computing the extended
-    // nominal. It must be done before asking for generic parameters.
-    if (!inInactiveClause || ASTScope::areInactiveIfConfigClausesSupported())
-      ED->computeExtendedNominal();
     SyntaxStructureNode SN;
     setDecl(SN, D);
     SN.Kind = SyntaxStructureKind::Extension;

lib/Sema/TypeCheckDecl.cpp

@@ -1258,10 +1258,18 @@ IsStaticRequest::evaluate(Evaluator &evaluator, FuncDecl *decl) const {
       decl->isOperator() &&
       dc->isTypeContext()) {
     auto operatorName = decl->getFullName().getBaseIdentifier();
-    decl->diagnose(diag::nonstatic_operator_in_type,
-                   operatorName, dc->getDeclaredInterfaceType())
-        .fixItInsert(decl->getAttributeInsertionLoc(/*forModifier=*/true),
-                     "static ");
+    if (auto ED = dyn_cast<ExtensionDecl>(dc->getAsDecl())) {
+      decl->diagnose(diag::nonstatic_operator_in_extension,
+                     operatorName, ED->getExtendedTypeRepr())
+          .fixItInsert(decl->getAttributeInsertionLoc(/*forModifier=*/true),
+                       "static ");
+    } else {
+      auto *NTD = cast<NominalTypeDecl>(dc->getAsDecl());
+      decl->diagnose(diag::nonstatic_operator_in_nominal, operatorName,
+                     NTD->getName())
+          .fixItInsert(decl->getAttributeInsertionLoc(/*forModifier=*/true),
+                       "static ");
+    }
     result = true;
   }
 

test/SourceKit/DocumentStructure/Inputs/main.swift

@@ -135,3 +135,33 @@ class OneMore {
     fatalError()
   }
 }
+
+class Chain<A> {
+  func + (lhs: Chain<A>, rhs: Chain<A>) -> Chain<A> { fatalError() }
+}
+
+public init() {
+    fatalError()
+}
+
+deinit {
+    fatalError()
+}
+
+#if false
+extension Result {
+  func foo() {}
+}
+
+extension Outer {
+  class Inner {
+    deinit {}
+  }
+}
+
+public extension Outer2 {
+  class Inner2 {
+    deinit {}
+  }
+}
+#endif

test/SourceKit/DocumentStructure/access_parse.swift.response

@@ -777,7 +777,6 @@
     },
     {
       key.kind: source.lang.swift.decl.extension,
-      key.accessibility: source.lang.swift.accessibility.internal,
       key.name: "DefAccess",
       key.offset: 1399,
       key.length: 43,
@@ -788,7 +787,6 @@
       key.substructure: [
         {
           key.kind: source.lang.swift.decl.function.method.instance,
-          key.accessibility: source.lang.swift.accessibility.internal,
           key.name: "defFunc()",
           key.offset: 1423,
           key.length: 17,
@@ -801,7 +799,6 @@
     },
     {
       key.kind: source.lang.swift.decl.extension,
-      key.accessibility: source.lang.swift.accessibility.internal,
       key.name: "PubAccess",
       key.offset: 1443,
       key.length: 43,
@@ -812,7 +809,6 @@
       key.substructure: [
         {
           key.kind: source.lang.swift.decl.function.method.instance,
-          key.accessibility: source.lang.swift.accessibility.internal,
           key.name: "defFunc()",
           key.offset: 1467,
           key.length: 17,
@@ -825,7 +821,6 @@
     },
     {
       key.kind: source.lang.swift.decl.extension,
-      key.accessibility: source.lang.swift.accessibility.internal,
       key.name: "IntAccess",
       key.offset: 1487,
       key.length: 43,
@@ -836,7 +831,6 @@
       key.substructure: [
         {
           key.kind: source.lang.swift.decl.function.method.instance,
-          key.accessibility: source.lang.swift.accessibility.internal,
           key.name: "defFunc()",
           key.offset: 1511,
           key.length: 17,
@@ -849,7 +843,6 @@
     },
     {
       key.kind: source.lang.swift.decl.extension,
-      key.accessibility: source.lang.swift.accessibility.internal,
       key.name: "PrivAccess",
       key.offset: 1531,
       key.length: 44,
@@ -860,7 +853,6 @@
       key.substructure: [
         {
           key.kind: source.lang.swift.decl.function.method.instance,
-          key.accessibility: source.lang.swift.accessibility.internal,
           key.name: "defFunc()",
           key.offset: 1556,
           key.length: 17,