Merge pull request swiftlang#9131 from akyrtzi/index-implicit-ctors2

akyrtzi · web-flow · commit ff544cca5ba0 · 2017-04-29T21:24:45.000-07:00
[index] Make sure that we index implicit constructors
diff --git a/lib/AST/SourceEntityWalker.cpp b/lib/AST/SourceEntityWalker.cpp
@@ -94,7 +94,7 @@ bool SemaAnnotator::walkToDeclPre(Decl *D) {
   bool IsExtension = false;
 
   if (ValueDecl *VD = dyn_cast<ValueDecl>(D)) {
-    if (VD->hasName())
+    if (VD->hasName() && !VD->isImplicit())
       NameLen = VD->getName().getLength();
 
   } else if (ExtensionDecl *ED = dyn_cast<ExtensionDecl>(D)) {
@@ -495,7 +495,9 @@ bool SemaAnnotator::passCallArgNames(Expr *Fn, TupleExpr *TupleE) {
 }
 
 bool SemaAnnotator::shouldIgnore(Decl *D, bool &ShouldVisitChildren) {
-  if (D->isImplicit() && !isa<PatternBindingDecl>(D)) {
+  if (D->isImplicit() &&
+      !isa<PatternBindingDecl>(D) &&
+      !isa<ConstructorDecl>(D)) {
     ShouldVisitChildren = false;
     return true;
   }
diff --git a/lib/IDE/SwiftSourceDocInfo.cpp b/lib/IDE/SwiftSourceDocInfo.cpp
@@ -550,6 +550,8 @@ struct RangeResolver::Implementation {
   class CompleteWalker : public SourceEntityWalker {
     Implementation *Impl;
     bool walkToDeclPre(Decl *D, CharSourceRange Range) override {
+      if (D->isImplicit())
+        return false;
       Impl->analyzeDecl(D);
       return true;
     }
@@ -801,6 +803,8 @@ bool RangeResolver::walkToStmtPre(Stmt *S) {
 };
 
 bool RangeResolver::walkToDeclPre(Decl *D, CharSourceRange Range) {
+  if (D->isImplicit())
+    return false;
   if (!Impl->shouldEnter(D))
     return false;
   Impl->analyze(D);
diff --git a/lib/Index/Index.cpp b/lib/Index/Index.cpp
@@ -464,7 +464,7 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
   }
 
   bool shouldIndex(ValueDecl *D, bool IsRef) const {
-    if (D->isImplicit())
+    if (D->isImplicit() && !isa<ConstructorDecl>(D))
       return false;
     if (!IdxConsumer.indexLocals() && isLocalSymbol(D) && (!isa<ParamDecl>(D) || IsRef))
       return false;
@@ -1004,6 +1004,8 @@ bool IndexSwiftASTWalker::initIndexSymbol(ValueDecl *D, SourceLoc Loc,
       addRelation(Info, (unsigned)SymbolRole::RelationContainedBy, Parent);
   } else {
     Info.roles |= (unsigned)SymbolRole::Definition;
+    if (D->isImplicit())
+      Info.roles |= (unsigned)SymbolRole::Implicit;
   }
 
   if (getNameAndUSR(D, /*ExtD=*/nullptr, Info.name, Info.USR))
diff --git a/lib/Migrator/SyntacticMigratorPass.cpp b/lib/Migrator/SyntacticMigratorPass.cpp
@@ -390,6 +390,8 @@ struct SyntacticMigratorPass::Implementation : public SourceEntityWalker {
   }
 
   bool walkToDeclPre(Decl *D, CharSourceRange Range) override {
+    if (D->isImplicit())
+      return true;
     if (auto *AFD = dyn_cast<AbstractFunctionDecl>(D)) {
       for (auto *Item: getRelatedDiffItems(AFD)) {
         if (auto *DiffItem = dyn_cast<CommonDiffItem>(Item)) {
diff --git a/test/IDE/reconstruct_type_from_mangled_name.swift b/test/IDE/reconstruct_type_from_mangled_name.swift
@@ -6,6 +6,8 @@ struct Mystruct1 {
 // CHECK: decl: func s1f1() -> Int
   var intField = 3
 // CHECK: decl: var intField: Int
+// CHECK: decl: init(intField: Int)
+// CHECK: decl: init()
 }
 struct MyStruct2 {
 // CHECK: decl: struct MyStruct2
@@ -21,23 +23,21 @@ class Myclass1 {
 // CHECK: decl: class Myclass1
   var intField = 4
 // CHECK: decl: var intField: Int
+// CHECK: decl: init()
 }
 
 func f1() {
 // CHECK: decl: func f1()
   var s1ins = Mystruct1() // Implicit ctor
 // CHECK: decl: var s1ins: Mystruct1
-// CHECK: dref: init() for 'Mystruct1'
   _ = Mystruct1(intField: 1) // Implicit ctor
-// CHECK: dref: init(intField: Int)	for 'Mystruct1'
 
   s1ins.intField = 34
 // CHECK: type: Mystruct1
 // CHECK: type: Int
 
   var c1ins = Myclass1()
 // CHECK: decl: var c1ins: Myclass1
-// CHECK: dref: init()	for 'Myclass1'
 // CHECK: type: Myclass1
 
   c1ins.intField = 3
@@ -258,13 +258,12 @@ func hasLocalDecls() {
 
   // FIXME
   // CHECK: decl: FAILURE for 'LocalType'
+  // The following is the implicit ctor
+  // CHECK: decl: FAILURE for ''
   struct LocalType {}
 
   // CHECK: decl: FAILURE for 'LocalAlias'
   typealias LocalAlias = LocalType
-
-  // CHECK: dref: FAILURE for 'LocalType'
-  let x: LocalAlias = LocalType()
 }
 
 fileprivate struct VeryPrivateData {}
diff --git a/test/Index/Inputs/cross_language.m b/test/Index/Inputs/cross_language.m
@@ -12,7 +12,7 @@ -(void)someMethFromObjC;
 void test1() {
   MyCls1 *o = [[MyCls1 alloc] init];
   // CHECK: [[@LINE-1]]:3 | class/Swift | MyCls1 | [[MyCls1_USR]] |
-  // CHECK: [[@LINE-2]]:31 | instance-method/Swift | init | c:@M@cross_language@objc(cs)MyCls1(im)init |
+  // CHECK: [[@LINE-2]]:31 | instance-method/Swift | init | [[MyCls1_init_USR]] |
   // CHECK: [[@LINE-3]]:17 | class/Swift | MyCls1 | [[MyCls1_USR]] |
   [o someMeth];
   // CHECK: [[@LINE-1]]:6 | instance-method/Swift | someMeth | [[MyCls1_someMeth_USR]] |
diff --git a/test/Index/cross_language.swift b/test/Index/cross_language.swift
@@ -19,6 +19,9 @@ import Foundation
 // CHECK: [[@LINE-1]]:20 | class/Swift | MyCls1 | [[MyCls1_USR:.*]] | Def
   @objc public func someMeth() {}
   // CHECK: [[@LINE-1]]:21 | instance-method/Swift | someMeth() | [[MyCls1_someMeth_USR:.*]] | Def
+  // CHECK: [[@LINE-4]]:38 | constructor/Swift | init() | [[MyCls1_init_USR:.*]] | Def,Impl,RelChild,RelOver | rel: 2
+  // CHECK-NEXT: RelOver | constructor/Swift | init() | c:objc(cs)NSObject(im)init
+  // CHECK-NEXT: RelChild | class/Swift | MyCls1 | [[MyCls1_USR]]
 }
 
 @objc public class MyCls2 : NSObject {
diff --git a/test/Index/index_module.swift b/test/Index/index_module.swift
@@ -16,12 +16,21 @@ public var someGlobal: Int = 0
 public func someFunc() {}
 // CHECK: [[@LINE-1]]:13 | function/Swift | someFunc() | [[SOMEFUNC_USR:.*]] | Def | rel: 0
 
+public class CCC {}
+// CHECK: [[@LINE-1]]:14 | class/Swift | CCC | [[CCC_USR:.*]] | Def | rel: 0
+// CHECK: [[@LINE-2]]:14 | constructor/Swift | init() | [[CCC_init_USR:.*]] | Def,Impl,RelChild | rel: 1
+// CHECK-NEXT:   RelChild | class/Swift | CCC | [[CCC_USR]]
+
 // --- Check the module ---
 
+// CHECK: 0:0 | function/Swift | someFunc() | [[SOMEFUNC_USR]] | Def | rel: 0
+
+// CHECK: 0:0 | class/Swift | CCC | [[CCC_USR]] | Def | rel: 0
+// CHECK: 0:0 | constructor/Swift | init() | [[CCC_init_USR]] | Def,Impl,RelChild | rel: 1
+// CHECK-NEXT:  RelChild | class/Swift | CCC | [[CCC_USR]]
+
 // CHECK: 0:0 | variable/Swift | someGlobal | [[SOMEGLOBAL_USR]] | Def | rel: 0
 // CHECK: 0:0 | function/acc-get/Swift | getter:someGlobal | [[SOMEGLOBAL_GET_USR:.*]] | Def,Impl,RelChild,RelAcc | rel: 1
 // CHECK-NEXT:   RelChild,RelAcc | variable/Swift | someGlobal | [[SOMEGLOBAL_USR]]
 // CHECK: 0:0 | function/acc-set/Swift | setter:someGlobal | [[SOMEGLOBAL_SET_USR:.*]] | Def,Impl,RelChild,RelAcc | rel: 1
 // CHECK-NEXT:   RelChild,RelAcc | variable/Swift | someGlobal | [[SOMEGLOBAL_USR]]
-
-// CHECK: 0:0 | function/Swift | someFunc() | [[SOMEFUNC_USR]] | Def | rel: 0
diff --git a/test/Index/kinds.swift b/test/Index/kinds.swift
@@ -242,3 +242,16 @@ typealias C1Alias = C1
 // CHECK: [[@LINE+2]]:15 | class/Swift | C1 | [[C1_USR]] | Ref,Impl,RelBase | rel: 1
 // CHECK-NEXT: RelBase | class/Swift | SubC1 | [[SubC1_USR]]
 class SubC1 : C1Alias {}
+
+struct ImplCtors {
+// CHECK: [[@LINE-1]]:8 | struct/Swift | ImplCtors | [[ImplCtors_USR:.*]] | Def | rel: 0
+  // CHECK: [[@LINE-2]]:8 | constructor/Swift | init(x:) | [[ImplCtors_init_with_param_USR:.*]] | Def,Impl,RelChild | rel: 1
+  // CHECK-NEXT: RelChild | struct/Swift | ImplCtors | [[ImplCtors_USR]]
+  // CHECK: [[@LINE-4]]:8 | constructor/Swift | init() | [[ImplCtors_init_USR:.*]] | Def,Impl,RelChild | rel: 1
+  // CHECK-NEXT: RelChild | struct/Swift | ImplCtors | [[ImplCtors_USR]]
+  var x = 0
+}
+_ = ImplCtors()
+// CHECK: [[@LINE-1]]:5 | constructor/Swift | init() | [[ImplCtors_init_USR]] | Ref,Call | rel: 0
+_ = ImplCtors(x:0)
+// CHECK: [[@LINE-1]]:5 | constructor/Swift | init(x:) | [[ImplCtors_init_with_param_USR]] | Ref,Call | rel: 0
diff --git a/test/SourceKit/DocSupport/doc_source_file.swift.response b/test/SourceKit/DocSupport/doc_source_file.swift.response
@@ -2353,15 +2353,7 @@
         key.usr: "s:8__main__3CC2C9subscriptS2icfg",
         key.offset: 1162,
         key.length: 25,
-        key.fully_annotated_decl: "<decl.function.accessor.getter><decl.name>get</decl.name> {}</decl.function.accessor.getter>",
-        key.entities: [
-          {
-            key.kind: source.lang.swift.decl.var.local,
-            key.name: "i",
-            key.offset: 1144,
-            key.length: 3
-          }
-        ]
+        key.fully_annotated_decl: "<decl.function.accessor.getter><decl.name>get</decl.name> {}</decl.function.accessor.getter>"
       },
       {
         key.kind: source.lang.swift.decl.function.accessor.setter,
@@ -2375,12 +2367,6 @@
             key.name: "vvv",
             key.offset: 1152,
             key.length: 3
-          },
-          {
-            key.kind: source.lang.swift.decl.var.local,
-            key.name: "i",
-            key.offset: 1144,
-            key.length: 3
           }
         ]
       }
diff --git a/test/SourceKit/Indexing/Inputs/cycle-depend/A.response b/test/SourceKit/Indexing/Inputs/cycle-depend/A.response
@@ -67,6 +67,10 @@
               key.is_dynamic: 1
             }
           ]
+        },
+        {
+          key.kind: source.lang.swift.decl.function.constructor,
+          key.usr: "s:1AAACABycfc"
         }
       ]
     }
diff --git a/test/SourceKit/Indexing/Inputs/test_module.index.response b/test/SourceKit/Indexing/Inputs/test_module.index.response
@@ -13,7 +13,13 @@
     {
       key.kind: source.lang.swift.decl.class,
       key.name: "C2",
-      key.usr: "s:11test_module2C2C"
+      key.usr: "s:11test_module2C2C",
+      key.entities: [
+        {
+          key.kind: source.lang.swift.decl.function.constructor,
+          key.usr: "s:11test_module2C2CACycfc"
+        }
+      ]
     },
     {
       key.kind: source.lang.swift.decl.class,
@@ -38,6 +44,10 @@
               key.is_dynamic: 1
             }
           ]
+        },
+        {
+          key.kind: source.lang.swift.decl.function.constructor,
+          key.usr: "s:11test_module16ComputedPropertyCACycfc"
         }
       ]
     },
@@ -117,7 +127,13 @@
     {
       key.kind: source.lang.swift.decl.class,
       key.name: "Empty",
-      key.usr: "s:11test_module5EmptyC"
+      key.usr: "s:11test_module5EmptyC",
+      key.entities: [
+        {
+          key.kind: source.lang.swift.decl.function.constructor,
+          key.usr: "s:11test_module5EmptyCACycfc"
+        }
+      ]
     },
     {
       key.kind: source.lang.swift.decl.extension.class,
diff --git a/test/SourceKit/Indexing/index_forbid_typecheck.swift.response b/test/SourceKit/Indexing/index_forbid_typecheck.swift.response
@@ -67,6 +67,13 @@
           key.line: 5,
           key.column: 11
         },
+        {
+          key.kind: source.lang.swift.ref.function.constructor,
+          key.name: "init()",
+          key.usr: "s:18forbid_typecheck_26ClsSecCACycfc",
+          key.line: 5,
+          key.column: 11
+        },
         {
           key.kind: source.lang.swift.ref.var.instance,
           key.name: "member",
diff --git a/test/SourceKit/Indexing/index_is_test_candidate.swift.response b/test/SourceKit/Indexing/index_is_test_candidate.swift.response
@@ -30,6 +30,12 @@
           key.usr: "s:23index_is_test_candidate8MyStructV0C63_startsWithTest_takesNoParams_returnsVoid_butIsDefinedOnAStructyyF",
           key.line: 13,
           key.column: 8
+        },
+        {
+          key.kind: source.lang.swift.decl.function.constructor,
+          key.usr: "s:23index_is_test_candidate8MyStructVACycfc",
+          key.line: 12,
+          key.column: 8
         }
       ]
     },
