Merge pull request swiftlang#31880 from CodaFi/setup-assistant

[NFC] Drop TypeCheckerDebugConsumer

Author: CodaFi

include/swift/AST/ASTContext.h

@@ -111,7 +111,6 @@ namespace swift {
   class SourceManager;
   class ValueDecl;
   class DiagnosticEngine;
-  class TypeCheckerDebugConsumer;
   struct RawComment;
   class DocComment;
   class SILBoxType;
@@ -276,9 +275,6 @@ class ASTContext final {
 #define IDENTIFIER_WITH_NAME(Name, IdStr) Identifier Id_##Name;
 #include "swift/AST/KnownIdentifiers.def"
 
-  /// A consumer of type checker debug output.
-  std::unique_ptr<TypeCheckerDebugConsumer> TypeCheckerDebug;
-
   /// Cache for names of canonical GenericTypeParamTypes.
   mutable llvm::DenseMap<unsigned, Identifier>
     CanonicalGenericTypeParamTypeNames;

include/swift/AST/TypeCheckerDebugConsumer.h

@@ -44,7 +44,6 @@
 #include "swift/AST/SubstitutionMap.h"
 #include "swift/AST/SILLayout.h"
 #include "swift/AST/TypeCheckRequests.h"
-#include "swift/AST/TypeCheckerDebugConsumer.h"
 #include "swift/Basic/Compiler.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Basic/Statistic.h"
@@ -557,7 +556,6 @@ ASTContext::ASTContext(LangOptions &langOpts, TypeCheckerOptions &typeckOpts,
     TheBuiltinModule(createBuiltinModule(*this)),
     StdlibModuleName(getIdentifier(STDLIB_NAME)),
     SwiftShimsModuleName(getIdentifier(SWIFT_SHIMS_NAME)),
-    TypeCheckerDebug(new StderrTypeCheckerDebugConsumer()),
     TheErrorType(
       new (*this, AllocationArena::Permanent)
         ErrorType(*this, Type(), RecursiveTypeProperties::HasError)),
@@ -3833,45 +3831,6 @@ void TypeLoc::setInvalidType(ASTContext &C) {
   Ty = ErrorType::get(C);
 }
 
-namespace {
-class raw_capturing_ostream : public raw_ostream {
-  std::string Message;
-  uint64_t Pos;
-  CapturingTypeCheckerDebugConsumer &Listener;
-
-public:
-  raw_capturing_ostream(CapturingTypeCheckerDebugConsumer &Listener)
-      : Listener(Listener) {}
-
-  ~raw_capturing_ostream() override {
-    flush();
-  }
-
-  void write_impl(const char *Ptr, size_t Size) override {
-    Message.append(Ptr, Size);
-    Pos += Size;
-
-    // Check if we have at least one complete line.
-    size_t LastNewline = StringRef(Message).rfind('\n');
-    if (LastNewline == StringRef::npos)
-      return;
-    Listener.handleMessage(StringRef(Message.data(), LastNewline + 1));
-    Message.erase(0, LastNewline + 1);
-  }
-
-  uint64_t current_pos() const override {
-    return Pos;
-  }
-};
-} // unnamed namespace
-
-TypeCheckerDebugConsumer::~TypeCheckerDebugConsumer() { }
-
-CapturingTypeCheckerDebugConsumer::CapturingTypeCheckerDebugConsumer()
-    : Log(new raw_capturing_ostream(*this)) {
-  Log->SetUnbuffered();
-}
-
 void SubstitutionMap::Storage::Profile(
                                llvm::FoldingSetNodeID &id,
                                GenericSignature genericSig,

lib/AST/ASTContext.cpp

@@ -634,6 +634,23 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.VerifySyntaxTree = true;
   }
 
+  // If we are asked to emit a module documentation file, configure lexing and
+  // parsing to remember comments.
+  if (FrontendOpts.InputsAndOutputs.hasModuleDocOutputPath()) {
+    Opts.AttachCommentsToDecls = true;
+  }
+
+  // If we are doing index-while-building, configure lexing and parsing to
+  // remember comments.
+  if (!FrontendOpts.IndexStorePath.empty()) {
+    Opts.AttachCommentsToDecls = true;
+  }
+
+  // If we're parsing SIL, access control doesn't make sense to enforce.
+  if (FrontendOpts.InputKind == InputFileKind::SIL) {
+    Opts.EnableAccessControl = false;
+  }
+
   return HadError || UnsupportedOS || UnsupportedArch;
 }
 

lib/Frontend/CompilerInvocation.cpp

@@ -298,24 +298,8 @@ bool CompilerInstance::setup(const CompilerInvocation &Invok) {
   setUpLLVMArguments();
   setUpDiagnosticOptions();
 
-  const auto &frontendOpts = Invocation.getFrontendOptions();
-
-  // If we are asked to emit a module documentation file, configure lexing and
-  // parsing to remember comments.
-  if (frontendOpts.InputsAndOutputs.hasModuleDocOutputPath())
-    Invocation.getLangOptions().AttachCommentsToDecls = true;
-
-  // If we are doing index-while-building, configure lexing and parsing to
-  // remember comments.
-  if (!frontendOpts.IndexStorePath.empty()) {
-    Invocation.getLangOptions().AttachCommentsToDecls = true;
-  }
-
   assert(Lexer::isIdentifier(Invocation.getModuleName()));
 
-  if (isInSILMode())
-    Invocation.getLangOptions().EnableAccessControl = false;
-
   if (setUpInputs())
     return true;
 

lib/Frontend/Frontend.cpp

@@ -8320,9 +8320,8 @@ ExprWalker::rewriteTarget(SolutionApplicationTarget target) {
     solution.setExprTypes(resultExpr);
     result.setExpr(resultExpr);
 
-    auto &ctx = cs.getASTContext();
     if (cs.isDebugMode()) {
-      auto &log = ctx.TypeCheckerDebug->getStream();
+      auto &log = llvm::errs();
       log << "---Type-checked expression---\n";
       resultExpr->dump(log);
       log << "\n";

lib/Sema/CSApply.cpp

@@ -108,8 +108,7 @@ ConstraintSystem::determineBestBindings() {
     inferTransitiveSupertypeBindings(cache, bindings);
 
     if (isDebugMode()) {
-      auto &log = getASTContext().TypeCheckerDebug->getStream();
-      bindings.dump(typeVar, log, solverState->depth * 2);
+      bindings.dump(typeVar, llvm::errs(), solverState->depth * 2);
     }
 
     // If these are the first bindings, or they are better than what

lib/Sema/CSBindings.cpp

@@ -4405,7 +4405,7 @@ bool ConstraintSystem::generateConstraints(
     }
 
     if (isDebugMode()) {
-      auto &log = getASTContext().TypeCheckerDebug->getStream();
+      auto &log = llvm::errs();
       log << "---Initial constraints for the given expression---\n";
       print(log, expr);
       log << "\n";

lib/Sema/CSGen.cpp

@@ -36,61 +36,60 @@ void ConstraintSystem::increaseScore(ScoreKind kind, unsigned value) {
   CurrentScore.Data[index] += value;
 
   if (isDebugMode() && value > 0) {
-    auto &log = getASTContext().TypeCheckerDebug->getStream();
     if (solverState)
-      log.indent(solverState->depth * 2);
-    log << "(increasing score due to ";
+      llvm::errs().indent(solverState->depth * 2);
+    llvm::errs() << "(increasing score due to ";
     switch (kind) {
     case SK_Hole:
-      log << "hole in the constraint system";
+      llvm::errs() << "hole in the constraint system";
       break;
 
     case SK_Unavailable:
-      log << "use of an unavailable declaration";
+      llvm::errs() << "use of an unavailable declaration";
       break;
 
     case SK_Fix:
-      log << "attempting to fix the source";
+      llvm::errs() << "attempting to fix the source";
       break;
 
     case SK_DisfavoredOverload:
-      log << "disfavored overload";
+      llvm::errs() << "disfavored overload";
       break;
 
     case SK_ForceUnchecked:
-      log << "force of an implicitly unwrapped optional";
+      llvm::errs() << "force of an implicitly unwrapped optional";
       break;
 
     case SK_UserConversion:
-      log << "user conversion";
+      llvm::errs() << "user conversion";
       break;
 
     case SK_FunctionConversion:
-      log << "function conversion";
+      llvm::errs() << "function conversion";
       break;
 
     case SK_NonDefaultLiteral:
-      log << "non-default literal";
+      llvm::errs() << "non-default literal";
       break;
 
     case SK_CollectionUpcastConversion:
-      log << "collection upcast conversion";
+      llvm::errs() << "collection upcast conversion";
       break;
 
     case SK_ValueToOptional:
-      log << "value to optional";
+      llvm::errs() << "value to optional";
       break;
     case SK_EmptyExistentialConversion:
-      log << "empty-existential conversion";
+      llvm::errs() << "empty-existential conversion";
       break;
     case SK_KeyPathSubscript:
-      log << "key path subscript";
+      llvm::errs() << "key path subscript";
       break;
     case SK_ValueToPointerConversion:
-      log << "value-to-pointer conversion";
+      llvm::errs() << "value-to-pointer conversion";
       break;
     }
-    log << ")\n";
+    llvm::errs() << ")\n";
   }
 }
 
@@ -103,8 +102,7 @@ bool ConstraintSystem::worseThanBestSolution() const {
     return false;
 
   if (isDebugMode()) {
-    auto &log = getASTContext().TypeCheckerDebug->getStream();
-    log.indent(solverState->depth * 2)
+    llvm::errs().indent(solverState->depth * 2)
       << "(solution is worse than the best solution)\n";
   }
 
@@ -389,21 +387,20 @@ bool CompareDeclSpecializationRequest::evaluate(
   // Construct a constraint system to compare the two declarations.
   ConstraintSystem cs(dc, ConstraintSystemOptions());
   if (cs.isDebugMode()) {
-    auto &log = C.TypeCheckerDebug->getStream();
-    log << "Comparing declarations\n";
-    decl1->print(log); 
-    log << "\nand\n";
-    decl2->print(log);
-    log << "\n(isDynamicOverloadComparison: ";
-    log << isDynamicOverloadComparison;
-    log << ")\n";
+    llvm::errs() << "Comparing declarations\n";
+    decl1->print(llvm::errs());
+    llvm::errs() << "\nand\n";
+    decl2->print(llvm::errs());
+    llvm::errs() << "\n(isDynamicOverloadComparison: ";
+    llvm::errs() << isDynamicOverloadComparison;
+    llvm::errs() << ")\n";
   }
 
-  auto completeResult = [&C, &cs](bool result) {
+  auto completeResult = [&cs](bool result) {
     if (cs.isDebugMode()) {
-      auto &log = C.TypeCheckerDebug->getStream();
-      log << "comparison result: " << (result ? "better" : "not better")
-          << "\n";
+      llvm::errs() << "comparison result: "
+                   << (result ? "better" : "not better")
+                   << "\n";
     }
     return result;
   };
@@ -738,8 +735,7 @@ SolutionCompareResult ConstraintSystem::compareSolutions(
     ConstraintSystem &cs, ArrayRef<Solution> solutions,
     const SolutionDiff &diff, unsigned idx1, unsigned idx2) {
   if (cs.isDebugMode()) {
-    auto &log = cs.getASTContext().TypeCheckerDebug->getStream();
-    log.indent(cs.solverState->depth * 2)
+    llvm::errs().indent(cs.solverState->depth * 2)
       << "comparing solutions " << idx1 << " and " << idx2 <<"\n";
   }
 
@@ -1262,13 +1258,13 @@ ConstraintSystem::findBestSolution(SmallVectorImpl<Solution> &viable,
     return 0;
 
   if (isDebugMode()) {
-    auto &log = getASTContext().TypeCheckerDebug->getStream();
-    log.indent(solverState->depth * 2)
+    llvm::errs().indent(solverState->depth * 2)
         << "Comparing " << viable.size() << " viable solutions\n";
 
     for (unsigned i = 0, n = viable.size(); i != n; ++i) {
-      log.indent(solverState->depth * 2) << "--- Solution #" << i << " ---\n";
-      viable[i].dump(log.indent(solverState->depth * 2));
+      llvm::errs().indent(solverState->depth * 2)
+          << "--- Solution #" << i << " ---\n";
+      viable[i].dump(llvm::errs().indent(solverState->depth * 2));
     }
   }
 

lib/Sema/CSRanking.cpp

@@ -8144,10 +8144,8 @@ bool ConstraintSystem::simplifyAppliedOverloadsImpl(
 
   // If we have a common result type, bind the expected result type to it.
   if (commonResultType && !commonResultType->is<ErrorType>()) {
-    ASTContext &ctx = getASTContext();
     if (isDebugMode()) {
-      auto &log = ctx.TypeCheckerDebug->getStream();
-      log.indent(solverState ? solverState->depth * 2 : 0)
+      llvm::errs().indent(solverState ? solverState->depth * 2 : 0)
         << "(common result type for $T" << fnTypeVar->getID() << " is "
         << commonResultType.getString()
         << ")\n";
@@ -9286,9 +9284,8 @@ static bool isAugmentingFix(ConstraintFix *fix) {
 }
 
 bool ConstraintSystem::recordFix(ConstraintFix *fix, unsigned impact) {
-  auto &ctx = getASTContext();
   if (isDebugMode()) {
-    auto &log = ctx.TypeCheckerDebug->getStream();
+    auto &log = llvm::errs();
     log.indent(solverState ? solverState->depth * 2 : 0)
       << "(attempting fix ";
     fix->print(log);