[pull] master from apple:master

include/swift/AST/Requirement.h

@@ -142,7 +142,7 @@ class Requirement {
     case RequirementKind::Conformance:
     case RequirementKind::Superclass:
     case RequirementKind::SameType:
-      second = hash_value(requirement.getSecondType());
+      second = hash_value(requirement.getSecondType().getPointer());
       break;
 
     case RequirementKind::Layout:

include/swift/AST/Type.h

@@ -325,11 +325,6 @@ class Type {
   /// Return the name of the type as a string, for use in diagnostics only.
   std::string getString(const PrintOptions &PO = PrintOptions()) const;
 
-  friend llvm::hash_code hash_value(Type type) {
-    using llvm::hash_value;
-    return hash_value(type.getPointer());
-  }
-
   /// Return the name of the type, adding parens in cases where
   /// appending or prepending text to the result would cause that text
   /// to be appended to only a portion of the returned type. For
@@ -502,6 +497,10 @@ class CanType : public Type {
   bool operator==(CanType T) const { return getPointer() == T.getPointer(); }
   bool operator!=(CanType T) const { return !operator==(T); }
 
+  friend llvm::hash_code hash_value(CanType T) {
+    return llvm::hash_value(T.getPointer());
+  }
+
   bool operator<(CanType T) const { return getPointer() < T.getPointer(); }
 };
 

include/swift/AST/Witness.h

@@ -206,13 +206,13 @@ struct TypeWitnessAndDecl {
   }
 
   friend llvm::hash_code hash_value(const TypeWitnessAndDecl &owner) {
-    return llvm::hash_combine(owner.witnessType,
+    return llvm::hash_combine(owner.witnessType.getPointer(),
                               owner.witnessDecl);
   }
 
   friend bool operator==(const TypeWitnessAndDecl &lhs,
                          const TypeWitnessAndDecl &rhs) {
-    return lhs.witnessType->isEqual(rhs.witnessType) &&
+    return lhs.witnessType.getPointer() == rhs.witnessType.getPointer() &&
            lhs.witnessDecl == rhs.witnessDecl;
   }
 

include/swift/Reflection/ReflectionContext.h

@@ -34,7 +34,6 @@
 #include "swift/Runtime/Unreachable.h"
 
 #include <set>
-#include <sstream>
 #include <unordered_map>
 #include <utility>
 #include <vector>
@@ -946,10 +945,12 @@ class ReflectionContext
           reinterpret_cast<const MetadataAllocationBacktraceHeader<Runtime> *>(
               HeaderBytes.get());
       if (HeaderPtr == nullptr) {
-        std::stringstream stream;
-        stream << "unable to read Next pointer 0x" << std::hex
-               << BacktraceListNext.getAddressData();
-        return stream.str();
+        // FIXME: std::stringstream would be better, but LLVM's standard library
+        // introduces a vtable and we don't want that.
+        char result[128];
+        std::snprintf(result, sizeof(result), "unable to read Next pointer %p",
+            BacktraceListNext.getAddressData());
+        return std::string(result);
       }
       auto BacktraceAddrPtr =
           BacktraceListNext +

include/swift/SIL/SILDeclRef.h

@@ -397,6 +397,16 @@ struct SILDeclRef {
 
   bool canBeDynamicReplacement() const;
 
+  bool isAutoDiffDerivativeFunction() const {
+    return derivativeFunctionIdentifier != nullptr;
+  }
+
+  AutoDiffDerivativeFunctionIdentifier *
+  getAutoDiffDerivativeFunctionIdentifier() const {
+    assert(isAutoDiffDerivativeFunction());
+    return derivativeFunctionIdentifier;
+  }
+
 private:
   friend struct llvm::DenseMapInfo<swift::SILDeclRef>;
   /// Produces a SILDeclRef from an opaque value.

lib/ClangImporter/ImportDecl.cpp

@@ -7401,7 +7401,9 @@ void SwiftDeclConverter::importInheritedConstructors(
 
         Impl.importAttributes(objcMethod, newCtor, curObjCClass);
         newMembers.push_back(newCtor);
-      } else if (existing && existing->getClangDecl()) {
+      } else if (existing && existing->getInitKind() ==
+                   CtorInitializerKind::ConvenienceFactory &&
+                 existing->getClangDecl()) {
         // Check that the existing constructor the prevented new creation is
         // really an inherited factory initializer and not a class member.
         auto existingMD = cast<clang::ObjCMethodDecl>(existing->getClangDecl());

lib/IRGen/GenMeta.cpp

@@ -739,6 +739,9 @@ namespace {
                            isa<ConstructorDecl>(func.getDecl())
                              ? SILDeclRef::Kind::Allocator
                              : SILDeclRef::Kind::Func);
+        if (entry.getFunction().isAutoDiffDerivativeFunction())
+          declRef = declRef.asAutoDiffDerivativeFunction(
+              entry.getFunction().getAutoDiffDerivativeFunctionIdentifier());
         addDiscriminator(flags, schema, declRef);
       }
 

lib/SILOptimizer/Mandatory/CMakeLists.txt

@@ -12,7 +12,6 @@ target_sources(swiftSILOptimizer PRIVATE
   DiagnoseStaticExclusivity.cpp
   DiagnoseUnreachable.cpp
   Differentiation.cpp
-  GuaranteedARCOpts.cpp
   IRGenPrepare.cpp
   MandatoryInlining.cpp
   PredictableMemOpt.cpp