Merge pull request #18378 from davidungar/rdar-42314665-produce-diagnostics

Don’t mangle an error type.

Author: David Ungar

lib/AST/USRGeneration.cpp

@@ -226,7 +226,7 @@ bool ide::printDeclUSR(const ValueDecl *D, raw_ostream &OS) {
     return printObjCUSR(D, OS);
   }
 
-  if (!D->hasInterfaceType())
+  if (!D->hasInterfaceType() || D->getInterfaceType()->hasError())
     return true;
 
   // Invalid code.

test/SourceKit/Indexing/index_constructors.swift.response

@@ -33,29 +33,6 @@
           key.line: 6,
           key.column: 21
         },
-        {
-          key.kind: source.lang.swift.decl.var.instance,
-          key.name: "name",
-          key.usr: "s:18index_constructors11HorseObjectC4nameXevp",
-          key.line: 7,
-          key.column: 7,
-          key.entities: [
-            {
-              key.kind: source.lang.swift.decl.function.accessor.getter,
-              key.usr: "s:18index_constructors11HorseObjectC4nameXevg",
-              key.line: 7,
-              key.column: 7,
-              key.is_dynamic: 1
-            },
-            {
-              key.kind: source.lang.swift.decl.function.accessor.setter,
-              key.usr: "s:18index_constructors11HorseObjectC4nameXevs",
-              key.line: 7,
-              key.column: 7,
-              key.is_dynamic: 1
-            }
-          ]
-        },
         {
           key.kind: source.lang.swift.decl.function.method.instance,
           key.name: "flip()",