Sema: Move -debug-generic-signatures behavior to TypeCheckDeclPrimary.cpp

Author: slavapestov

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -2064,6 +2064,27 @@ static void checkProtocolRefinementRequirements(ProtocolDecl *proto) {
   }
 }
 
+static void dumpGenericSignature(ASTContext &ctx, GenericContext *GC) {
+  if (ctx.TypeCheckerOpts.DebugGenericSignatures) {
+    llvm::errs() << "\n";
+    if (auto *VD = dyn_cast_or_null<ValueDecl>(GC->getAsDecl())) {
+      VD->dumpRef(llvm::errs());
+      llvm::errs() << "\n";
+    } else {
+      GC->printContext(llvm::errs());
+    }
+    auto sig = GC->getGenericSignature();
+    llvm::errs() << "Generic signature: ";
+    PrintOptions Opts;
+    Opts.ProtocolQualifiedDependentMemberTypes = true;
+    sig->print(llvm::errs(), Opts);
+    llvm::errs() << "\n";
+    llvm::errs() << "Canonical generic signature: ";
+    sig.getCanonicalSignature()->print(llvm::errs(), Opts);
+    llvm::errs() << "\n";
+  }
+}
+
 namespace {
 class DeclChecker : public DeclVisitor<DeclChecker> {
 public:
@@ -2711,9 +2732,12 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
   void visitSubscriptDecl(SubscriptDecl *SD) {
     auto *DC = SD->getDeclContext();
 
+    // Force creation of the generic signature.
+    (void) SD->getGenericSignature();
+    dumpGenericSignature(Ctx, SD);
+
     // Force requests that can emit diagnostics.
     (void) SD->getInterfaceType();
-    (void) SD->getGenericSignature();
 
     if (!SD->isInvalid()) {
       TypeChecker::checkReferencedGenericParams(SD);
@@ -2803,8 +2827,11 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
   }
 
   void visitTypeAliasDecl(TypeAliasDecl *TAD) {
-    // Force requests that can emit diagnostics.
+    // Force creation of the generic signature.
     (void) TAD->getGenericSignature();
+    dumpGenericSignature(Ctx, TAD);
+
+    // Force requests that can emit diagnostics.
     (void) TAD->getUnderlyingType();
 
     // Make sure to check the underlying type.
@@ -2930,6 +2957,10 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
   void visitEnumDecl(EnumDecl *ED) {
     checkUnsupportedNestedType(ED);
 
+    // Force creation of the generic signature.
+    (void) ED->getGenericSignature();
+    dumpGenericSignature(Ctx, ED);
+
     // Temporary restriction until we figure out pattern matching and
     // enum case construction with packs.
     if (auto genericSig = ED->getGenericSignature()) {
@@ -3012,6 +3043,10 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
   void visitStructDecl(StructDecl *SD) {
     checkUnsupportedNestedType(SD);
 
+    // Force creation of the generic signature.
+    (void) SD->getGenericSignature();
+    dumpGenericSignature(Ctx, SD);
+
     checkGenericParams(SD);
 
     // Force lowering of stored properties.
@@ -3206,6 +3241,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     // Force creation of the generic signature.
     (void) CD->getGenericSignature();
+    dumpGenericSignature(Ctx, CD);
 
     checkGenericParams(CD);
 
@@ -3317,7 +3353,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         auto *superFile = Super->getModuleScopeContext();
         if (auto *serialized = dyn_cast<SerializedASTFile>(superFile)) {
           const auto effVersion =
-              CD->getASTContext().LangOpts.EffectiveLanguageVersion;
+              Ctx.LangOpts.EffectiveLanguageVersion;
           if (serialized->getLanguageVersionBuiltWith() != effVersion) {
             CD->diagnose(
                 diag::
@@ -3433,6 +3469,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       llvm::errs() << "\n";
     }
 
+    dumpGenericSignature(Ctx, PD);
+
     if (!reqSig.getErrors()) {
       // Always verify signatures, even if building without asserts.
       //
@@ -3463,6 +3501,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     (void) FD->getOperatorDecl();
     (void) FD->getDynamicallyReplacedDecl();
 
+    dumpGenericSignature(Ctx, FD);
+
     if (!isa<AccessorDecl>(FD)) {
       if (!FD->isInvalid()) {
         checkGenericParams(FD);
@@ -3875,9 +3915,12 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
   }
 
   void visitConstructorDecl(ConstructorDecl *CD) {
-    (void) CD->getInterfaceType();
+    // Force creation of the generic signature.
+    (void) CD->getGenericSignature();
+    dumpGenericSignature(Ctx, CD);
 
     // Compute these requests in case they emit diagnostics.
+    (void) CD->getInterfaceType();
     (void) CD->getInitKind();
 
     if (!CD->isInvalid()) {

lib/Sema/TypeCheckGeneric.cpp

@@ -643,23 +643,7 @@ GenericSignatureRequest::evaluate(Evaluator &evaluator,
     auto req =
         Requirement(RequirementKind::Conformance, self,
                     PD->getDeclaredInterfaceType());
-    auto sig = GenericSignature::get({self}, {req});
-
-    // Debugging of the generic signature builder and generic signature
-    // generation.
-    if (ctx.TypeCheckerOpts.DebugGenericSignatures) {
-      llvm::errs() << "\n";
-      PD->printContext(llvm::errs());
-      llvm::errs() << "Generic signature: ";
-      PrintOptions Opts;
-      Opts.ProtocolQualifiedDependentMemberTypes = true;
-      sig->print(llvm::errs(), Opts);
-      llvm::errs() << "\n";
-      llvm::errs() << "Canonical generic signature: ";
-      sig.getCanonicalSignature()->print(llvm::errs(), Opts);
-      llvm::errs() << "\n";
-    }
-    return sig;
+    return GenericSignature::get({self}, {req});
   }
 
   if (auto accessor = dyn_cast<AccessorDecl>(GC))
@@ -824,30 +808,8 @@ GenericSignatureRequest::evaluate(Evaluator &evaluator,
       genericParams, WhereClauseOwner(GC),
       extraReqs, inferenceSources,
       allowConcreteGenericParams};
-  auto sig = evaluateOrDefault(ctx.evaluator, request,
-                               GenericSignatureWithError()).getPointer();
-
-  // Debugging of the generic signature builder and generic signature
-  // generation.
-  if (ctx.TypeCheckerOpts.DebugGenericSignatures) {
-    llvm::errs() << "\n";
-    if (auto *VD = dyn_cast_or_null<ValueDecl>(GC->getAsDecl())) {
-      VD->dumpRef(llvm::errs());
-      llvm::errs() << "\n";
-    } else {
-      GC->printContext(llvm::errs());
-    }
-    llvm::errs() << "Generic signature: ";
-    PrintOptions Opts;
-    Opts.ProtocolQualifiedDependentMemberTypes = true;
-    sig->print(llvm::errs(), Opts);
-    llvm::errs() << "\n";
-    llvm::errs() << "Canonical generic signature: ";
-    sig.getCanonicalSignature()->print(llvm::errs(), Opts);
-    llvm::errs() << "\n";
-  }
-
-  return sig;
+  return evaluateOrDefault(ctx.evaluator, request,
+                           GenericSignatureWithError()).getPointer();
 }
 
 ///