---

yaml
---
r: 345062
b: refs/heads/master
c: 6c91760
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ad3238f943eae0911038131386b1d5671c7f4bda
+refs/heads/master: 6c917606f0ebfb601173555bbab0b3bb65472df1
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/Evaluator.h

@@ -238,6 +238,9 @@ class Evaluator {
   /// diagnostics through the given diagnostics engine.
   Evaluator(DiagnosticEngine &diags, CycleDiagnosticKind shouldDiagnoseCycles);
 
+  /// Emit GraphViz output visualizing the request graph.
+  void emitRequestEvaluatorGraphViz(llvm::StringRef graphVizPath);
+
   /// Set the unified stats reporter through which evaluated-request
   /// statistics will be recorded.
   void setStatsReporter(UnifiedStatsReporter *stats) { this->stats = stats; }

trunk/include/swift/AST/TypeCheckRequests.h

@@ -297,6 +297,31 @@ class RequirementRequest :
   void cacheResult(Requirement value) const;
 };
 
+/// Generate the USR for the given declaration.
+class USRGenerationRequest :
+    public SimpleRequest<USRGenerationRequest,
+                         CacheKind::Cached,
+                         std::string,
+                         const ValueDecl*>
+{
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend class SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<std::string> evaluate(Evaluator &eval, const ValueDecl* d) const;
+
+public:
+  // Cycle handling
+  void diagnoseCycle(DiagnosticEngine &diags) const;
+  void noteCycleStep(DiagnosticEngine &diags) const;
+
+  // Caching
+  bool isCached() const { return true; }
+};
+
 /// The zone number for the type checker.
 #define SWIFT_TYPE_CHECKER_REQUESTS_TYPEID_ZONE 10
 

trunk/include/swift/AST/TypeCheckerTypeIDZone.def

@@ -21,3 +21,4 @@ SWIFT_TYPEID(OverriddenDeclsRequest)
 SWIFT_TYPEID(IsObjCRequest)
 SWIFT_TYPEID(IsDynamicRequest)
 SWIFT_TYPEID(RequirementRequest)
+SWIFT_TYPEID(USRGenerationRequest)

trunk/include/swift/Basic/CTypeIDZone.def

@@ -32,6 +32,7 @@ SWIFT_TYPEID_NAMED(double, Double)
 SWIFT_TYPEID_NAMED(bool, Bool)
 SWIFT_TYPEID_NAMED(decltype(nullptr), NullPtr)
 SWIFT_TYPEID_NAMED(void, Void)
+SWIFT_TYPEID_NAMED(std::string, String)
 
 // C++ standard library types.
 SWIFT_TYPEID_TEMPLATE1_NAMED(std::vector, Vector, typename T, T)

trunk/include/swift/Basic/LangOptions.h

