Merge pull request #67952 from slavapestov/tuple-conformance-tbd-etc

A pile of mostly unrelated one-liners

Author: slavapestov

include/swift/SIL/SILWitnessTable.h

@@ -238,12 +238,8 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
   /// Return the protocol for which this witness table is a conformance.
   ProtocolDecl *getProtocol() const;
 
-  /// Return the formal type which conforms to the protocol.
-  ///
-  /// Note that this will not be a substituted type: it may only be meaningful
-  /// in the abstract context of the conformance rather than the context of any
-  /// particular use of it.
-  CanType getConformingType() const;
+  /// Return the nominal type declaration which conforms to the protocol.
+  NominalTypeDecl *getConformingNominal() const;
 
   /// Return the symbol name of the witness table that will be propagated to the
   /// object file level.

lib/AST/ASTPrinter.cpp

@@ -3036,14 +3036,6 @@ static bool usesBuiltinType(Decl *decl, BuiltinTypeKind kind) {
     }
   }
 
-  if (auto patternBinding = dyn_cast<PatternBindingDecl>(decl)) {
-    for (unsigned idx : range(patternBinding->getNumPatternEntries())) {
-      if (Type type = patternBinding->getPattern(idx)->getType())
-        if (typeMatches(type))
-          return true;
-    }
-  }
-
   return false;
 }
 

lib/AST/RequirementMachine/RequirementBuilder.cpp

