Changes to make the merge compile.

Author: pschuh

Diff for: cmake/modules/AddSwift.cmake

@@ -2203,8 +2203,6 @@ function(_add_swift_executable_single name)
         "-Xlinker" "@executable_path/../lib/swift/${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}")
   endif()
 
-<<<<<<< HEAD
-=======
   # SWIFT_ENABLE_TENSORFLOW
   set(swift_relative_library_path "../lib/swift/${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}")
   is_darwin_based_sdk("${SWIFTEXE_SINGLE_SDK}" IS_DARWIN)
@@ -2219,11 +2217,6 @@ function(_add_swift_executable_single name)
   endif()
   # END SWIFT_ENABLE_TENSORFLOW
 
-  # Find the names of dependency library targets.
-  #
-  # We don't add the ${ARCH} to the target suffix because we want to link
-  # against fat libraries.
->>>>>>> origin/tensorflow
   _list_add_string_suffix(
       "${SWIFTEXE_SINGLE_LINK_LIBRARIES}"
       "-${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}-${SWIFTEXE_SINGLE_ARCHITECTURE}"
@@ -2279,11 +2272,7 @@ function(_add_swift_executable_single name)
   target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES})
   swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_COMPONENT_DEPENDS})
 
-<<<<<<< HEAD
   set_target_properties(${name} PROPERTIES FOLDER "Swift executables")
-=======
-  set_target_properties(${name}
-      PROPERTIES FOLDER "Swift executables")
 
   # SWIFT_ENABLE_TENSORFLOW
   if(NOT "${local_rpath}" STREQUAL "")
@@ -2293,166 +2282,6 @@ function(_add_swift_executable_single name)
   # END SWIFT_ENABLE_TENSORFLOW
 endfunction()
 