@@ -38,7 +44,15 @@
       key.name: "XCTestCase",
       key.usr: "s:23index_is_test_candidate10XCTestCaseC",
       key.line: 15,
-      key.column: 7
+      key.column: 7,
+      key.entities: [
+        {
+          key.kind: source.lang.swift.decl.function.constructor,
+          key.usr: "s:23index_is_test_candidate10XCTestCaseCACycfc",
+          key.line: 15,
+          key.column: 7
+        }
+      ]
     },
     {
       key.kind: source.lang.swift.decl.class,
@@ -70,6 +84,24 @@
           key.line: 17,
           key.column: 8,
           key.is_dynamic: 1
+        },
+        {
+          key.kind: source.lang.swift.decl.function.constructor,
+          key.usr: "s:23index_is_test_candidate14MyPrivateClass33_E06F4E7BC5F577AB6E2EC6D3ECA1C8B9LLCADycfc",
+          key.line: 16,
+          key.column: 43,
+          key.related: [
+            {
+              key.kind: source.lang.swift.ref.function.constructor,
+              key.name: "init()",
+              key.usr: "s:23index_is_test_candidate10XCTestCaseCACycfc"
+            }
+          ],
+          key.attributes: [
+            {
+              key.attribute: source.decl.attribute.override
+            }
+          ]
         }
       ],
       key.is_test_candidate: 1
