Fix merge conflicts.

Author: dan-zheng

include/swift/AST/Attr.def

@@ -53,13 +53,11 @@ TYPE_ATTR(noescape)
 TYPE_ATTR(escaping)
 TYPE_ATTR(differentiable)
 TYPE_ATTR(noDerivative)
-<<<<<<< HEAD
 // SWIFT_ENABLE_TENSORFLOW
 TYPE_ATTR(autodiff)
 TYPE_ATTR(nondiff)
 TYPE_ATTR(quoted)
-=======
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
+// SWIFT_ENABLE_TENSORFLOW END
 
 // SIL-specific attributes
 TYPE_ATTR(block_storage)
@@ -548,36 +546,30 @@ DECL_ATTR(_implicitly_synthesizes_nested_requirement, ImplicitlySynthesizesNeste
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   98)
 
-<<<<<<< HEAD
+DECL_ATTR(transpose, Transpose,
+  OnFunc | LongAttribute | AllowMultipleAttributes |
+  ABIStableToAdd | ABIBreakingToRemove | APIStableToAdd | APIBreakingToRemove,
+  99)
+
 // SWIFT_ENABLE_TENSORFLOW
 DECL_ATTR(quoted, Quoted,
   OnFunc |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
-  99)
+  100)
 // TODO(TF-999): Remove deprecated `@differentiating` attribute.
 DECL_ATTR(differentiating, Differentiating,
   OnFunc | LongAttribute | AllowMultipleAttributes |
   ABIStableToAdd | ABIBreakingToRemove | APIStableToAdd | APIBreakingToRemove,
-  100)
+  101)
 SIMPLE_DECL_ATTR(compilerEvaluable, CompilerEvaluable,
   OnAccessor | OnFunc | OnConstructor | OnSubscript |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove |
-  NotSerialized, 101)
+  NotSerialized, 102)
 SIMPLE_DECL_ATTR(noDerivative, NoDerivative,
   OnVar |
   ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
-  102)
-DECL_ATTR(transpose, Transpose,
-  OnFunc | LongAttribute | AllowMultipleAttributes |
-  ABIStableToAdd | ABIBreakingToRemove | APIStableToAdd | APIBreakingToRemove,
   103)
 // SWIFT_ENABLE_TENSORFLOW END
-=======
-DECL_ATTR(transpose, Transpose,
-  OnFunc | LongAttribute | AllowMultipleAttributes |
-  ABIStableToAdd | ABIBreakingToRemove | APIStableToAdd | APIBreakingToRemove,
-  99)
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
 
 #undef TYPE_ATTR
 #undef DECL_ATTR_ALIAS

include/swift/AST/Attr.h

@@ -1948,17 +1948,11 @@ class DerivativeAttr final
   }
 };
 
-<<<<<<< HEAD
 // SWIFT_ENABLE_TENSORFLOW
 // TODO(TF-999): Remove deprecated `@differentiating` attribute.
 using DifferentiatingAttr = DerivativeAttr;
+// SWIFT_ENABLE_TENSORFLOW END
 
-/// Attribute that registers a function as a transpose of another function.
-///
-/// Examples:
-///   @transpose(of: foo)
-///   @transpose(of: +, wrt: (lhs, rhs))
-=======
 /// The `@transpose(of:)` attribute registers a function as a transpose of
 /// another function-like declaration: a 'func', 'init', 'subscript', or 'var'
 /// computed property declaration.