-# Add an executable for each target variant. Executables are given suffixes
-# with the variant SDK and ARCH.
-#
-# See add_swift_executable for detailed documentation.
-#
-# Additional parameters:
-#   [LINK_FAT_LIBRARIES lipo_target1 ...]
-#     Fat libraries to link with.
-function(add_swift_target_executable name)
-  # Parse the arguments we were given.
-  cmake_parse_arguments(SWIFTEXE_TARGET
-    "EXCLUDE_FROM_ALL;;BUILD_WITH_STDLIB"
-    ""
-    "DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_FAT_LIBRARIES"
-    ${ARGN})
-
-  set(SWIFTEXE_TARGET_SOURCES ${SWIFTEXE_TARGET_UNPARSED_ARGUMENTS})
-
-  translate_flag(${SWIFTEXE_TARGET_EXCLUDE_FROM_ALL}
-      "EXCLUDE_FROM_ALL"
-      SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG)
-
-  # All Swift executables depend on the standard library.
-  list(APPEND SWIFTEXE_TARGET_LINK_FAT_LIBRARIES swiftCore)
-  # All Swift executables depend on the swiftSwiftOnoneSupport library.
-  list(APPEND SWIFTEXE_TARGET_DEPENDS swiftSwiftOnoneSupport)
-
-  if(NOT "${SWIFT_BUILD_STDLIB}")
-    list(REMOVE_ITEM SWIFTEXE_TARGET_LINK_FAT_LIBRARIES
-        swiftCore)
-  endif()
-
-  foreach(sdk ${SWIFT_SDKS})
-    foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
-      set(VARIANT_SUFFIX "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
-      set(VARIANT_NAME "${name}${VARIANT_SUFFIX}")
-
-      set(SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG_CURRENT
-          ${SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG})
-      if(NOT "${VARIANT_SUFFIX}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SUFFIX}")
-        # By default, don't build executables for target SDKs to avoid building
-        # target stdlibs.
-        set(SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG_CURRENT "EXCLUDE_FROM_ALL")
-      endif()
-
-      if(SWIFTEXE_TARGET_BUILD_WITH_STDLIB)
-        add_dependencies("swift-test-stdlib${VARIANT_SUFFIX}" ${VARIANT_NAME})
-      endif()
-
-      # Don't add the ${arch} to the suffix.  We want to link against fat
-      # libraries.
-      _list_add_string_suffix(
-          "${SWIFTEXE_TARGET_DEPENDS}"
-          "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}"
-          SWIFTEXE_TARGET_DEPENDS_with_suffix)
-      _add_swift_executable_single(
-          ${VARIANT_NAME}
-          ${SWIFTEXE_TARGET_SOURCES}
-          DEPENDS ${SWIFTEXE_TARGET_DEPENDS_with_suffix}
-          LLVM_COMPONENT_DEPENDS ${SWIFTEXE_TARGET_LLVM_COMPONENT_DEPENDS}
-          SDK "${sdk}"
-          ARCHITECTURE "${arch}"
-          LINK_FAT_LIBRARIES ${SWIFTEXE_TARGET_LINK_FAT_LIBRARIES}
-          ${SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG_CURRENT})
-
-      if(${sdk} IN_LIST SWIFT_APPLE_PLATFORMS)
-        add_custom_command_target(unused_var2
-         COMMAND "codesign" "-f" "-s" "-" "${SWIFT_RUNTIME_OUTPUT_INTDIR}/${VARIANT_NAME}"
-         CUSTOM_TARGET_NAME "${VARIANT_NAME}_signed"
-         OUTPUT "${SWIFT_RUNTIME_OUTPUT_INTDIR}/${VARIANT_NAME}_signed"
-         DEPENDS ${VARIANT_NAME})
-      else()
-        # No code signing on other platforms.
-        add_custom_command_target(unused_var2
-         CUSTOM_TARGET_NAME "${VARIANT_NAME}_signed"
-         OUTPUT "${SWIFT_RUNTIME_OUTPUT_INTDIR}/${VARIANT_NAME}_signed"
-         DEPENDS ${VARIANT_NAME})
-       endif()
-    endforeach()
-  endforeach()
-endfunction()
-
-# Add an executable for the host machine.
-#
-# Usage:
-#   add_swift_executable(name
-#     [DEPENDS dep1 ...]
-#     [LLVM_COMPONENT_DEPENDS comp1 ...]
-#     [FILE_DEPENDS target1 ...]
-#     [LINK_LIBRARIES target1 ...]
-#     [EXCLUDE_FROM_ALL]
-#     [DONT_STRIP_NON_MAIN_SYMBOLS]
-#     [DISABLE_ASLR]
-#     source1 [source2 source3 ...])
-#
-#   name
-#     Name of the executable (e.g., swift).
-#
-#   LIBRARIES
-#     Libraries this executable depends on, without variant suffixes.
-#
-#   LLVM_COMPONENT_DEPENDS
-#     LLVM components this executable depends on.
-#
-#   FILE_DEPENDS
-#     Additional files this executable depends on.
-#
-#   LINK_LIBRARIES
-#     Libraries to link with.
-#
-#   EXCLUDE_FROM_ALL
-#     Whether to exclude this executable from the ALL_BUILD target.
-#
-#   DONT_STRIP_NON_MAIN_SYMBOLS
-#     Should we not strip non main symbols.
-#
-#   DISABLE_ASLR
-#     Should we compile with -Wl,-no_pie so that ASLR is disabled?
-#
-#   source1 ...
-#     Sources to add into this executable.
-#
-# Note:
-#   Host executables are not given a variant suffix. To build an executable for
-#   each SDK and ARCH variant, use add_swift_target_executable.
-function(add_swift_executable name)
-  # Parse the arguments we were given.
-  cmake_parse_arguments(SWIFTEXE
-    "EXCLUDE_FROM_ALL;DONT_STRIP_NON_MAIN_SYMBOLS;DISABLE_ASLR"
-    ""
-    "DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_LIBRARIES;COMPILE_FLAGS"
-    ${ARGN})
-
-  translate_flag(${SWIFTEXE_EXCLUDE_FROM_ALL}
-      "EXCLUDE_FROM_ALL"
-      SWIFTEXE_EXCLUDE_FROM_ALL_FLAG)
-  translate_flag(${SWIFTEXE_DONT_STRIP_NON_MAIN_SYMBOLS}
-      "DONT_STRIP_NON_MAIN_SYMBOLS"
-      SWIFTEXE_DONT_STRIP_NON_MAIN_SYMBOLS_FLAG)
-  translate_flag(${SWIFTEXE_DISABLE_ASLR}
-      "DISABLE_ASLR"
-      SWIFTEXE_DISABLE_ASLR_FLAG)
-
-  set(SWIFTEXE_SOURCES ${SWIFTEXE_UNPARSED_ARGUMENTS})
-
-  _add_swift_executable_single(
-      ${name}
-      ${SWIFTEXE_SOURCES}
-      DEPENDS ${SWIFTEXE_DEPENDS}
-      LLVM_COMPONENT_DEPENDS ${SWIFTEXE_LLVM_COMPONENT_DEPENDS}
-      LINK_LIBRARIES ${SWIFTEXE_LINK_LIBRARIES}
-      SDK ${SWIFT_HOST_VARIANT_SDK}
-      ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}
-      COMPILE_FLAGS ${SWIFTEXE_COMPILE_FLAGS}
-      ${SWIFTEXE_EXCLUDE_FROM_ALL_FLAG}
-      ${SWIFTEXE_DONT_STRIP_NON_MAIN_SYMBOLS_FLAG}
-      ${SWIFTEXE_DISABLE_ASLR_FLAG})
->>>>>>> origin/tensorflow
-endfunction()
-
 macro(add_swift_tool_subdirectory name)
   add_llvm_subdirectory(SWIFT TOOL ${name})
 endmacro()

