Merge pull request #8836 from huonw/symbol-list-6

TBD 6: extension conformances, fix bad tests.

Author: huonw

lib/TBDGen/TBDGen.cpp

@@ -60,6 +60,23 @@ class TBDGenVisitor : public ASTVisitor<TBDGenVisitor> {
       addSymbol(linkage.getName());
   }
 
+  void addConformances(DeclContext *DC) {
+    for (auto conformance : DC->getLocalConformances()) {
+      auto needsWTable = Lowering::TypeConverter::protocolRequiresWitnessTable(
+          conformance->getProtocol());
+      if (!needsWTable)
+        continue;
+
+      // Only normal conformances get symbols; the others get any public symbols
+      // from their parent normal conformance.
+      if (conformance->getKind() != ProtocolConformanceKind::Normal)
+        continue;
+
+      addSymbol(LinkEntity::forDirectProtocolWitnessTable(conformance));
+      addSymbol(LinkEntity::forProtocolWitnessTableAccessFunction(conformance));
+    }
+  }
+
 public:
   TBDGenVisitor(StringSet &symbols,
                 const UniversalLinkageInfo &universalLinkInfo,
@@ -95,6 +112,8 @@ class TBDGenVisitor : public ASTVisitor<TBDGenVisitor> {
 
   void visitClassDecl(ClassDecl *CD);
 
+  void visitExtensionDecl(ExtensionDecl *ED);
+
   void visitProtocolDecl(ProtocolDecl *PD) {
     addSymbol(LinkEntity::forProtocolDescriptor(PD));
 
@@ -208,20 +227,7 @@ void TBDGenVisitor::visitNominalTypeDecl(NominalTypeDecl *NTD) {
   addSymbol(LinkEntity::forTypeMetadataAccessFunction(declaredType));
 
   // There are symbols associated with any protocols this type conforms to.
-  for (auto conformance : NTD->getLocalConformances()) {
-    auto needsWTable = Lowering::TypeConverter::protocolRequiresWitnessTable(
-        conformance->getProtocol());
-    if (!needsWTable)
-      continue;
-
-    // Only normal conformances get symbols; the others get any public symbols
-    // from their parent normal conformance.
-    if (conformance->getKind() != ProtocolConformanceKind::Normal)
-      continue;
-
-    addSymbol(LinkEntity::forDirectProtocolWitnessTable(conformance));
-    addSymbol(LinkEntity::forProtocolWitnessTableAccessFunction(conformance));
-  }
+  addConformances(NTD);
 
   visitMembers(NTD);
 }
@@ -283,6 +289,14 @@ void TBDGenVisitor::visitClassDecl(ClassDecl *CD) {
   visitNominalTypeDecl(CD);
 }
 
+void TBDGenVisitor::visitExtensionDecl(ExtensionDecl *ED) {
+  if (!ED->getExtendedType()->isExistentialType()) {
+    addConformances(ED);
+  }
+
+  visitMembers(ED);
+}
+
 void swift::enumeratePublicSymbols(FileUnit *file, StringSet &symbols,
                                    bool hasMultipleIRGenThreads,
                                    bool isWholeModule) {

test/TBD/Inputs/extension_types.swift

@@ -0,0 +1,4 @@
+public protocol Foreign {}
+
+public struct ForeignStruct {}
+public struct ForeignStruct2 {}

test/TBD/Input/objc_class_header.h renamed to test/TBD/Inputs/objc_class_header.h

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -c -parse-as-library -module-name test -validate-tbd-against-ir %s
+// RUN: %target-swift-frontend -emit-ir -o- -parse-as-library -module-name test -validate-tbd-against-ir %s
 
 open class OpenNothing {}
 

test/TBD/class.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -c -parse-as-library -module-name test -import-objc-header %S/Input/objc_class_header.h -validate-tbd-against-ir %s
+// RUN: %target-swift-frontend -emit-ir -o- -parse-as-library -module-name test -import-objc-header %S/Inputs/objc_class_header.h -validate-tbd-against-ir %s
 
 // REQUIRES: objc_interop
 

test/TBD/class_objc.swift

@@ -0,0 +1,40 @@
+// RUN: rm -rf %t && mkdir -p %t
+// RUN: %target-build-swift %S/Inputs/extension_types.swift -module-name ExtensionTypes -emit-module -emit-module-path %t/ExtensionTypes.swiftmodule
+// RUN: %target-swift-frontend -emit-ir -o- -parse-as-library -module-name test -validate-tbd-against-ir -I %t %s
+
+import ExtensionTypes
+
+public protocol Public {}
+internal protocol Internal {}
+private protocol Private {}
+
+extension ForeignStruct: Foreign {}
+extension ForeignStruct: Public {}
+extension ForeignStruct: Internal {}
+extension ForeignStruct: Private {}
+extension ForeignStruct2: Foreign, Public, Internal, Private {}
+
+public struct PublicStruct {}
+public struct PublicStruct2 {}
+internal struct InternalStruct {}
+internal struct InternalStruct2 {}
+private struct PrivateStruct {}
+private struct PrivateStruct2 {}
+
+extension PublicStruct: Foreign {}
+extension PublicStruct: Public {}
+extension PublicStruct: Internal {}
+extension PublicStruct: Private {}
+extension PublicStruct2: Foreign, Public, Internal, Private {}
+
+extension InternalStruct: Foreign {}
+extension InternalStruct: Public {}
+extension InternalStruct: Internal {}
+extension InternalStruct: Private {}
+extension InternalStruct2: Foreign, Public, Internal, Private {}
+
+extension PrivateStruct: Foreign {}
+extension PrivateStruct: Public {}
+extension PrivateStruct: Internal {}
+extension PrivateStruct: Private {}
+extension PrivateStruct2: Foreign, Public, Internal, Private {}

test/TBD/extension.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -c -parse-as-library -module-name test -validate-tbd-against-ir %s
+// RUN: %target-swift-frontend -emit-ir -o- -parse-as-library -module-name test -validate-tbd-against-ir %s
 
 public func publicNoArgs() {}
 public func publicSomeArgs(_: Int, x: Int) {}

test/TBD/function.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -c -parse-as-library -module-name test -validate-tbd-against-ir %s
+// RUN: %target-swift-frontend -emit-ir -o- -parse-as-library -module-name test -validate-tbd-against-ir %s
 
 public let publicLet: Int = 0
 internal let internalLet: Int = 0

test/TBD/global.swift

@@ -1,3 +1,3 @@
-// RUN: %target-swift-frontend -c -module-name test -validate-tbd-against-ir %s
+// RUN: %target-swift-frontend -emit-ir -o- -module-name test -validate-tbd-against-ir %s
 
 // Top-level code (i.e. implicit `main`) should be handled

test/TBD/main.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -c -parse-as-library -module-name test -validate-tbd-against-ir %s
+// RUN: %target-swift-frontend -emit-ir -o- -parse-as-library -module-name test -validate-tbd-against-ir %s
 
 public protocol Public {
     func publicMethod()

test/TBD/protocol.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -c -parse-as-library -module-name test -validate-tbd-against-ir %s
+// RUN: %target-swift-frontend -emit-ir -o- -parse-as-library -module-name test -validate-tbd-against-ir %s
 
 public struct PublicNothing {}