@@ -176,6 +176,10 @@ namespace swift {
     CycleDiagnosticKind EvaluatorCycleDiagnostics =
         CycleDiagnosticKind::NoDiagnose;
 
+    /// \brief The path to which we should emit GraphViz output for the complete
+    /// request-evaluator graph.
+    std::string RequestEvaluatorGraphVizPath;
+
     /// \brief The upper bound, in bytes, of temporary data that can be
     /// allocated by the constraint solver.
     unsigned SolverMemoryThreshold = 512 * 1024 * 1024;

trunk/include/swift/Basic/SimpleDisplay.h

@@ -49,6 +49,7 @@ namespace swift {
   HAS_TRIVIAL_DISPLAY(float);
   HAS_TRIVIAL_DISPLAY(double);
   HAS_TRIVIAL_DISPLAY(bool);
+  HAS_TRIVIAL_DISPLAY(std::string);
 
 #undef HAS_TRIVIAL_DISPLAY
 

trunk/include/swift/Frontend/FrontendOptions.h

@@ -72,10 +72,6 @@ class FrontendOptions {
   /// The path to which we should store indexing data, if any.
   std::string IndexStorePath;
 
-  /// The path to which we should emit GraphViz output for the complete
-  /// request-evaluator graph.
-  std::string RequestEvaluatorGraphVizPath;
-
   /// Emit index data for imported serialized swift system modules.
   bool IndexSystemModules = false;
 

trunk/lib/AST/ASTContext.cpp

@@ -518,6 +518,11 @@ ASTContext::ASTContext(LangOptions &langOpts, SearchPathOptions &SearchPathOpts,
 }
 
 ASTContext::~ASTContext() {
+  // Emit evaluator dependency graph if requested.
+  auto graphPath = LangOpts.RequestEvaluatorGraphVizPath;
+  if (!graphPath.empty()) {
+    evaluator.emitRequestEvaluatorGraphViz(graphPath);
+  }
   getImpl().~Implementation();
 }
 

trunk/lib/AST/Evaluator.cpp

@@ -18,6 +18,7 @@
 #include "swift/Basic/Range.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/FileSystem.h"
 
 using namespace swift;
 
@@ -62,6 +63,12 @@ Evaluator::Evaluator(DiagnosticEngine &diags,
                      CycleDiagnosticKind shouldDiagnoseCycles)
   : diags(diags), shouldDiagnoseCycles(shouldDiagnoseCycles) { }
 
+void Evaluator::emitRequestEvaluatorGraphViz(llvm::StringRef graphVizPath) {
+  std::error_code error;
+  llvm::raw_fd_ostream out(graphVizPath, error, llvm::sys::fs::F_Text);
+  printDependenciesGraphviz(out);
+}
+
 bool Evaluator::checkDependency(const AnyRequest &request) {
   // If there is an active request, record it's dependency on this request.
   if (!activeRequests.empty())

trunk/lib/AST/TypeCheckRequests.cpp

@@ -412,3 +412,19 @@ void RequirementRequest::cacheResult(Requirement value) const {
     break;
   }
 }
+
+//----------------------------------------------------------------------------//
+// USR computation.
+//----------------------------------------------------------------------------//
+
+void USRGenerationRequest::diagnoseCycle(DiagnosticEngine &diags) const {
+  const auto &storage = getStorage();
+  auto &d = std::get<0>(storage);
+  diags.diagnose(d, diag::circular_reference);
+}
+
+void USRGenerationRequest::noteCycleStep(DiagnosticEngine &diags) const {
+  const auto &storage = getStorage();
+  auto &d = std::get<0>(storage);
+  diags.diagnose(d, diag::circular_reference);
+}

trunk/lib/AST/USRGeneration.cpp

@@ -15,6 +15,7 @@
 #include "swift/AST/USRGeneration.h"
 #include "swift/AST/ASTMangler.h"
 #include "swift/AST/SwiftNameTranslation.h"
+#include "swift/AST/TypeCheckRequests.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
@@ -163,13 +164,14 @@ static bool shouldUseObjCUSR(const Decl *D) {
   return false;
 }
 
-bool ide::printDeclUSR(const ValueDecl *D, raw_ostream &OS) {
+llvm::Expected<std::string>
+swift::USRGenerationRequest::evaluate(Evaluator &evaluator, const ValueDecl* D) const {
   if (!D->hasName() && !isa<ParamDecl>(D) && !isa<AccessorDecl>(D))
-    return true; // Ignore.
+    return std::string(); // Ignore.
   if (D->getModuleContext()->isBuiltinModule())
-    return true; // Ignore.
+    return std::string(); // Ignore.
   if (isa<ModuleDecl>(D))
-    return true; // Ignore.
+    return std::string(); // Ignore.
 
   auto interpretAsClangNode = [](const ValueDecl *D)->ClangNode {
     ClangNode ClangN = D->getClangNode();
@@ -200,13 +202,17 @@ bool ide::printDeclUSR(const ValueDecl *D, raw_ostream &OS) {
     return ClangN;
   };
 
+  llvm::SmallString<128> Buffer;
+  llvm::raw_svector_ostream OS(Buffer);
+
   if (ClangNode ClangN = interpretAsClangNode(D)) {
-    llvm::SmallString<128> Buf;
     if (auto ClangD = ClangN.getAsDecl()) {
-      bool Ignore = clang::index::generateUSRForDecl(ClangD, Buf);
-      if (!Ignore)
-        OS << Buf.str();
-      return Ignore;
+      bool Ignore = clang::index::generateUSRForDecl(ClangD, Buffer);
+      if (!Ignore) {
+        return Buffer.str();
+      } else {
+        return std::string();
+      }
     }
 
     auto &Importer = *D->getASTContext().getClangModuleLoader();
@@ -215,30 +221,41 @@ bool ide::printDeclUSR(const ValueDecl *D, raw_ostream &OS) {
     bool Ignore = clang::index::generateUSRForMacro(
         D->getBaseName().getIdentifier().str(),
         ClangMacroInfo->getDefinitionLoc(),
-        Importer.getClangASTContext().getSourceManager(), Buf);
+        Importer.getClangASTContext().getSourceManager(), Buffer);
     if (!Ignore)
-      OS << Buf.str();
-    return Ignore;
+      return Buffer.str();
+    else
+      return std::string();
   }
 
   if (shouldUseObjCUSR(D)) {
-    return printObjCUSR(D, OS);
+    if (printObjCUSR(D, OS)) {
+      return std::string();
+    } else {
+      return OS.str();
+    }
   }
 
   if (!D->hasInterfaceType())
-    return true;
+    return std::string();
 
   // Invalid code.
   if (D->getInterfaceType().findIf([](Type t) -> bool {
         return t->is<ModuleType>();
       }))
-    return true;
+    return std::string();
 
   Mangle::ASTMangler NewMangler;
-  std::string Mangled = NewMangler.mangleDeclAsUSR(D, getUSRSpacePrefix());
-
-  OS << Mangled;
+  return NewMangler.mangleDeclAsUSR(D, getUSRSpacePrefix());
+}
 
+bool ide::printDeclUSR(const ValueDecl *D, raw_ostream &OS) {
+  auto result = evaluateOrDefault(D->getASTContext().evaluator,
+                                  USRGenerationRequest { D },
+                                  std::string());
+  if (result.empty())
+    return true;
+  OS << result;
   return false;
 }
 

trunk/lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -60,9 +60,6 @@ bool ArgsToFrontendOptionsConverter::convert(
   if (const Arg *A = Args.getLastArg(OPT_index_store_path)) {
     Opts.IndexStorePath = A->getValue();
   }
-  if (const Arg *A = Args.getLastArg(OPT_output_request_graphviz)) {
-    Opts.RequestEvaluatorGraphVizPath = A->getValue();
-  }
 
   Opts.IndexSystemModules |= Args.hasArg(OPT_index_system_modules);
 

trunk/lib/Frontend/CompilerInvocation.cpp

@@ -259,6 +259,10 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.EvaluatorCycleDiagnostics = CycleDiagnosticKind::DebugDiagnose;
   }
 
+  if (const Arg *A = Args.getLastArg(OPT_output_request_graphviz)) {
+    Opts.RequestEvaluatorGraphVizPath = A->getValue();
+  }
+
   if (const Arg *A = Args.getLastArg(OPT_solver_memory_threshold)) {
     unsigned threshold;
     if (StringRef(A->getValue()).getAsInteger(10, threshold)) {

trunk/lib/FrontendTool/FrontendTool.cpp

@@ -868,13 +868,6 @@ emitIndexData(CompilerInvocation &Invocation, CompilerInstance &Instance) {
   return hadEmitIndexDataError;
 }
 
-/// Emits the request-evaluator graph to the given file in GraphViz format.
-void emitRequestEvaluatorGraphViz(ASTContext &ctx, StringRef graphVizPath) {
-  std::error_code error;
-  llvm::raw_fd_ostream out(graphVizPath, error, llvm::sys::fs::F_Text);
-  ctx.evaluator.printDependenciesGraphviz(out);
-}
-
 static bool performCompileStepsPostSILGen(
     CompilerInstance &Instance, CompilerInvocation &Invocation,
     std::unique_ptr<SILModule> SM, bool astGuaranteedToCorrespondToSIL,
@@ -917,17 +910,6 @@ static bool performCompile(CompilerInstance &Instance,
     Instance.performSema();
   }
 
-  SWIFT_DEFER {
-    // Emit request-evaluator graph via GraphViz, if requested.
-    if (!Invocation.getFrontendOptions().RequestEvaluatorGraphVizPath.empty() &&
-        Instance.hasASTContext()) {
-      ASTContext &ctx = Instance.getASTContext();
-      emitRequestEvaluatorGraphViz(
-        ctx,
-        Invocation.getFrontendOptions().RequestEvaluatorGraphVizPath);
-    }
-  };
-
   ASTContext &Context = Instance.getASTContext();
   if (Action == FrontendOptions::ActionType::Parse)
     return Context.hadError();