swift-ide-test: Use Demangle::getTypeDeclForUSR() to implement -type-reconstruction flag

"Fixes" <rdar://problem/30680565> -- the "reconstruct_type_from_mangled_name_invalid"
test has been disabled since 2017, and the output has changed a fair bit. But the
FIXMEs have been addressed and it can reconstruct the associated type and
type alias now, and there's no harm in re-enabling it now.

Author: slavapestov

test/IDE/reconstruct_type_from_mangled_name.swift

@@ -1,43 +1,40 @@
 // RUN: %target-swift-ide-test -reconstruct-type -source-filename %s | %FileCheck %s -implicit-check-not="FAILURE"
 
+// This test doesn't test a whole lot now that the more general (but buggy)
+// getDeclFromMangledSymbolName() has been replaced with getTypeDeclForMangling().
+
+// However we're still printing and reconstructing types for all the expressions
+// we see here, even though there are no check lines.
+
+// More comprehensive tests for getType{,Decl}ForMangling() are found in
+// test/TypeDecoder/.
+
 struct Mystruct1 {
 // CHECK: decl: struct Mystruct1
   func s1f1() -> Int { return 0 }
-// CHECK: decl: func s1f1() -> Int
   var intField = 3
-// CHECK: decl: @_hasInitialValue var intField: Int
-// CHECK: decl: init(intField: Int)
-// CHECK: decl: init()
 }
 struct MyStruct2 {
 // CHECK: decl: struct MyStruct2
   init() {}
-// CHECK: decl: init()
   init(x: Int) {}
-// CHECK: decl: init(x: Int)
   init(x: Int, y: Int) {}
-// CHECK: decl: init(x: Int, y: Int)
 }
 
 class Myclass1 {
 // CHECK: decl: class Myclass1
   var intField = 4
-// CHECK: decl: @_hasInitialValue var intField: Int
-// CHECK: decl: init()
 }
 
 func f1() {
-// CHECK: decl: func f1()
   var s1ins = Mystruct1() // Implicit ctor
-// CHECK: decl: @_hasInitialValue var s1ins: Mystruct1
   _ = Mystruct1(intField: 1) // Implicit ctor
 
   s1ins.intField = 34
 // CHECK: type: Mystruct1
 // CHECK: type: Int
 
   var c1ins = Myclass1()
-// CHECK: decl: @_hasInitialValue var c1ins: Myclass1
 // CHECK: type: Myclass1
 
   c1ins.intField = 3
@@ -48,66 +45,49 @@ func f1() {
 // CHECK: type: (Mystruct1) -> () -> Int
 
   if let ifletf1 = Int?(1) {
-// FIXME: lookup incorrect for if let binding.
-// CHECK: decl: struct Int : {{.*}} for 'ifletf1' usr=s:14swift_ide_test2f1yyF7ifletf1L_Siv
   }
 }
 
 class Myclass2 {
 // CHECK: decl: class Myclass2
   func f1() {
-// CHECK: decl: func f1()
 
     var arr1 = [1, 2]
-// CHECK: decl: @_hasInitialValue var arr1: [Int]
 // CHECK: type: [Int]
 
     arr1.append(1)
-// FIXME: missing append()
-// CHECK: dref: FAILURE	for 'append' usr=s:Sa6appendyyxnF
 // CHECK: type: (inout Array<Int>) -> (__owned Int) -> ()
 
     var arr2 : [Mystruct1]
-// CHECK: decl: var arr2: [Mystruct1]
 // CHECK: type: [Mystruct1]
 
     arr2.append(Mystruct1())
 // CHECK: type: (inout Array<Mystruct1>) -> (__owned Mystruct1) -> ()
 
     var arr3 : [Myclass1]
-// CHECK: decl: var arr3: [Myclass1]
 // CHECK: type: [Myclass1]
 
     arr3.append(Myclass1())
 // CHECK: type: (inout Array<Myclass1>) -> (__owned Myclass1) -> ()
 
     _ = Myclass2.init()
-// CHECK: dref: init()
   }
 }
 
 // CHECK: decl: enum MyEnum
 enum MyEnum {
-// FIXME
-// CHECK: decl:   for 'ravioli'
   case ravioli
-// CHECK: decl:   for 'pasta'
   case pasta
 
-// CHECK: decl: func method() -> Int
   func method() -> Int { return 0 }
 
-// CHECK: decl: func compare(_ other: MyEnum) -> Int
   func compare(_ other: MyEnum) -> Int {
-    // CHECK: decl: let other: MyEnum
     return 0
   }
 
-// CHECK: decl: mutating func mutatingMethod()
   mutating func mutatingMethod() {}
 }
 
-// CHECK: decl: func f2()
 func f2() {
 // CHECK: type: (MyEnum.Type) -> MyEnum
   var e = MyEnum.pasta
@@ -122,18 +102,10 @@ func f2() {
 
 struct MyGenStruct1<T, U: ExpressibleByStringLiteral, V: Sequence> {
 // CHECK: decl: struct MyGenStruct1<T, U, V> where U : ExpressibleByStringLiteral, V : Sequence
-// FIXME: why are these references to the base type?
-// FIXME: TypeReconstruction should support Node::Kind::GenericTypeParamDecl ('fp')
-// CHECK: decl: FAILURE for 'T' usr=s:14swift_ide_test12MyGenStruct1V1Txmfp
-// CHECK: decl: FAILURE for 'U' usr=s:14swift_ide_test12MyGenStruct1V1Uq_mfp
-// CHECK: decl: FAILURE for 'V' usr=s:14swift_ide_test12MyGenStruct1V1Vq0_mfp
 
   let x: T
-// CHECK: decl: let x: T
   let y: U
-// CHECK: decl: let y: U
   let z: V
-// CHECK: decl: let z: V
 
   func test000() {
     _ = x
@@ -144,22 +116,17 @@ struct MyGenStruct1<T, U: ExpressibleByStringLiteral, V: Sequence> {
 // CHECK: type: V
   }
 
-  // CHECK: decl: func takesT(_ t: T)
   func takesT(_ t: T) {
-    // CHECK: decl: let t: T
   }
 }
 
 let genstruct1 = MyGenStruct1<Int, String, [Float]>(x: 1, y: "", z: [1.0])
-// CHECK: decl: @_hasInitialValue let genstruct1: MyGenStruct1<Int, String, [Float]>
 
 func test001() {
-// CHECK: decl: func test001()
   _ = genstruct1
 // CHECK: type: MyGenStruct1<Int, String, [Float]>
 
   var genstruct2: MyGenStruct1<Int, String, [Int: Int]>
-// CHECK: decl: var genstruct2: MyGenStruct1<Int, String, [Int : Int]>
   _ = genstruct2
 // CHECK: type: MyGenStruct1<Int, String, [Int : Int]>
   _ = genstruct2.x
@@ -175,41 +142,30 @@ func test001() {
 // CHECK: decl: protocol P1
 protocol P1 {}
 
-// CHECK: decl: func foo1(p: P1)
 func foo1(p: P1) {
-// CHECK: decl: let p: P1
 // CHECK: type: (P1) -> ()
   foo1(p: p)
 }
 
 // CHECK: decl: protocol P2
 protocol P2 {}
 
-// CHECK: decl: func foo2(p: P1 & P2)
 func foo2(p: P1 & P2) {
-// CHECK: decl: let p: P1 & P2
   foo2(p: p)
 }
 
-// CHECK: func foo3(p: P1 & AnyObject)
 func foo3(p: P1 & AnyObject) {
-// CHECK: decl: let p: P1 & AnyObject
   foo3(p: p)
 }
 
-// CHECK: func foo4(p: Myclass1 & P1 & P2)
 func foo4(p: P1 & P2 & Myclass1) {
-// CHECK: decl: let p: Myclass1 & P1 & P2
   foo4(p: p)
 }
 
 func genericFunction<T : AnyObject>(t: T) {
-// CHECK: decl: FAILURE for 'T' usr=s:14swift_ide_test15genericFunction1tyx_tRlzClF1TL_xmfp
   genericFunction(t: t)
 }
 
-// CHECK: decl: func takesInOut(fn: (inout Int) -> ())
-// CHECK: decl: let fn: (inout Int) -> () for 'fn'
 func takesInOut(fn: (inout Int) -> ()) {}
 
 struct Outer {
@@ -218,36 +174,30 @@ struct Outer {
   }
 
   struct GenericInner<T> {
-    // CHECK: decl: FAILURE for 'T' usr=s:14swift_ide_test5OuterV12GenericInnerV1Txmfp
     let t: T
   }
 }
 
 struct GenericOuter<T> {
-  // CHECK: decl: FAILURE for 'T' usr=s:14swift_ide_test12GenericOuterV1Txmfp
   struct Inner {
     let t: T
     let x: Int
   }
 
   struct GenericInner<U> {
-    // CHECK: decl: FAILURE for 'U' usr=s:14swift_ide_test12GenericOuterV0D5InnerV1Uqd__mfp
     let t: T
     let u: U
   }
 }
 
-// CHECK: decl: func takesGeneric(_ t: Outer.GenericInner<Int>)
 func takesGeneric(_ t: Outer.GenericInner<Int>) {
   takesGeneric(t)
 }
 
-// CHECK: decl: func takesGeneric(_ t: GenericOuter<Int>.Inner)
 func takesGeneric(_ t: GenericOuter<Int>.Inner) {
   takesGeneric(t)
 }
 
-// CHECK: decl: func takesGeneric(_ t: GenericOuter<Int>.GenericInner<String>)
 func takesGeneric(_ t: GenericOuter<Int>.GenericInner<String>) {
   takesGeneric(t)
 }
@@ -257,24 +207,14 @@ func hasLocalDecls() {
 
   // CHECK: decl: struct LocalType  for 'LocalType' usr=s:14swift_ide_test13hasLocalDeclsyyF0E4TypeL_V
   struct LocalType {
-    // CHECK: func localMethod() for 'localMethod' usr=s:14swift_ide_test13hasLocalDeclsyyF0E4TypeL_V11localMethodyyF
     func localMethod() {}
 
-    // CHECK: subscript(x: Int) -> Int { get set } for 'subscript' usr=s:14swift_ide_test13hasLocalDeclsyyF0E4TypeL_VyS2icip
     subscript(x: Int) -> Int { get {} set {} }
-
-    // CHECK: decl: get for '' usr=s:14swift_ide_test13hasLocalDeclsyyF0E4TypeL_VyS2icig
-    // CHECK: decl: set for '' usr=s:14swift_ide_test13hasLocalDeclsyyF0E4TypeL_VyS2icis
-    // CHECK: decl: init() for '' usr=s:14swift_ide_test13hasLocalDeclsyyF0E4TypeL_VADycfc
-
   }
 
   // CHECK: decl: class LocalClass for 'LocalClass' usr=s:14swift_ide_test13hasLocalDeclsyyF0E5ClassL_C
   class LocalClass {
-    // CHECK: decl: {{(@objc )?}}deinit for 'deinit' usr=s:14swift_ide_test13hasLocalDeclsyyF0E5ClassL_Cfd
     deinit {}
-
-    // CHECK: decl: init() for '' usr=s:14swift_ide_test13hasLocalDeclsyyF0E5ClassL_CADycfc
   }
 
   // CHECK: decl: typealias LocalAlias = LocalType for 'LocalAlias' usr=s:14swift_ide_test13hasLocalDeclsyyF0E5AliasL_a
@@ -283,48 +223,27 @@ func hasLocalDecls() {
 
 fileprivate struct VeryPrivateData {}
 
-// CHECK: decl: fileprivate func privateFunction(_ d: VeryPrivateData) for 'privateFunction'
 fileprivate func privateFunction(_ d: VeryPrivateData) {}
 
 struct HasSubscript {
-  // CHECK: decl: subscript(t: Int) -> Int { get set }
   subscript(_ t: Int) -> Int {
-    // CHECK: decl: get	for '' usr=s:14swift_ide_test12HasSubscriptVyS2icig
     get {
       return t
     }
-    // CHECK: decl: set	for '' usr=s:14swift_ide_test12HasSubscriptVyS2icis
     set {}
   }
 }
 
-// FIXME
-// CHECK: decl: FAILURE	for 'T' usr=s:14swift_ide_test19HasGenericSubscriptV1Txmfp
 struct HasGenericSubscript<T> {
-  // CHECK: subscript<U>(t: T) -> U { get set } for 'subscript' usr=s:14swift_ide_test19HasGenericSubscriptVyqd__xcluip
-  // FIXME
-  // CHECK: decl: FAILURE	for 'U'
-  // FIXME
-  // CHECK: decl: FAILURE	for 't'
   subscript<U>(_ t: T) -> U {
-
-    // CHECK: decl: get for '' usr=s:14swift_ide_test19HasGenericSubscriptVyqd__xcluig
-    // FIXME
-    // CHECK: dref: FAILURE	for 't'
     get {
       return t as! U
     }
-
-    // CHECK: decl: set	for '' usr=s:14swift_ide_test19HasGenericSubscriptVyqd__xcluis
     set {}
   }
 }
 
 private
-// CHECK: decl: private func patatino<T>(_ vers1: T, _ vers2: T) -> Bool where T : Comparable for
 func patatino<T: Comparable>(_ vers1: T, _ vers2: T) -> Bool {
-  // CHECK: decl: FAILURE   for 'T' usr=s:14swift_ide_test8patatino33_D7B956AE2D93947DFA67A1ECF93EF238LLySbx_xtSLRzlF1TL_xmfp decl
-  // CHECK: decl: let vers1: T      for 'vers1' usr=s:14swift_ide_test8patatino33_D7B956AE2D93947DFA67A1ECF93EF238LLySbx_xtSLRzlF5vers1L_xvp
-  // CHECK: decl: let vers2: T      for 'vers2' usr=s:14swift_ide_test8patatino33_D7B956AE2D93947DFA67A1ECF93EF238LLySbx_xtSLRzlF5vers2L_xvp
   return vers1 < vers2;
 }

test/IDE/reconstruct_type_from_mangled_name_invalid.swift

@@ -1,35 +1,24 @@
 // RUN: %target-swift-ide-test -reconstruct-type -source-filename %s | %FileCheck %s -implicit-check-not="FAILURE"
-// REQUIRES: rdar30680565
 
 struct GS<T> {
 // CHECK: decl: struct GS<T> for 'GS'
-// FIXME: why do we get this?
-// CHECK: decl: struct GS<T> for 'T' usr=s:14swift_ide_test2GSV1Txmfp
 
   let a: T.Nope
-// CHECK: decl: let a: <<error type>>
   let b: T
-// CHECK: decl: let b: T
 }
 
 let global1: GS
-// CHECK: decl: let global1: <<error type>>
 let global2 = GS().x
-// CHECK: decl: let global2: <<error type>>
 let global3 = GS<Int>(a: 1, b: 2).b
-// CHECK: decl: let global3: <<error type>>
 
 protocol P {
-// FIXME: missing protocol entries?
 // CHECK: decl: protocol P for 'P' usr=s:14swift_ide_test1PP
   associatedtype T
-// CHECK: decl: protocol P for 'T' usr=s:14swift_ide_test1PP1T
+// CHECK: decl: associatedtype T for 'T' usr=s:14swift_ide_test1PP1TQa
   func foo() -> T
-// CHECK: decl: func foo() -> Self.T	for 'foo' usr=s:14swift_ide_test1PP3foo1TQzyF
 }
 struct SP: P {
 // CHECK: decl: struct SP : P for 'SP'
   typealias TT = Self.T
-// FIXME: should be the typealias decl
-// CHECK: decl: struct SP : P for 'TT' usr=s:14swift_ide_test2SPV2TT
+// CHECK: typealias TT = <<error type>>	for 'TT' usr=s:14swift_ide_test2SPV2TTa
 }

tools/swift-ide-test/swift-ide-test.cpp

@@ -2845,6 +2845,9 @@ class TypeReconstructWalker : public SourceEntityWalker {
   }
 
   void tryDemangleDecl(ValueDecl *VD, CharSourceRange range, bool isRef) {
+    if (!isa<TypeDecl>(VD) || isa<GenericTypeParamDecl>(VD))
+      return;
+
     std::string USR;
     {
       llvm::raw_string_ostream OS(USR);
@@ -2858,16 +2861,15 @@ class TypeReconstructWalker : public SourceEntityWalker {
       Stream << "decl: ";
     }
 
-    if (Decl *reDecl = getDeclFromUSR(Ctx, USR, error)) {
+    if (TypeDecl *reDecl = Demangle::getTypeDeclForUSR(Ctx, USR)) {
       PrintOptions POpts;
       POpts.PreferTypeRepr = false;
       POpts.PrintParameterSpecifiers = true;
       reDecl->print(Stream, POpts);
     } else {
       Stream << "FAILURE";
     }
-    Stream << "\tfor '" << range.str() << "' usr=" << USR << " " << error
-           << "\n";
+    Stream << "\tfor '" << range.str() << "' usr=" << USR << "\n";
   }
 };