@@ -1970,17 +1964,12 @@ using DifferentiatingAttr = DerivativeAttr;
 /// Examples:
 ///   @transpose(of: foo)
 ///   @transpose(of: +, wrt: (0, 1))
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
 class TransposeAttr final
     : public DeclAttribute,
       private llvm::TrailingObjects<TransposeAttr, ParsedAutoDiffParameter> {
   friend TrailingObjects;
 
-<<<<<<< HEAD
   /// The base type for the referenced original declaration. This field is
-=======
-  /// The base type repr for the referenced original function. This field is
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
   /// non-null only for parsed attributes that reference a qualified original
   /// declaration. This field is not serialized; type-checking uses it to
   /// resolve the original declaration, which is serialized.
@@ -1995,41 +1984,23 @@ class TransposeAttr final
   IndexSubset *ParameterIndices = nullptr;
 
   explicit TransposeAttr(bool implicit, SourceLoc atLoc, SourceRange baseRange,
-<<<<<<< HEAD
-                         TypeRepr *baseTypeRepr, DeclNameRefWithLoc original,
-                         ArrayRef<ParsedAutoDiffParameter> params);
-
-  explicit TransposeAttr(bool implicit, SourceLoc atLoc, SourceRange baseRange,
-                         TypeRepr *baseTypeRepr, DeclNameRefWithLoc original,
-                         IndexSubset *indices);
-=======
                          TypeRepr *baseType, DeclNameRefWithLoc original,
                          ArrayRef<ParsedAutoDiffParameter> params);
 
   explicit TransposeAttr(bool implicit, SourceLoc atLoc, SourceRange baseRange,
                          TypeRepr *baseType, DeclNameRefWithLoc original,
                          IndexSubset *parameterIndices);
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
 
 public:
   static TransposeAttr *create(ASTContext &context, bool implicit,
                                SourceLoc atLoc, SourceRange baseRange,
-<<<<<<< HEAD
-                               TypeRepr *baseTypeRepr, DeclNameRefWithLoc original,
-=======
                                TypeRepr *baseType, DeclNameRefWithLoc original,
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
                                ArrayRef<ParsedAutoDiffParameter> params);
 
   static TransposeAttr *create(ASTContext &context, bool implicit,
                                SourceLoc atLoc, SourceRange baseRange,
-<<<<<<< HEAD
-                               TypeRepr *baseTypeRepr, DeclNameRefWithLoc original,
-                               IndexSubset *indices);
-=======
                                TypeRepr *baseType, DeclNameRefWithLoc original,
                                IndexSubset *parameterIndices);
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
 
   TypeRepr *getBaseTypeRepr() const { return BaseTypeRepr; }
   DeclNameRefWithLoc getOriginalFunctionName() const {
@@ -2065,10 +2036,6 @@ class TransposeAttr final
     return DA->getKind() == DAK_Transpose;
   }
 };
