Merge pull request #30954 from rintaro/ide-completion-prettystacktrace

[CodeCompletion] Add pretty stacktrace for completion operation

Author: rintaro

include/swift/AST/PrettyStackTrace.h

@@ -220,6 +220,17 @@ void printDifferentiabilityWitnessDescription(
     llvm::raw_ostream &out, const SILDifferentiabilityWitnessKey key,
     bool addNewline = true);
 
+/// PrettyStackTraceDeclContext - Observe that we are processing a
+/// specific decl context.
+class PrettyStackTraceDeclContext : public llvm::PrettyStackTraceEntry {
+  const DeclContext *DC;
+  const char *Action;
+public:
+  PrettyStackTraceDeclContext(const char *action, const DeclContext *DC)
+    : DC(DC), Action(action) {}
+  virtual void print(llvm::raw_ostream &OS) const;
+};
+
 } // end namespace swift
 
 #endif

lib/AST/PrettyStackTrace.cpp

@@ -288,3 +288,10 @@ void swift::printDifferentiabilityWitnessDescription(
   if (addNewline)
     out << '\n';
 }
+
+void PrettyStackTraceDeclContext::print(llvm::raw_ostream &out) const {
+  out << "While " << Action << " in decl context:\n";
+  out << "    ---\n";
+  DC->printContext(out, /*indent=*/4);
+  out << "    ---\n";
+}

lib/IDE/CompletionInstance.cpp

@@ -16,8 +16,10 @@
 #include "swift/AST/DiagnosticEngine.h"
 #include "swift/AST/DiagnosticsFrontend.h"
 #include "swift/AST/Module.h"
+#include "swift/AST/PrettyStackTrace.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/Basic/LangOptions.h"
+#include "swift/Basic/PrettyStackTrace.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Driver/FrontendUtil.h"
 #include "swift/Frontend/Frontend.h"
@@ -167,6 +169,8 @@ bool CompletionInstance::performCachedOperaitonIfPossible(
     llvm::MemoryBuffer *completionBuffer, unsigned int Offset,
     DiagnosticConsumer *DiagC,
     llvm::function_ref<void(CompilerInstance &, bool)> Callback) {
+  llvm::PrettyStackTraceString trace(
+      "While performing cached completion if possible");
 
   if (!CachedCI)
     return false;
@@ -218,7 +222,7 @@ bool CompletionInstance::performCachedOperaitonIfPossible(
 
   auto &newInfo = newState->getCodeCompletionDelayedDeclState();
   unsigned newBufferID;
-
+  DeclContext *traceDC = nullptr;
   switch (newInfo.Kind) {
   case CodeCompletionDelayedDeclKind::FunctionBody: {
     // If the interface has changed, AST must be refreshed.
@@ -285,6 +289,7 @@ bool CompletionInstance::performCachedOperaitonIfPossible(
     if (AFD->isBodySkipped())
       AFD->setBodyDelayed(AFD->getBodySourceRange());
 
+    traceDC = AFD;
     break;
   }
   case CodeCompletionDelayedDeclKind::Decl:
@@ -329,6 +334,7 @@ bool CompletionInstance::performCachedOperaitonIfPossible(
     performImportResolution(*newSF);
     bindExtensions(*newSF);
 
+    traceDC = newM;
 #ifndef NDEBUG
     const auto *reparsedState = newSF->getDelayedParserState();
     assert(reparsedState->hasCodeCompletionDelayedDeclState() &&
@@ -341,13 +347,17 @@ bool CompletionInstance::performCachedOperaitonIfPossible(
   }
   }
 
-  if (DiagC)
-    CI.addDiagnosticConsumer(DiagC);
+  {
+    PrettyStackTraceDeclContext trace("performing cached completion", traceDC);
 
-  Callback(CI, /*reusingASTContext=*/true);
+    if (DiagC)
+      CI.addDiagnosticConsumer(DiagC);
 
-  if (DiagC)
-    CI.removeDiagnosticConsumer(DiagC);
+    Callback(CI, /*reusingASTContext=*/true);
+
+    if (DiagC)
+      CI.removeDiagnosticConsumer(DiagC);
+  }
 
   CachedReuseCount += 1;
 
@@ -360,6 +370,7 @@ bool CompletionInstance::performNewOperation(
     llvm::MemoryBuffer *completionBuffer, unsigned int Offset,
     std::string &Error, DiagnosticConsumer *DiagC,
     llvm::function_ref<void(CompilerInstance &, bool)> Callback) {
+  llvm::PrettyStackTraceString trace("While performing new completion");
 
   auto TheInstance = std::make_unique<CompilerInstance>();
   {