Diff for: cmake/modules/SwiftSource.cmake

@@ -228,9 +228,7 @@ function(_compile_swift_files
 
   # The standard library and overlays are always built resiliently.
   if(SWIFTFILE_IS_STDLIB)
-<<<<<<< HEAD
     list(APPEND swift_flags "-enable-library-evolution")
-=======
     # SWIFT_ENABLE_TENSORFLOW
     # FIXME: `-enable-resilience` is currently disabled for the TensorFlow
     # module because it causes compilation to crash during IRGen.
@@ -241,7 +239,6 @@ function(_compile_swift_files
        NOT "${SWIFTFILE_MODULE_NAME}" STREQUAL "DifferentiationUnittest")
       list(APPEND swift_flags "-Xfrontend" "-enable-resilience")
     endif()
->>>>>>> origin/tensorflow
   endif()
 
   if(SWIFT_STDLIB_USE_NONATOMIC_RC)

Diff for: include/swift/AST/ASTContext.h

@@ -304,14 +304,9 @@ class ASTContext final {
 
   /// Cache of module names that fail the 'canImport' test in this context.
   llvm::SmallPtrSet<Identifier, 8> FailedModuleImportNames;
-<<<<<<< HEAD
 
-  /// Retrieve the allocator for the given arena.
-=======
-
 public:
-  /// \brief Retrieve the allocator for the given arena.
->>>>>>> origin/tensorflow
+  /// Retrieve the allocator for the given arena.
   llvm::BumpPtrAllocator &
   getAllocator(AllocationArena arena = AllocationArena::Permanent) const;
 

Diff for: include/swift/AST/Attr.def

@@ -411,19 +411,19 @@ SIMPLE_DECL_ATTR(_propertyDelegate, PropertyDelegate,
 DECL_ATTR(differentiable, Differentiable,
   OnAccessor | OnConstructor | OnFunc | OnVar | OnSubscript | LongAttribute |
   AllowMultipleAttributes,
-  83)
+  87)
 DECL_ATTR(differentiating, Differentiating,
   OnFunc | LongAttribute | AllowMultipleAttributes |
-  NotSerialized, 84)
+  NotSerialized, 88)
 SIMPLE_DECL_ATTR(compilerEvaluable, CompilerEvaluable,
                  OnAccessor | OnFunc | OnConstructor | OnSubscript,
-                 /* Not serialized */ 85)
+                 /* Not serialized */ 89)
 SIMPLE_DECL_ATTR(TensorFlowGraph, TensorFlowGraph,
-                 OnFunc, 86)
+                 OnFunc, 90)
 SIMPLE_DECL_ATTR(_fieldwiseDifferentiable, FieldwiseDifferentiable,
-                 OnNominalType | UserInaccessible, 87)
+                 OnNominalType | UserInaccessible, 91)
 SIMPLE_DECL_ATTR(noDerivative, NoDerivative,
-                 OnVar, 88)
+                 OnVar, 92)
 
 #undef TYPE_ATTR
 #undef DECL_ATTR_ALIAS

Diff for: include/swift/AST/Attr.h

@@ -1425,7 +1425,6 @@ class ClangImporterSynthesizedTypeAttr : public DeclAttribute {
   }
 };
 
-<<<<<<< HEAD
 /// Defines a custom attribute.
 class CustomAttr final : public DeclAttribute,
                          public TrailingCallArguments<CustomAttr> {
@@ -1478,8 +1477,6 @@ class CustomAttr final : public DeclAttribute,
   }
 };
 
-/// Attributes that may be applied to declarations.
-=======
 // SWIFT_ENABLE_TENSORFLOW
 struct DeclNameWithLoc {
   DeclName Name;
@@ -1666,8 +1663,7 @@ class DifferentiatingAttr final
   }
 };
 
