Fix all merge conflicts.

Note: this was done as a distinct commit in order to make it easier to see what's actually going on.

Author: saeta

include/swift/AST/ASTContext.h

@@ -110,11 +110,8 @@ namespace swift {
   class VarDecl;
   class UnifiedStatsReporter;
   class IndexSubset;
-<<<<<<< HEAD
   class VectorSpace;
   class DifferentiableAttr;
-=======
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-10-13-a
 
   enum class KnownProtocolKind : uint8_t;
 

include/swift/AST/IndexSubset.h

@@ -201,26 +201,10 @@ class IndexSubset : public llvm::FoldingSetNode {
       id.AddInteger(index);
   }
 
-<<<<<<< HEAD
   void print(llvm::raw_ostream &s = llvm::outs()) const;
   LLVM_ATTRIBUTE_DEPRECATED(void dump(llvm::raw_ostream &s = llvm::errs())
                                 const LLVM_ATTRIBUTE_USED,
                             "only for use within the debugger");
-=======
-  void print(llvm::raw_ostream &s = llvm::outs()) const {
-    s << '{';
-    interleave(range(capacity), [this, &s](unsigned i) { s << contains(i); },
-               [&s] { s << ", "; });
-    s << '}';
-  }
-
-  void dump(llvm::raw_ostream &s = llvm::errs()) const {
-    s << "(index_subset capacity=" << capacity << " indices=(";
-    interleave(getIndices(), [&s](unsigned i) { s << i; },
-               [&s] { s << ", "; });
-    s << "))";
-  }
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-10-13-a
 
   int findNext(int startIndex) const;
   int findFirst() const { return findNext(-1); }

include/swift/Parse/Parser.h

@@ -1642,28 +1642,14 @@ class Parser {
   ParsedSyntaxResult<ParsedClosureExprSyntax>
   parseTrailingClosureSyntax(SourceRange calleeRange);
 
-<<<<<<< HEAD
-  /// Parse an object literal.
-  ///
-  /// \param LK The literal kind as determined by the first token.
-  ParserResult<Expr> parseExprObjectLiteral(ObjectLiteralExpr::LiteralKind LK,
-                                            bool isExprBasic);
-  ParserResult<Expr> parseExprQuoteLiteral();
-  ParserResult<Expr> parseExprUnquote();
-  ParserResult<Expr> parseExprCallSuffix(ParserResult<Expr> fn,
-                                         bool isExprBasic);
-  ParserResult<Expr> parseExprCollection();
-  ParserResult<Expr> parseExprCollectionElement(Optional<bool> &isDictionary);
-  ParserResult<Expr> parseExprPoundAssert();
-  ParserResult<Expr> parseExprArray(SourceLoc LSquareLoc);
-  ParserResult<Expr> parseExprDictionary(SourceLoc LSquareLoc);
-=======
   ParserResult<Expr> parseExprObjectLiteral(bool isExprBasic);
   ParsedSyntaxResult<ParsedExprSyntax>
   parseExprObjectLiteralSyntax(bool isExprBasic);
+  ParserResult<Expr> parseExprQuoteLiteral();
+  ParserResult<Expr> parseExprUnquote();
   ParserResult<Expr> parseExprCallSuffix(ParserResult<Expr> fn,
                                          bool isExprBasic);
-  ParserResult<Expr> parseExprCollection();
+  ParserResult<Expr> parseExprPoundAssert();
   ParsedSyntaxResult<ParsedExprSyntax> parseExprCollectionSyntax();
   ParsedSyntaxResult<ParsedExprSyntax>
   parseExprArraySyntax(ParsedTokenSyntax &&LSquare, SourceLoc LSquareLoc,
@@ -1672,7 +1658,6 @@ class Parser {
   parseExprDictionarySyntax(ParsedTokenSyntax &&LSquare, SourceLoc LSquareLoc,
                             ParsedSyntaxResult<ParsedExprSyntax> &&firstExpr);
 
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-10-13-a
   ParserResult<Expr> parseExprPoundUnknown(SourceLoc LSquareLoc);
   ParsedSyntaxResult<ParsedExprSyntax>
   parseExprPoundUnknownSyntax(Optional<ParsedTokenSyntax> &&LSquare,

lib/AST/ASTContext.cpp

@@ -443,7 +443,6 @@ FOR_KNOWN_FOUNDATION_TYPES(CACHE_FOUNDATION_DECL)
   llvm::FoldingSet<DeclName::CompoundDeclName> CompoundNames;
   llvm::DenseMap<UUID, OpenedArchetypeType *> OpenedExistentialArchetypes;
 
-<<<<<<< HEAD
   // SWIFT_ENABLE_TENSORFLOW
   /// A cache of tangent spaces per type.
   llvm::DenseMap<CanType, Optional<VectorSpace>> VectorSpaces;
@@ -456,11 +455,6 @@ FOR_KNOWN_FOUNDATION_TYPES(CACHE_FOUNDATION_DECL)
       AutoDiffDerivativeFunctionIdentifiers;
   // SWIFT_ENABLE_TENSORFLOW END
 
-=======
-  /// For uniquifying `IndexSubset` allocations.
-  llvm::FoldingSet<IndexSubset> IndexSubsets;
-
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-10-13-a
   /// A cache of information about whether particular nominal types
   /// are representable in a foreign language.
   llvm::DenseMap<NominalTypeDecl *, ForeignRepresentationInfo>

lib/AST/CMakeLists.txt

@@ -29,12 +29,9 @@ add_swift_host_library(swiftAST STATIC
   ASTVerifier.cpp
   ASTWalker.cpp
   Attr.cpp
-<<<<<<< HEAD
   # SWIFT_ENABLE_TENSORFLOW
   AutoDiff.cpp
-=======
   IndexSubset.cpp
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-10-13-a
   Availability.cpp
   AvailabilitySpec.cpp
   Builtins.cpp

lib/AST/IndexSubset.cpp

@@ -79,7 +79,6 @@ IndexSubset *IndexSubset::extendingCapacity(
   return IndexSubset::get(ctx, indices);
 }
 
-<<<<<<< HEAD
 void IndexSubset::print(llvm::raw_ostream &s) const {
   s << '{';
   interleave(range(capacity), [this, &s](unsigned i) { s << contains(i); },
@@ -94,8 +93,6 @@ void IndexSubset::dump(llvm::raw_ostream &s) const {
   s << "))\n";
 }
 
-=======
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-10-13-a
 int IndexSubset::findNext(int startIndex) const {
   assert(startIndex < (int)capacity && "Start index cannot be past the end");
   unsigned bitWordIndex = 0, offset = 0;

lib/Sema/TypeCheckDecl.cpp

@@ -4278,135 +4278,16 @@ void TypeChecker::validateDecl(ValueDecl *D) {
   }
 
   case DeclKind::Func:
-<<<<<<< HEAD
-  case DeclKind::Accessor: {
-    auto *FD = cast<FuncDecl>(D);
-
-    DeclValidationRAII IBV(FD);
-
-    // Accessors should pick up various parts of their type signatures
-    // directly from the storage declaration instead of re-deriving them.
-    // FIXME: should this include the generic signature?
-    if (auto accessor = dyn_cast<AccessorDecl>(FD)) {
-      auto storage = accessor->getStorage();
-
-      // Note that it's important for correctness that we're filling in
-      // empty TypeLocs, because otherwise revertGenericFuncSignature might
-      // erase the types we set, causing them to be re-validated in a later
-      // pass.  That later validation might be incorrect even if the TypeLocs
-      // are a clone of the type locs from which we derived the value type,
-      // because the rules for interpreting types in parameter contexts
-      // are sometimes different from the rules elsewhere; for example,
-      // function types default to non-escaping.
-
-      auto valueParams = accessor->getParameters();
-
-      // Determine the value type.
-      Type valueIfaceTy = storage->getValueInterfaceType();
-      if (auto SD = dyn_cast<SubscriptDecl>(storage)) {
-        // Copy the index types instead of re-validating them.
-        auto indices = SD->getIndices();
-        for (size_t i = 0, e = indices->size(); i != e; ++i) {
-          auto subscriptParam = indices->get(i);
-          if (!subscriptParam->hasInterfaceType())
-            continue;
-
-          Type paramIfaceTy = subscriptParam->getInterfaceType();
-
-          auto accessorParam = valueParams->get(valueParams->size() - e + i);
-          accessorParam->setInterfaceType(paramIfaceTy);
-          accessorParam->getTypeLoc().setType(paramIfaceTy);
-        }
-      }
-
-      // Propagate the value type into the correct position.
-      switch (accessor->getAccessorKind()) {
-      // For getters, set the result type to the value type.
-      case AccessorKind::Get:
-        accessor->getBodyResultTypeLoc().setType(valueIfaceTy);
-        break;
-
-      // For setters and observers, set the old/new value parameter's type
-      // to the value type.
-      case AccessorKind::DidSet:
-      case AccessorKind::WillSet:
-      case AccessorKind::Set: {
-        auto newValueParam = valueParams->get(0);
-        newValueParam->setInterfaceType(valueIfaceTy);
-        newValueParam->getTypeLoc().setType(valueIfaceTy);
-        accessor->getBodyResultTypeLoc().setType(TupleType::getEmpty(Context));
-        break;
-      }
-
-      // Addressor result types can get complicated because of the owner.
-      case AccessorKind::Address:
-      case AccessorKind::MutableAddress:
-        if (Type resultType =
-              buildAddressorResultType(*this, accessor, valueIfaceTy)) {
-          accessor->getBodyResultTypeLoc().setType(resultType);
-        }
-        break;
-
-      // These don't mention the value type directly.
-      // If we add yield types to the function type, we'll need to update this.
-      case AccessorKind::Read:
-      case AccessorKind::Modify:
-        accessor->getBodyResultTypeLoc().setType(TupleType::getEmpty(Context));
-        break;
-      }
-    }
-    
-    // We want the function to be available for name lookup as soon
-    // as it has a valid interface type.
-    typeCheckParameterList(FD->getParameters(), FD,
-                           TypeResolverContext::AbstractFunctionDecl);
-    validateResultType(FD, FD->getBodyResultTypeLoc());
-    // FIXME: Roll all of this interface type computation into a request.
-    FD->computeType();
-
-    // SWIFT_ENABLE_TENSORFLOW
-    // TODO(TF-789): Find proper way to type-check `@differentiable` attributes.
-    checkDeclDifferentiableAttributes(FD);
-    // SWIFT_ENABLE_TENSORFLOW END
-
-    // If the function is exported to C, it must be representable in (Obj-)C.
-    if (auto CDeclAttr = FD->getAttrs().getAttribute<swift::CDeclAttr>()) {
-      Optional<ForeignErrorConvention> errorConvention;
-      if (isRepresentableInObjC(FD, ObjCReason::ExplicitlyCDecl,
-                                errorConvention)) {
-        if (FD->hasThrows()) {
-          FD->setForeignErrorConvention(*errorConvention);
-          diagnose(CDeclAttr->getLocation(), diag::cdecl_throws);
-        }
-      }
-    }
-    
-    break;
-  }
-
-  case DeclKind::Constructor: {
-    auto *CD = cast<ConstructorDecl>(D);
-
-    DeclValidationRAII IBV(CD);
-
-    typeCheckParameterList(CD->getParameters(), CD,
-                           TypeResolverContext::AbstractFunctionDecl);
-    CD->computeType();
-    // SWIFT_ENABLE_TENSORFLOW
-    // TODO(TF-789): Find proper way to type-check `@differentiable` attributes.
-    checkDeclDifferentiableAttributes(CD);
-    // SWIFT_ENABLE_TENSORFLOW END
-    break;
-  }
-
-=======
   case DeclKind::Accessor:
   case DeclKind::Constructor:
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-10-13-a
   case DeclKind::Destructor: {
     auto *AFD = cast<AbstractFunctionDecl>(D);
     DeclValidationRAII IBV(AFD);
     AFD->computeType();
+    // SWIFT_ENABLE_TENSORFLOW
+    // TODO(TF-789): Find proper way to type-check `@differentiable` attributes.
+    checkDeclDifferentiableAttributes(CD);
+    // SWIFT_ENABLE_TENSORFLOW END
     break;
   }
 
@@ -4416,13 +4297,6 @@ void TypeChecker::validateDecl(ValueDecl *D) {
 
     auto elementTy = SD->getElementInterfaceType();
 
-<<<<<<< HEAD
-    // SWIFT_ENABLE_TENSORFLOW
-    // TODO(TF-789): Find proper way to type-check `@differentiable` attributes.
-    checkDeclDifferentiableAttributes(SD);
-    // SWIFT_ENABLE_TENSORFLOW END
-
-=======
     SmallVector<AnyFunctionType::Param, 2> argTy;
     SD->getIndices()->getParams(argTy);
 
@@ -4434,7 +4308,11 @@ void TypeChecker::validateDecl(ValueDecl *D) {
 
     // Record the interface type.
     SD->setInterfaceType(funcTy);
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-10-13-a
+    // SWIFT_ENABLE_TENSORFLOW
+    // TODO(TF-789): Find proper way to type-check `@differentiable` attributes.
+    checkDeclDifferentiableAttributes(SD);
+    // SWIFT_ENABLE_TENSORFLOW END
+
     break;
   }
 

unittests/AST/CMakeLists.txt

@@ -1,9 +1,5 @@
 add_swift_unittest(SwiftASTTests
   ArithmeticEvaluator.cpp
-<<<<<<< HEAD
-  # SWIFT_ENABLE_TENSORFLOW
-=======
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-10-13-a
   IndexSubsetTests.cpp
   DiagnosticConsumerTests.cpp
   SourceLocTests.cpp