@@ -312,6 +312,7 @@ void RequirementBuilder::addTypeAliasRules(ArrayRef<unsigned> rules) {
 
       auto &component = Components[rule.getRHS()];
       assert(!component.ConcreteType);
+      (void) component;
       Components[rule.getRHS()].ConcreteType = concreteType;
     } else {
       Components[rule.getRHS()].Aliases.push_back(name);

lib/AST/Type.cpp

@@ -31,6 +31,7 @@
 #include "swift/AST/Module.h"
 #include "swift/AST/PackConformance.h"
 #include "swift/AST/ParameterList.h"
+#include "swift/AST/PrettyStackTrace.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/SILLayout.h"
 #include "swift/AST/SubstitutionMap.h"
@@ -1748,6 +1749,9 @@ CanType TypeBase::computeCanonicalType() {
   case TypeKind::GenericFunction: {
     AnyFunctionType *funcTy = cast<AnyFunctionType>(this);
 
+    PrettyStackTraceType trace(funcTy->getResult()->getASTContext(),
+                               "computing canonical type for ", this);
+
     CanGenericSignature genericSig;
     if (auto *genericFnTy = dyn_cast<GenericFunctionType>(this))
       genericSig = genericFnTy->getGenericSignature().getCanonicalSignature();

lib/Frontend/FrontendOptions.cpp

@@ -705,7 +705,6 @@ bool FrontendOptions::canActionEmitInterface(ActionType action) {
   switch (action) {
   case ActionType::NoneAction:
   case ActionType::Parse:
-  case ActionType::ResolveImports:
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
@@ -727,6 +726,7 @@ bool FrontendOptions::canActionEmitInterface(ActionType action) {
   case ActionType::ScanDependencies:
   case ActionType::PrintFeature:
     return false;
+  case ActionType::ResolveImports:
   case ActionType::Typecheck:
   case ActionType::MergeModules:
   case ActionType::EmitModuleOnly:

lib/IRGen/GenDecl.cpp

@@ -4080,8 +4080,8 @@ void IRGenModule::appendLLVMUsedConditionalEntry(
   auto *protocol = getAddrOfProtocolDescriptor(conformance->getProtocol())
                        ->stripPointerCasts();
   auto *type = getAddrOfTypeContextDescriptor(
-                   conformance->getType()->getAnyNominal(), DontRequireMetadata)
-                   ->stripPointerCasts();
+                   conformance->getDeclContext()->getSelfNominalTypeDecl(),
+                   DontRequireMetadata)->stripPointerCasts();
 
   llvm::Metadata *metadata[] = {
       // (1) which variable is being conditionalized, "target"

lib/IRGen/GenProto.cpp

@@ -1984,7 +1984,7 @@ namespace {
       // Add a relative reference to the type, with the type reference
       // kind stored in the flags.
       auto ref = IGM.getTypeEntityReference(
-                   Conformance->getType()->getAnyNominal());
+                   Conformance->getDeclContext()->getSelfNominalTypeDecl());
       B.addRelativeAddress(ref.getValue());
       Flags = Flags.withTypeReferenceKind(ref.getKind());
     }
@@ -2474,8 +2474,9 @@ void IRGenModule::emitSILWitnessTable(SILWitnessTable *wt) {
   // Record this conformance descriptor.
   addProtocolConformance(std::move(description));
 
-  IRGen.noteUseOfTypeContextDescriptor(conf->getType()->getAnyNominal(),
-                                       RequireMetadata);
+  IRGen.noteUseOfTypeContextDescriptor(
+      conf->getDeclContext()->getSelfNominalTypeDecl(),
+      RequireMetadata);
 }
 
 /// True if a function's signature in LLVM carries polymorphic parameters.

lib/IRGen/IRGenModule.cpp

@@ -1280,10 +1280,7 @@ bool IRGenerator::canEmitWitnessTableLazily(SILWitnessTable *wt) {
   if (wt->getLinkage() == SILLinkage::Shared)
     return true;
 
-  NominalTypeDecl *ConformingTy =
-    wt->getConformingType()->getNominalOrBoundGenericNominal();
-
-  switch (ConformingTy->getEffectiveAccess()) {
+  switch (wt->getConformingNominal()->getEffectiveAccess()) {
     case AccessLevel::Private:
     case AccessLevel::FilePrivate:
       return true;

lib/IRGen/Linking.cpp

@@ -743,16 +743,17 @@ SILLinkage LinkEntity::getLinkage(ForDefinition_t forDefinition) const {
   case Kind::OpaqueTypeDescriptor: {
     auto *opaqueType = cast<OpaqueTypeDecl>(getDecl());
 
-    // The opaque result type descriptor with availability conditions
-    // has to be emitted into a client module when associated with
+    // With conditionally available substitutions, the opaque result type
+    // descriptor has to be emitted into a client module when associated with
     // `@_alwaysEmitIntoClient` declaration which means it's linkage
     // has to be "shared".
-    if (opaqueType->hasConditionallyAvailableSubstitutions()) {
-      if (auto *srcDecl = opaqueType->getNamingDecl()) {
-        if (srcDecl->getAttrs().hasAttribute<AlwaysEmitIntoClientAttr>())
-          return SILLinkage::Shared;
-      }
-    }
+    //
+    // If we don't have conditionally available substitutions, we won't emit
+    // the descriptor at all, but still make sure we report "shared" linkage
+    // so that TBD files don't include a bogus symbol.
+    auto *srcDecl = opaqueType->getNamingDecl();
+    if (srcDecl->getAttrs().hasAttribute<AlwaysEmitIntoClientAttr>())
+      return SILLinkage::Shared;
 
     return getSILLinkage(getDeclLinkage(opaqueType), forDefinition);
   }
@@ -798,15 +799,15 @@ SILLinkage LinkEntity::getLinkage(ForDefinition_t forDefinition) const {
 
   case Kind::ProtocolWitnessTableLazyAccessFunction:
   case Kind::ProtocolWitnessTableLazyCacheVariable: {
-    auto ty = getType();
-    ValueDecl *nominal = nullptr;
-    if (auto *otat = ty->getAs<OpaqueTypeArchetypeType>()) {
-      nominal = otat->getDecl();
+    TypeDecl *typeDecl = nullptr;
+    if (auto *otat = getType()->getAs<OpaqueTypeArchetypeType>()) {
+      typeDecl = otat->getDecl();
     } else {
-      nominal = ty->getAnyNominal();
+      typeDecl = getProtocolConformance()->getDeclContext()
+          ->getSelfNominalTypeDecl();
     }
-    assert(nominal);
-    if (getDeclLinkage(nominal) == FormalLinkage::Private ||
+    assert(typeDecl);
+    if (getDeclLinkage(typeDecl) == FormalLinkage::Private ||
         getLinkageAsConformance() == SILLinkage::Private) {
       return SILLinkage::Private;
     } else {

lib/SIL/IR/SILSymbolVisitor.cpp

@@ -303,7 +303,7 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
             addSymbolIfNecessary(getter, witnessDecl);
           }
         }
-      });
+      }, /*useResolver=*/true);
     }
   }
 
@@ -580,13 +580,8 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
     if (!Ctx.getOpts().VisitMembers)
       return;
 
-    for (auto member : D->getMembers()) {
-      member->visitAuxiliaryDecls([&](Decl *decl) {
-        visit(decl);
-      });
-
+    for (auto member : D->getABIMembers())
       visit(member);
-    }
   }
 
   void visitNominalTypeDecl(NominalTypeDecl *NTD) {

lib/SIL/IR/SILWitnessTable.cpp

@@ -43,8 +43,8 @@ ProtocolDecl *SILWitnessTable::getProtocol() const {
   return getConformance()->getProtocol();
 }
 
-CanType SILWitnessTable::getConformingType() const {
-  return getConformance()->getType()->getCanonicalType();
+NominalTypeDecl *SILWitnessTable::getConformingNominal() const {
+  return getConformance()->getDeclContext()->getSelfNominalTypeDecl();
 }
 
 void SILWitnessTable::addWitnessTable() {

lib/Sema/TypeCheckDecl.cpp

@@ -2671,6 +2671,7 @@ NamingPatternRequest::evaluate(Evaluator &evaluator, VarDecl *VD) const {
           }
         }
         assert(foundVarDecl && "VarDecl not declared in its parent?");
+        (void) foundVarDecl;
       } else {
         // We have some other parent stmt. Type check it completely.
         if (auto CS = dyn_cast<CaseStmt>(parentStmt))
@@ -2780,6 +2781,11 @@ static ArrayRef<Decl *> evaluateMembersRequest(
     // We need to add implicit initializers because they
     // affect vtable layout.
     TypeChecker::addImplicitConstructors(nominal);
+
+    // Destructors don't affect vtable layout, but TBDGen needs to
+    // see them, so we also force the destructor here.
+    if (auto *classDecl = dyn_cast<ClassDecl>(nominal))
+      (void) classDecl->getDestructor();
   }
 
   // Force any conformances that may introduce more members.

test/IRGen/tuple_conformances.swift

@@ -0,0 +1,34 @@
+// RUN: %target-swift-frontend -emit-ir -parse-stdlib -primary-file %s -enable-experimental-feature TupleConformances -parse-as-library | %FileCheck %s
+
+import Swift
+
+protocol P {
+  func f()
+}
+
+extension P {
+  func f() {}
+}
+
+extension Builtin.TheTupleType: P where repeat each Elements: P {
+}
+
+func takesP<T: P>(_ t: T) {
+  t.f()
+}
+
+struct S: P {}
+
+func use() {
+  takesP((S(), S()))
+}
+
+// CHECK-LABEL: define internal swiftcc void @"$sxxQp_t18tuple_conformances1PA2aBP1fyyFTW"({{i32|i64}} %0, ptr %"{{.*}}", ptr {{.*}} swiftself %1, ptr %Self, ptr %SelfWitnessTable) {{.*}} {
+
+// CHECK-LABEL: define hidden swiftcc void @"$s18tuple_conformances3useyyF"() {{.*}} {
+// CHECK: call ptr @"$s18tuple_conformances1SV_ACtxxQp_tAA1PAAWl"()
+// CHECK: ret void
+
+// CHECK-LABEL: define linkonce_odr hidden ptr @"$s18tuple_conformances1SV_ACtxxQp_tAA1PAAWl"() {{.*}} {
+
+

test/ModuleInterface/resolve-imports.swift

@@ -0,0 +1,25 @@
+// RUN: %empty-directory(%t)
+
+// RUN: %target-swift-frontend -resolve-imports %s -emit-module-interface-path %t/main.swiftinterface -enable-library-evolution
+// RUN: %FileCheck %s < %t/main.swiftinterface
+
+// CHECK: import Swift
+
+// CHECK: public func f() -> Swift.Int
+public func f() -> Int {}
+
+// Deliberate semantic errors to ensure private and internal declarations don't
+// get type checked.
+private func bad1(_: NotAThing) -> DoesNotExist {}
+
+internal typealias Bad1 = NotEvenReal.DefinitelyNot
+
+// Destructors
+public class C {}
+
+// CHECK: public class C {
+// CHECK: deinit
+// CHECK: }
+
+// Globals
+public var year = 2023

test/TBD/resolve_imports.swift

@@ -0,0 +1,34 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -resolve-imports -emit-tbd -emit-tbd-path %t/resolve_imports.tbd %s -disable-availability-checking
+// RUN: %FileCheck %s < %t/resolve_imports.tbd
+
+// REQUIRES: OS=macosx 
+
+// Correct linkage for opaque type descriptor.
+@_alwaysEmitIntoClient public var x: some Any {
+  get {
+  if #available(macOS 20, *) {
+    return 3
+  } else {
+    return "hi"
+  }
+  }
+}
+
+// Make sure we emit all ABI members.
+public class C {}
+
+// Edge case where protocol witness thunk is public.
+protocol PrivateProto: Equatable {}
+
+extension PrivateProto {
+  public static func ==(lhs: Self, rhs: Self) -> Bool { return false }
+}
+
+public struct S: PrivateProto {}
+
+// CHECK: symbols: [ '_$s15resolve_imports1CCMa', '_$s15resolve_imports1CCMm', 
+// CHECK-NEXT:       '_$s15resolve_imports1CCMn', '_$s15resolve_imports1CCN', '_$s15resolve_imports1CCfD', 
+// CHECK-NEXT:       '_$s15resolve_imports1CCfd', '_$s15resolve_imports1SVMa', 
+// CHECK-NEXT:       '_$s15resolve_imports1SVMn', '_$s15resolve_imports1SVN', '_$s15resolve_imports1SVSQAAMc', 
+// CHECK-NEXT:       '_$s15resolve_imports1SVSQAASQ2eeoiySbx_xtFZTW', _main ]