-/// \brief Attributes that may be applied to declarations.
->>>>>>> origin/tensorflow
+/// Attributes that may be applied to declarations.
 class DeclAttributes {
   /// Linked list of declaration attributes.
   DeclAttribute *DeclAttrs;

Diff for: include/swift/AST/Decl.h

@@ -3388,10 +3388,9 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
   /// Is this a key path type?
   Optional<KeyPathTypeKind> getKeyPathTypeKind() const;
 
-<<<<<<< HEAD
   /// Retrieve information about this type as a property delegate.
   PropertyDelegateTypeInfo getPropertyDelegateTypeInfo() const;
-=======
+
   // SWIFT_ENABLE_TENSORFLOW
   /// Get effective memberwise initializer for the given nominal type, if it
   /// exists: either a synthesized memberwise initializer or a user-defined
@@ -3401,7 +3400,6 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
   // SWIFT_ENABLE_TENSORFLOW
   /// Add `@_fixed_layout` attribute to the nominal type, if possible.
   void addFixedLayoutAttr();
->>>>>>> origin/tensorflow
 
 private:
   /// Predicate used to filter StoredPropertyRange.

Diff for: include/swift/AST/DiagnosticsParse.def

@@ -483,14 +483,11 @@ ERROR(expected_sil_value_ownership_kind,none,
       "expected value ownership kind in SIL code", ())
 ERROR(expected_sil_colon,none,
       "expected ':' before %0", (StringRef))
-<<<<<<< HEAD
 ERROR(expected_sil_tuple_index,none,
       "expected tuple element index", ())
-=======
 // SWIFT_ENABLE_TENSORFLOW
 ERROR(malformed_autodiff_parameter_indices,none,
       "malformed autodiff parameter indices", ())
->>>>>>> origin/tensorflow
 
 // SIL Values
 ERROR(sil_value_redefinition,none,

Diff for: include/swift/AST/DiagnosticsSIL.def

@@ -395,16 +395,12 @@ ERROR(shifting_all_significant_bits,none,
 ERROR(static_report_error, none,
       "static report error", ())
 
-<<<<<<< HEAD
-=======
 // SWIFT_ENABLE_TENSORFLOW
->>>>>>> origin/tensorflow
 ERROR(pound_assert_condition_not_constant,none,
        "#assert condition not constant", ())
 ERROR(pound_assert_failure,none,
        "%0", (StringRef))
 
-<<<<<<< HEAD
 NOTE(constexpr_unknown_reason_default,none,
     "cannot evaluate expression as constant here", ())
 NOTE(constexpr_unevaluable_operation,none,
@@ -456,7 +452,6 @@ NOTE(constexpr_witness_call_with_no_target_found, none,
     "cannot resolve a witness method call to a concrete function", ())
 NOTE(constexpr_witness_call_found_here, none,
     "witness method call found here", ())
-=======
 // Automatic differentiation diagnostics
 ERROR(autodiff_internal_swift_not_imported,none,
       "AD internal error: the Swift module is not imported", ())
@@ -517,7 +512,6 @@ NOTE(autodiff_class_member_not_supported,none,
      "differentiating class members is not supported yet", ())
 NOTE(autodiff_missing_return,none,
      "missing return for differentiation", ())
->>>>>>> origin/tensorflow
 
 ERROR(non_physical_addressof,none,
       "addressof only works with purely physical lvalues; "

Diff for: include/swift/AST/DiagnosticsSema.def

@@ -3733,14 +3733,13 @@ ERROR(unsupported_convention,none,
 ERROR(unreferenced_generic_parameter,none,
       "generic parameter '%0' is not used in function signature", (StringRef))
 
-<<<<<<< HEAD
 // Opaque types
 ERROR(unsupported_opaque_type,none,
       "'some' types are only implemented for the declared type of properties and subscripts and the return type of functions", ())
 
 ERROR(opaque_type_unsupported_pattern,none,
       "'some' type can only be declared on a single property declaration", ())
-=======
+
 // SWIFT_ENABLE_TENSORFLOW
 // Function differentiability
 ERROR(autodiff_attr_argument_not_differentiable,none,
@@ -3753,7 +3752,6 @@ ERROR(autodiff_attr_result_not_differentiable,none,
 ERROR(nondiff_attr_invalid_on_nondifferentiable_function,none,
       "'nondiff' cannot be applied to arguments of a non-differentiable "
       "function", ())
->>>>>>> origin/tensorflow
 
 // SIL
 ERROR(opened_non_protocol,none,