Merge pull request #1244 from swiftwasm/maxd/master-merge

Resolve conflict with master

Author: MaxDesiatov

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/OwnershipUtils.h

@@ -66,18 +66,20 @@ bool isOwnedForwardingInstruction(SILInstruction *inst);
 /// previous terminator.
 bool isOwnedForwardingValue(SILValue value);
 
-struct BorrowingOperandKind {
-  enum Kind {
+class BorrowingOperandKind {
+public:
+  enum Kind : uint8_t {
     BeginBorrow,
     BeginApply,
     Branch,
   };
 
+private:
   Kind value;
 
+public:
   BorrowingOperandKind(Kind newValue) : value(newValue) {}
-  BorrowingOperandKind(const BorrowingOperandKind &other)
-      : value(other.value) {}
+
   operator Kind() const { return value; }
 
   static Optional<BorrowingOperandKind> get(SILInstructionKind kind) {
@@ -207,15 +209,20 @@ struct BorrowingOperand {
 llvm::raw_ostream &operator<<(llvm::raw_ostream &os,
                               const BorrowingOperand &operand);
 
-struct BorrowedValueKind {
+class BorrowedValueKind {
+public:
   /// Enum we use for exhaustive pattern matching over borrow scope introducers.
-  enum Kind {
+  enum Kind : uint8_t {
     LoadBorrow,
     BeginBorrow,
     SILFunctionArgument,
     Phi,
   };
 
+private:
+  Kind value;
+
+public:
   static Optional<BorrowedValueKind> get(SILValue value) {
     if (value.getOwnershipKind() != ValueOwnershipKind::Guaranteed)
       return None;
@@ -240,10 +247,8 @@ struct BorrowedValueKind {
     }
   }
 
-  Kind value;
-
   BorrowedValueKind(Kind newValue) : value(newValue) {}
-  BorrowedValueKind(const BorrowedValueKind &other) : value(other.value) {}
+
   operator Kind() const { return value; }
 
   /// Is this a borrow scope that begins and ends within the same function and
@@ -383,18 +388,20 @@ bool getAllBorrowIntroducingValues(SILValue value,
 /// introducer, then we return a .some(BorrowScopeIntroducingValue).
 Optional<BorrowedValue> getSingleBorrowIntroducingValue(SILValue inputValue);
 
-struct InteriorPointerOperandKind {
+class InteriorPointerOperandKind {
+public:
   enum Kind : uint8_t {
     RefElementAddr,
     RefTailAddr,
     OpenExistentialBox,
   };
 
+private:
   Kind value;
 
+public:
   InteriorPointerOperandKind(Kind newValue) : value(newValue) {}
-  InteriorPointerOperandKind(const InteriorPointerOperandKind &other)
-      : value(other.value) {}
+
   operator Kind() const { return value; }
 
   static Optional<InteriorPointerOperandKind> get(Operand *use) {
@@ -467,8 +474,9 @@ struct InteriorPointerOperand {
       : operand(op), kind(kind) {}
 };
 
-struct OwnedValueIntroducerKind {
-  enum Kind {
+class OwnedValueIntroducerKind {
+public:
+  enum Kind : uint8_t {
     /// An owned value that is a result of an Apply.
     Apply,
 
@@ -519,6 +527,10 @@ struct OwnedValueIntroducerKind {
     AllocRefInit,
   };
 
+private:
+  Kind value;
+
+public:
   static Optional<OwnedValueIntroducerKind> get(SILValue value) {
     if (value.getOwnershipKind() != ValueOwnershipKind::Owned)
       return None;
@@ -569,11 +581,8 @@ struct OwnedValueIntroducerKind {
     llvm_unreachable("Default should have caught this");
   }
 
-  Kind value;
-
   OwnedValueIntroducerKind(Kind newValue) : value(newValue) {}
-  OwnedValueIntroducerKind(const OwnedValueIntroducerKind &other)
-      : value(other.value) {}
+
   operator Kind() const { return value; }
 
   void print(llvm::raw_ostream &os) const;

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/Basic/CMakeLists.txt

@@ -34,7 +34,6 @@ function(generate_revision_inc revision_inc_var name dir)
 endfunction()
 
 generate_revision_inc(llvm_revision_inc LLVM "${LLVM_MAIN_SRC_DIR}")
-generate_revision_inc(clang_revision_inc Clang "${CLANG_MAIN_SRC_DIR}")
 generate_revision_inc(swift_revision_inc Swift "${SWIFT_SOURCE_DIR}")
 
 add_swift_host_library(swiftBasic STATIC

lib/Basic/Version.cpp

@@ -45,34 +45,25 @@
 #endif
 
 #include "LLVMRevision.inc"
-#include "ClangRevision.inc"
 #include "SwiftRevision.inc"
 
 namespace swift {
 namespace version {
 
-/// Print a string of the form "LLVM xxxxx, Clang yyyyy, Swift zzzzz",
-/// where each placeholder is the revision for the associated repository.
+/// Print a string of the form "LLVM xxxxx, Swift zzzzz", where each placeholder
+/// is the revision for the associated repository.
 static void printFullRevisionString(raw_ostream &out) {
-  // Arbitrarily truncate to 10 characters. This should be enough to unique
-  // Git hashes for the time being, and certainly enough for SVN revisions,
-  // while keeping the version string from being ridiculously long.
+  // Arbitrarily truncate to 15 characters. This should be enough to unique Git
+  // hashes while keeping the REPL version string from overflowing 80 columns.
 #if defined(LLVM_REVISION)
-  out << "LLVM " << StringRef(LLVM_REVISION).slice(0, 10);
-# if defined(CLANG_REVISION) || defined(SWIFT_REVISION)
-  out << ", ";
-# endif
-#endif
-
-#if defined(CLANG_REVISION)
-  out << "Clang " << StringRef(CLANG_REVISION).slice(0, 10);
+  out << "LLVM " << StringRef(LLVM_REVISION).slice(0, 15);
 # if defined(SWIFT_REVISION)
   out << ", ";
 # endif
 #endif
 
 #if defined(SWIFT_REVISION)
-  out << "Swift " << StringRef(SWIFT_REVISION).slice(0, 10);
+  out << "Swift " << StringRef(SWIFT_REVISION).slice(0, 15);
 #endif
 }
 
@@ -424,8 +415,7 @@ std::string getSwiftFullVersion(Version effectiveVersion) {
   OS << " clang-" CLANG_COMPILER_VERSION;
 #endif
   OS << ")";
-#elif defined(LLVM_REVISION) || defined(CLANG_REVISION) || \
-      defined(SWIFT_REVISION)
+#elif defined(LLVM_REVISION) || defined(SWIFT_REVISION)
   OS << " (";
   printFullRevisionString(OS);
   OS << ")";

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