---

yaml
---
r: 348795
b: refs/heads/master
c: 0854397
h: refs/heads/master
i:
  348793: d6cffc9
  348791: e7e3726

Author: compnerd

[refs]

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

trunk/lib/AST/GenericSignatureBuilder.cpp

@@ -599,6 +599,127 @@ namespace {
   };
 }
 
+namespace std {
+  // FIXME: Egregious hack to work around a bogus static_assert in
+  // llvm::GraphWriter. Good thing nobody else cares about this trait...
+  template<>
+  struct is_pointer<EquivalenceClassVizNode>
+    : std::integral_constant<bool, true> { };
+}
+
+namespace llvm {
+  // Visualize the same-type constraints within an equivalence class.
+  template<>
+  struct GraphTraits<const EquivalenceClass *> {
+    using NodeRef = EquivalenceClassVizNode;
+
+    static NodeRef getEntryNode(const EquivalenceClass *equivClass) {
+      return { equivClass, equivClass->members.front()->getDependentType({ }) };
+    }
+
+    class nodes_iterator {
+      using BaseIterator = PotentialArchetype * const *;
+
+      const EquivalenceClass *equivClass;
+      BaseIterator base;
+
+    public:
+      using difference_type = ptrdiff_t;
+      using value_type = EquivalenceClassVizNode;
+      using reference = value_type;
+      using pointer = value_type*;
+      using iterator_category = std::forward_iterator_tag;
+
+      nodes_iterator(const EquivalenceClass *equivClass, BaseIterator base)
+        : equivClass(equivClass), base(base) { }
+
+      BaseIterator &getBase() { return base; }
+      const BaseIterator &getBase() const { return base; }
+
+      reference operator*() const {
+        return { equivClass, (*getBase())->getDependentType({ }) };
+      }
+
+      nodes_iterator& operator++() {
+        ++getBase();
+        return *this;
+      }
+
+      nodes_iterator operator++(int) {
+        nodes_iterator result = *this;
+        ++(*this);
+        return result;
+      }
+
+      friend bool operator==(const nodes_iterator &lhs,
+                             const nodes_iterator &rhs) {
+        return lhs.getBase() == rhs.getBase();
+      }
+
+      friend bool operator!=(const nodes_iterator &lhs,
+                             const nodes_iterator &rhs) {
+        return lhs.getBase() != rhs.getBase();
+      }
+    };
+
+    static nodes_iterator nodes_begin(const EquivalenceClass *equivClass) {
+      return nodes_iterator(equivClass, equivClass->members.begin());
+    }
+
+    static nodes_iterator nodes_end(const EquivalenceClass *equivClass) {
+      return nodes_iterator(equivClass, equivClass->members.end());
+    }
+
+    static unsigned size(const EquivalenceClass *equivClass) {
+      return equivClass->members.size();
+    }
+
+    using ChildIteratorType = EquivalenceClassVizIterator;
+
+    static ChildIteratorType child_begin(NodeRef node) {
+      auto base = node.first->sameTypeConstraints.data();
+      auto baseEnd = base + node.first->sameTypeConstraints.size();
+      return ChildIteratorType(node, base, baseEnd);
+    }
+
+    static ChildIteratorType child_end(NodeRef node) {
+      auto base = node.first->sameTypeConstraints.data();
+      auto baseEnd = base + node.first->sameTypeConstraints.size();
+      return ChildIteratorType(node, baseEnd, baseEnd);
+    }
+  };
+
+  template <>
+  struct DOTGraphTraits<const EquivalenceClass *>
+    : public DefaultDOTGraphTraits
+  {
+    DOTGraphTraits(bool = false) { }
+
+    static std::string getGraphName(const EquivalenceClass *equivClass) {
+      return "Equivalence class for '" +
+        equivClass->members.front()->getDebugName() + "'";
+    }
+
+    std::string getNodeLabel(EquivalenceClassVizNode node,
+                             const EquivalenceClass *equivClass) const {
+      return node.second.getString();
+    }
+
+    static std::string getEdgeAttributes(EquivalenceClassVizNode node,
+                                         EquivalenceClassVizIterator iter,
+                                         const EquivalenceClass *equivClass) {
+      if (iter.getBase()->source->kind
+            == RequirementSource::NestedTypeNameMatch)
+        return "color=\"blue\"";
+
+      if (iter.getBase()->source->isDerivedRequirement())
+        return "color=\"gray\"";
+
+      return "color=\"red\"";
+    }
+  };
+} // end namespace llvm
+
 namespace {
   /// Retrieve the type described by the given unresolved tyoe.
   Type getUnresolvedType(GSBUnresolvedType type,
@@ -2249,6 +2370,37 @@ void EquivalenceClass::dump(llvm::raw_ostream &out,
       rewriteRoot->dump(out);
     }
   }
+
+  {
+    out << "---GraphViz output for same-type constraints---\n";
+
+    // Render the output
+    std::string graphviz;
+    {
+      llvm::raw_string_ostream graphvizOut(graphviz);
+      llvm::WriteGraph(graphvizOut, this);
+    }
+
+    // Clean up the output to turn it into an undirected graph.
+    // FIXME: This is horrible, GraphWriter should be able to support
+    // undirected graphs.
+    auto digraphPos = graphviz.find("digraph");
+    if (digraphPos != std::string::npos) {
+      // digraph -> graph
+      graphviz.erase(graphviz.begin() + digraphPos,
+                     graphviz.begin() + digraphPos + 2);
+    }
+
+    // Directed edges to undirected edges: -> to --
+    while (true) {
+      auto arrowPos = graphviz.find("->");
+      if (arrowPos == std::string::npos) break;
+
+      graphviz.replace(arrowPos, 2, "--");
+    }
+
+    out << graphviz;
+  }
 }
 
 void EquivalenceClass::dump(GenericSignatureBuilder *builder) const {

trunk/lib/IRGen/GenObjC.cpp

@@ -364,11 +364,6 @@ IRGenModule::getObjCProtocolGlobalVars(ProtocolDecl *proto) {
   protocolLabel->setSection(GetObjCSectionName("__objc_protolist",
                                                "coalesced,no_dead_strip"));
 
-  // Mark used to prevent DCE of public unreferenced protocols to ensure
-  // that they are available for external use when a used module is used
-  // as a library.
-  addUsedGlobal(protocolLabel);
-
   // Introduce a variable to reference the protocol.
   auto *protocolRef =
       new llvm::GlobalVariable(Module, Int8PtrTy, /*constant*/ false,
@@ -380,11 +375,6 @@ IRGenModule::getObjCProtocolGlobalVars(ProtocolDecl *proto) {
   protocolRef->setSection(GetObjCSectionName("__objc_protorefs",
                                              "coalesced,no_dead_strip"));
 
-  // Mark used to prevent DCE of public unreferenced protocols to ensure
-  // that they are available for external use when a used module is used
-  // as a library.
-  addUsedGlobal(protocolRef);
-
   ObjCProtocolPair pair{protocolRecord, protocolRef};
   ObjCProtocols.insert({proto, pair});
 

trunk/lib/SILOptimizer/Mandatory/OSLogOptimization.cpp

@@ -792,10 +792,10 @@ bool isAutoGeneratedInitOfOSLogMessage(SILFunction &fun) {
   Decl *decl = declContext->getAsDecl();
   if (!decl)
     return false;
-  ConstructorDecl *cdecl = dyn_cast<ConstructorDecl>(decl);
-  if (!cdecl)
+  ConstructorDecl *ctor = dyn_cast<ConstructorDecl>(decl);
+  if (!ctor)
     return false;
-  DeclContext *parentContext = cdecl->getParent();
+  DeclContext *parentContext = ctor->getParent();
   if (!parentContext)
     return false;
   NominalTypeDecl *typeDecl = parentContext->getSelfNominalTypeDecl();

trunk/test/IRGen/objc_protocol_vars.sil

@@ -145,7 +145,7 @@ cmake "%source_root%\llvm"^
     -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
     -DCMAKE_C_COMPILER=cl^
     -DCMAKE_CXX_COMPILER=cl^
-    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
+    -DCMAKE_INSTALL_PREFIX=%install_directory%^
     -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-unknown-windows-msvc^
     -DLLVM_ENABLE_PDB:BOOL=YES^
     -DLLVM_ENABLE_ASSERTIONS:BOOL=YES^
@@ -215,27 +215,27 @@ cmake "%source_root%\swift"^
     -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
     -DCMAKE_C_COMPILER=cl^
     -DCMAKE_CXX_COMPILER=cl^
-    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
-    -DClang_DIR:PATH=%build_root%\llvm\lib\cmake\clang^
-    -DSWIFT_PATH_TO_CMARK_BUILD:PATH=%build_root%\cmark^
-    -DSWIFT_PATH_TO_CMARK_SOURCE:PATH=%source_root%\cmark^
-    -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE:PATH=%source_root%\swift-corelibs-libdispatch^
-    -DLLVM_DIR:PATH=%build_root%\llvm\lib\cmake\llvm^
-    -DSWIFT_INCLUDE_DOCS:BOOL=NO^
-    -DSWIFT_WINDOWS_x86_64_ICU_UC_INCLUDE:PATH=%source_root%\icu-%icu_version%\include\unicode^
-    -DSWIFT_WINDOWS_x86_64_ICU_UC:PATH=%source_root%\icu-%icu_version%\lib64\icuuc.lib^
-    -DSWIFT_WINDOWS_x86_64_ICU_I18N_INCLUDE:PATH=%source_root%\icu-%icu_version%\include^
-    -DSWIFT_WINDOWS_x86_64_ICU_I18N:PATH=%source_root%\icu-%icu_version%\lib64\icuin.lib^
-    -DSWIFT_BUILD_DYNAMIC_STDLIB:BOOL=YES^
-    -DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY:BOOL=YES^
-    -DSWIFT_BUILD_STATIC_STDLIB:BOOL=NO^
-    -DSWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL=NO^
-    -DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=YES^
-    -DSWIFT_BUILD_SOURCEKIT:BOOL=YES^
-    -DSWIFT_ENABLE_SOURCEKIT_TESTS:BOOL=NO^
+    -DCMAKE_INSTALL_PREFIX=%install_directory%^
+    -DClang_DIR=%build_root%\llvm\lib\cmake\clang^
+    -DSWIFT_PATH_TO_CMARK_BUILD=%build_root%\cmark^
+    -DSWIFT_PATH_TO_CMARK_SOURCE=%source_root%\cmark^
+    -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE=%source_root%\swift-corelibs-libdispatch^
+    -DLLVM_DIR=%build_root%\llvm\lib\cmake\llvm^
+    -DSWIFT_INCLUDE_DOCS=NO^
+    -DSWIFT_WINDOWS_x86_64_ICU_UC_INCLUDE=%source_root%\icu-%icu_version%\include\unicode^
+    -DSWIFT_WINDOWS_x86_64_ICU_UC=%source_root%\icu-%icu_version%\lib64\icuuc.lib^
+    -DSWIFT_WINDOWS_x86_64_ICU_I18N_INCLUDE=%source_root%\icu-%icu_version%\include^
+    -DSWIFT_WINDOWS_x86_64_ICU_I18N=%source_root%\icu-%icu_version%\lib64\icuin.lib^
+    -DSWIFT_BUILD_DYNAMIC_STDLIB=YES^
+    -DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=YES^
+    -DSWIFT_BUILD_STATIC_STDLIB=NO^
+    -DSWIFT_BUILD_STATIC_SDK_OVERLAY=NO^
+    -DLLVM_INSTALL_TOOLCHAIN_ONLY=YES^
+    -DSWIFT_BUILD_SOURCEKIT=YES^
+    -DSWIFT_ENABLE_SOURCEKIT_TESTS=NO^
     -DSWIFT_INSTALL_COMPONENTS="autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;editor-integration;tools;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers"^
     -DSWIFT_PARALLEL_LINK_JOBS=8^
-    -DPYTHON_EXECUTABLE:PATH=%PYTHON_HOME%\python.exe^
+    -DPYTHON_EXECUTABLE=%PYTHON_HOME%\python.exe^
     -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
     -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
     -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO %exitOnError%
@@ -271,17 +271,21 @@ cmake "%source_root%\lldb"^
     -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
     -DCMAKE_C_COMPILER=clang-cl^
     -DCMAKE_CXX_COMPILER=clang-cl^
-    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
-    -DLLVM_DIR:PATH=%build_root%\llvm\lib\cmake\llvm^
-    -DClang_DIR:PATH=%build_root%\llvm\lib\cmake\clang^
-    -DSwift_DIR:PATH=%build_root%\swift\lib\cmake\swift^
-    -DLLVM_ENABLE_ASSERTIONS:BOOL=YES^
-    -DLLDB_ALLOW_STATIC_BINDINGS:BOOL=YES^
-    -DPYTHON_HOME:PATH=%PYTHON_HOME%^
+    -DCMAKE_INSTALL_PREFIX=%install_directory%^
+    -DLLDB_PATH_TO_CMARK_SOURCE=%source_root%\cmark^
+    -DLLDB_PATH_TO_CLANG_SOURCE=%source_root%\clang^
+    -DLLDB_PATH_TO_LLVM_SOURCE=%source_root%\llvm^
+    -DLLDB_PATH_TO_SWIFT_SOURCE=%source_root%\swift^
+    -DLLDB_PATH_TO_CMARK_BUILD=%build_root%\cmark^
+    -DLLDB_PATH_TO_CLANG_BUILD=%build_root%\llvm^
+    -DLLDB_PATH_TO_LLVM_BUILD=%build_root%\llvm^
+    -DLLDB_PATH_TO_SWIFT_BUILD=%build_root%\swift^
+    -DLLVM_ENABLE_ASSERTIONS=YES^
+    -DLLVM_ALLOW_STATIC_BINDINGS=YES^
+    -DPYTHON_HOME=%PYTHON_HOME%^
     -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
     -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
-    -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
-    -DLLDB_INCLUDE_TESTS:BOOL=NO %exitOnError%
+    -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO %exitOnError%
 
 popd
 
@@ -292,7 +296,7 @@ goto :eof
 endlocal
 
 
-:build_libdispatch
+:build_lldb
 :: Configures, builds, and installs Dispatch
 setlocal enableextensions enabledelayedexpansion
 
@@ -304,13 +308,13 @@ cmake "%source_root%\swift-corelibs-libdispatch"^
     -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
     -DCMAKE_C_COMPILER=clang-cl^
     -DCMAKE_CXX_COMPILER=clang-cl^
-    -DCMAKE_SWIFT_COMPILER:PATH=%install_directory%\bin\swiftc.exe^
-    -DSwift_DIR:PATH=%build_root%\swift\lib\cmake\swift^
-    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
-    -DBUILD_SHARED_LIBS:BOOL=YES^
-    -DENABLE_TESTING:BOOL=NO^
+    -DCMAKE_SWIFT_COMPILER=%install_directory%\bin\swiftc.exe^
+    -DSwift_DIR=%build_root%\swift\lib\cmake\swift^
+    -DCMAKE_INSTALL_PREFIX=%install_directory%^
+    -DBUILD_SHARED_LIBS=YES^
+    -DENABLE_TESTING=NO^
     -DCMAKE_C_COMPILER_TARGET=x86_64-unknown-windows-msvc^
-    -DENABLE_SWIFT:BOOL=YES^
+    -DENABLE_SWIFT=YES^
     -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
     -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
     -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO %exitOnError%