@@ -164,6 +196,24 @@
           key.column: 8,
           key.is_dynamic: 1,
           key.is_test_candidate: 1
+        },
+        {
+          key.kind: source.lang.swift.decl.function.constructor,
+          key.usr: "s:23index_is_test_candidate7MyClassCACycfc",
+          key.line: 20,
+          key.column: 35,
+          key.related: [
+            {
+              key.kind: source.lang.swift.ref.function.constructor,
+              key.name: "init()",
+              key.usr: "s:23index_is_test_candidate10XCTestCaseCACycfc"
+            }
+          ],
+          key.attributes: [
+            {
+              key.attribute: source.decl.attribute.override
+            }
+          ]
         }
       ],
       key.is_test_candidate: 1
diff --git a/test/SourceKit/Indexing/index_is_test_candidate_objc.swift.response b/test/SourceKit/Indexing/index_is_test_candidate_objc.swift.response
diff --git a/test/SourceKit/Indexing/rdar_21602898.swift.response b/test/SourceKit/Indexing/rdar_21602898.swift.response
diff --git a/test/SourceKit/Indexing/sr_3815.swift.response b/test/SourceKit/Indexing/sr_3815.swift.response
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,8 @@ struct SyntacticMigratorPass::Implementation : public SourceEntityWalker {`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`bool walkToDeclPre(Decl *D, CharSourceRange Range) override {`
	`393`	`+ if (D->isImplicit())`
	`394`	`+ return true;`
`393`	`395`	`if (auto *AFD = dyn_cast<AbstractFunctionDecl>(D)) {`
`394`	`396`	`for (auto *Item: getRelatedDiffItems(AFD)) {`
`395`	`397`	`if (auto *DiffItem = dyn_cast<CommonDiffItem>(Item)) {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ import Foundation`
`19`	`19`	`// CHECK: [[@LINE-1]]:20 \| class/Swift \| MyCls1 \| [[MyCls1_USR:.*]] \| Def`
`20`	`20`	`@objc public func someMeth() {}`
`21`	`21`	`// CHECK: [[@LINE-1]]:21 \| instance-method/Swift \| someMeth() \| [[MyCls1_someMeth_USR:.*]] \| Def`
	`22`	`+ // CHECK: [[@LINE-4]]:38 \| constructor/Swift \| init() \| [[MyCls1_init_USR:.*]] \| Def,Impl,RelChild,RelOver \| rel: 2`
	`23`	`+ // CHECK-NEXT: RelOver \| constructor/Swift \| init() \| c:objc(cs)NSObject(im)init`
	`24`	`+ // CHECK-NEXT: RelChild \| class/Swift \| MyCls1 \| [[MyCls1_USR]]`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`@objc public class MyCls2 : NSObject {`