-<<<<<<< HEAD
-// SWIFT_ENABLE_TENSORFLOW END
-=======
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
 
 /// Attributes that may be applied to declarations.
 class DeclAttributes {

include/swift/AST/DiagnosticsParse.def

@@ -1601,7 +1601,6 @@ ERROR(diff_params_clause_expected_parameter,PointsToFirstBadToken,
 ERROR(diff_params_clause_expected_parameter_unnamed,PointsToFirstBadToken,
       "expected a parameter, which can be a function parameter index or 'self'",
       ())
-<<<<<<< HEAD
 
 // Automatic differentiation attributes
 ERROR(autodiff_attr_expected_original_decl_name,PointsToFirstBadToken,
@@ -1644,16 +1643,10 @@ ERROR(sil_inst_autodiff_invalid_witness_generic_signature,PointsToFirstBadToken,
       "parameters as original function generic signature '%1'",
       (StringRef, StringRef))
 
-// Quoted attribute.
+// quoted
 ERROR(attr_quoted_enable_experimental_quasiquotes,PointsToFirstBadToken,
       "'@quoted' is unsupported; pass -enable-experimental-quasiquotes to "
       "enable support for quasiquotes", ())
-=======
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
-
-// Automatic differentiation attributes
-ERROR(autodiff_attr_expected_original_decl_name,PointsToFirstBadToken,
-      "expected an original function name", ())
 
 //------------------------------------------------------------------------------
 // MARK: Generics parsing diagnostics

include/swift/AST/DiagnosticsSema.def

@@ -4089,26 +4089,22 @@ ERROR(opaque_type_in_protocol_requirement,none,
       "'some' type cannot be the return type of a protocol requirement; did you mean to add an associated type?",
       ())
 
-<<<<<<< HEAD
-// SWIFT_ENABLE_TENSORFLOW
 // Function differentiability
+ERROR(attr_only_on_parameters_of_differentiable,none,
+      "'%0' may only be used on parameters of '@differentiable' function "
+      "types", (StringRef))
+// SWIFT_ENABLE_TENSORFLOW
 ERROR(autodiff_attr_argument_not_differentiable,none,
       "argument is not differentiable, but the enclosing function type is "
-      "marked '@differentiable'; did you want to add '@noDerivative' to this argument?",
-      ())
+      "marked '@differentiable'; did you want to add '@noDerivative' to this "
+      "argument?", ())
 ERROR(autodiff_attr_result_not_differentiable,none,
       "result is not differentiable, but the function type is marked "
       "'@differentiable'", ())
 ERROR(attr_differentiable_no_vjp_or_jvp_when_linear,none,
       "cannot specify 'vjp:' or 'jvp:' for linear functions; use "
       "'transpose:' instead", ())
-
-=======
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
-// Function differentiability
-ERROR(attr_only_on_parameters_of_differentiable,none,
-      "'%0' may only be used on parameters of '@differentiable' function "
-      "types", (StringRef))
+// SWIFT_ENABLE_TENSORFLOW END
 
 // SIL
 ERROR(opened_non_protocol,none,

include/swift/ClangImporter/ClangImporterOptions.h

@@ -101,18 +101,16 @@ class ClangImporterOptions {
   /// When set, don't enforce warnings with -Werror.
   bool DebuggerSupport = false;
 
-<<<<<<< HEAD
+  /// When set, ClangImporter is disabled, and all requests go to the
+  /// DWARFImporter delegate.
+  bool DisableSourceImport = false;
+
   // SWIFT_ENABLE_TENSORFLOW
   /// When set, clang writes its output files (module caches) to this instead
   /// of to the real filesystem.
   llvm::IntrusiveRefCntPtr<clang::InMemoryOutputFileSystem>
       InMemoryOutputFileSystem;
-
-=======
-  /// When set, ClangImporter is disabled, and all requests go to the
-  /// DWARFImporter delegate.
-  bool DisableSourceImport = false;
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
+  // SWIFT_ENABLE_TENSORFLOW END
 
   /// Return a hash code of any components from these options that should
   /// contribute to a Swift Bridging PCH hash.

include/swift/Parse/Parser.h

@@ -1014,24 +1014,20 @@ class Parser {
   ParserResult<DerivativeAttr> parseDerivativeAttribute(SourceLoc AtLoc,
                                                         SourceLoc Loc);
 
-<<<<<<< HEAD
+  /// Parse the @transpose attribute.
+  ParserResult<TransposeAttr> parseTransposeAttribute(SourceLoc AtLoc,
+                                                      SourceLoc Loc);
+
+  // SWIFT_ENABLE_TENSORFLOW
   /// Parse the deprecated @differentiating attribute.
   // TODO(TF-999): Remove the deprecated `@differentiating` attribute.
   ParserResult<DerivativeAttr> parseDifferentiatingAttribute(SourceLoc AtLoc,
                                                              SourceLoc Loc);
 
-=======
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
-  /// Parse the @transpose attribute.
-  ParserResult<TransposeAttr> parseTransposeAttribute(SourceLoc AtLoc,
-                                                      SourceLoc Loc);
-
-<<<<<<< HEAD
   /// Parse the @quoted attribute.
   ParserResult<QuotedAttr> parseQuotedAttribute(SourceLoc AtLoc, SourceLoc Loc);
+  // SWIFT_ENABLE_TENSORFLOW END
 
-=======
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
   /// Parse a specific attribute.
   ParserStatus parseDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc);
 
@@ -1173,20 +1169,6 @@ class Parser {
                                      SourceLoc &LAngleLoc,
                                      SourceLoc &RAngleLoc);
 
-<<<<<<< HEAD
-  // SWIFT_ENABLE_TENSORFLOW: Added `isParsingQualifiedDeclName` flag.
-  /// Parses a type identifier (e.g. 'Foo' or 'Foo.Bar.Baz').
-  ///
-  /// When `isParsingQualifiedDeclName` is true:
-  /// - Parses the type qualifier from a qualified decl name, and returns a
-  ///   parser result for the type of the qualifier.
-  /// - Positions the parser at the '.' before the final declaration name.
-  /// - For example, 'Foo.Bar.f' parses as 'Foo.Bar' and the parser gets
-  ///   positioned at '.f'.
-  /// - If there is no type qualification (e.g. when parsing just 'f'), returns
-  ///   an empty parser error.
-  ParserResult<TypeRepr> parseTypeIdentifier(bool isParsingQualifiedDeclName = false);
-=======
   /// Parses a type identifier (e.g. 'Foo' or 'Foo.Bar.Baz').
   ///
   /// When `isParsingQualifiedDeclBaseType` is true:
@@ -1200,7 +1182,6 @@ class Parser {
   ///   an empty parser error.
   ParserResult<TypeRepr> parseTypeIdentifier(
       bool isParsingQualifiedDeclBaseType = false);
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
   ParserResult<TypeRepr> parseOldStyleProtocolComposition();
   ParserResult<TypeRepr> parseAnyType();
   ParserResult<TypeRepr> parseSILBoxType(GenericParamList *generics,
@@ -1431,17 +1412,11 @@ class Parser {
 
   bool canParseTypedPattern();
 
-<<<<<<< HEAD
-  // SWIFT_ENABLE_TENSORFLOW
-  /// Returns true if a base type for a qualified declaration name can be
-  /// parsed.
-=======
   /// Returns true if a qualified declaration name base type can be parsed.
   ///
   /// \verbatim
   ///   qualified-decl-name-base-type: simple-type-identifier '.'
   /// \endverbatim
->>>>>>> swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a
   bool canParseBaseTypeForQualifiedDeclName();
 
   //===--------------------------------------------------------------------===//