---

yaml
---
r: 269303
b: refs/heads/tensorflow-merge
c: 74a3e8a
h: refs/heads/master
i:
  269301: ae77f17
  269299: d604d2c
  269295: bbee9f3

Author: swift-ci

[refs]

@@ -1128,4 +1128,4 @@ refs/tags/swift-4.2.1-RELEASE: 02a6ca969ea1387475b6caeb69c31186df7d30b6
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-11-01-a: 3b0299288f8287094b9ef587f46df54f42a347af
 refs/heads/5.0-add-libcxx-and-clang-tools-extra: eb6e6f9b0a551e7804e96d0dac83add11ec73977
 refs/heads/Fix-DataCreateSmall: e15aff31b7406a5b2dadac9d7810941cec85035a
-refs/heads/tensorflow-merge: 80a1c084a56a48826e244647f7ff69a257692153
+refs/heads/tensorflow-merge: 74a3e8a5b5e27b856cfcb17ce3b20447950016a7

branches/tensorflow-merge/cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -226,7 +226,7 @@ macro(swift_common_unified_build_config product)
   set(PATH_TO_LLVM_BUILD "${CMAKE_BINARY_DIR}")
   set(${product}_PATH_TO_CLANG_BUILD "${CMAKE_BINARY_DIR}")
   set(PATH_TO_CLANG_BUILD "${CMAKE_BINARY_DIR}")
-  set(CLANG_MAIN_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/tools/clang/include")
+  set(CLANG_MAIN_INCLUDE_DIR "${LLVM_EXTERNAL_CLANG_SOURCE_DIR}/include")
   set(CLANG_BUILD_INCLUDE_DIR "${CMAKE_BINARY_DIR}/tools/clang/include")
   set(${product}_NATIVE_LLVM_TOOLS_PATH "${CMAKE_BINARY_DIR}/bin")
   set(${product}_NATIVE_CLANG_TOOLS_PATH "${CMAKE_BINARY_DIR}/bin")
@@ -235,8 +235,8 @@ macro(swift_common_unified_build_config product)
 
   # If cmark was checked out into tools/cmark, expect to build it as
   # part of the unified build.
-  if(EXISTS "${CMAKE_SOURCE_DIR}/tools/cmark/")
-    set(${product}_PATH_TO_CMARK_SOURCE "${CMAKE_SOURCE_DIR}/tools/cmark")
+  if(EXISTS "${LLVM_EXTERNAL_CMARK_SOURCE_DIR}")
+    set(${product}_PATH_TO_CMARK_SOURCE "${LLVM_EXTERNAL_CMARK_SOURCE_DIR}")
     set(${product}_PATH_TO_CMARK_BUILD "${CMAKE_BINARY_DIR}/tools/cmark")
     set(${product}_CMARK_LIBRARY_DIR "${CMAKE_BINARY_DIR}/lib")
 

branches/tensorflow-merge/docs/WindowsBuild.md

@@ -11,13 +11,13 @@ There are two supported ways to build Swift on Windows, they are
 
 `clang-cl` is recommended over MSVC for building Swift on Windows.
 Although it is possible to build the compiler and the standard library with
-MSVC, and use those built products to compile a Swift program, it won't be
-possible to run the binary without seperately obtaining the Swift runtime. On
+MSVC and to use those built products to compile a Swift program, it won't be
+possible to run the binary without separately obtaining the Swift runtime. On
 the other hand, `clang-cl` is able to build the runtime, which makes it
 possible to build and run all the components required for Swift natively on
 Windows.
 
-clang should be 7.0 or newer.  Visual Studio 2017 is needed in all cases as
+clang should be 7.0 or newer. Visual Studio 2017 is needed in all cases as
 it provides some of the needed headers and libraries.
 
 ## `clang-cl`

branches/tensorflow-merge/include/swift/AST/DiagnosticsFrontend.def

@@ -276,6 +276,9 @@ ERROR(missing_dependency_of_parseable_module_interface,none,
 ERROR(error_extracting_dependencies_from_cached_module,none,
       "error extracting dependencies from cached module '%0'",
       (StringRef))
+ERROR(unknown_forced_module_loading_mode,none,
+      "unknown value for SWIFT_FORCE_MODULE_LOADING variable: '%0'",
+      (StringRef))
 
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)

branches/tensorflow-merge/include/swift/AST/DiagnosticsSIL.def

@@ -300,6 +300,22 @@ ERROR(shifting_all_significant_bits,none,
 ERROR(static_report_error, none,
       "static report error", ())
 
+ERROR(pound_assert_condition_not_constant,none,
+       "#assert condition not constant", ())
+ERROR(pound_assert_failure,none,
+       "%0", (StringRef))
+
+NOTE(constexpr_unknown_reason_default,none, "could not fold operation", ())
+NOTE(constexpr_too_many_instructions,none,
+     "exceeded instruction limit: %0 when evaluating the expression at compile "
+     "time", (unsigned))
+NOTE(constexpr_loop,none, "control flow loop found", ())
+NOTE(constexpr_overflow,none, "integer overflow detected", ())
+NOTE(constexpr_trap,none, "trap detected", ())
+NOTE(constexpr_called_from,none, "when called from here", ())
+NOTE(constexpr_not_evaluable,none,
+     "expression not evaluable as constant here", ())
+
 ERROR(non_physical_addressof,none,
       "addressof only works with purely physical lvalues; "
       "use `withUnsafePointer` or `withUnsafeBytes` unless you're implementing "

branches/tensorflow-merge/include/swift/Frontend/ParseableInterfaceSupport.h

@@ -61,8 +61,9 @@ getModuleCachePathFromClang(const clang::CompilerInstance &Instance);
 /// directory, and loading the serialized .swiftmodules from there.
 class ParseableInterfaceModuleLoader : public SerializedModuleLoaderBase {
   explicit ParseableInterfaceModuleLoader(ASTContext &ctx, StringRef cacheDir,
-                                          DependencyTracker *tracker)
-    : SerializedModuleLoaderBase(ctx, tracker),
+                                          DependencyTracker *tracker,
+                                          ModuleLoadingMode loadMode)
+    : SerializedModuleLoaderBase(ctx, tracker, loadMode),
       CacheDir(cacheDir)
   {}
 
@@ -83,9 +84,10 @@ class ParseableInterfaceModuleLoader : public SerializedModuleLoaderBase {
 public:
   static std::unique_ptr<ParseableInterfaceModuleLoader>
   create(ASTContext &ctx, StringRef cacheDir,
-         DependencyTracker *tracker = nullptr) {
+         DependencyTracker *tracker,
+         ModuleLoadingMode loadMode) {
     return std::unique_ptr<ParseableInterfaceModuleLoader>(
-        new ParseableInterfaceModuleLoader(ctx, cacheDir, tracker));
+        new ParseableInterfaceModuleLoader(ctx, cacheDir, tracker, loadMode));
   }
 };
 

branches/tensorflow-merge/include/swift/FrontendTool/FrontendTool.h

@@ -42,25 +42,6 @@ class FrontendObserver {
 
   /// The frontend has configured the compiler instance.
   virtual void configuredCompiler(CompilerInstance &instance);
-
-  /// The frontend has performed semantic analysis.
-  virtual void performedSemanticAnalysis(CompilerInstance &instance);
-
-  /// The frontend has performed basic SIL generation.
-  /// SIL diagnostic passes have not yet been applied.
-  virtual void performedSILGeneration(SILModule &module);
-
-  /// The frontend has executed the SIL diagnostic passes.
-  virtual void performedSILDiagnostics(SILModule &module);
-
-  /// The frontend has executed the SIL optimization pipeline.
-  virtual void performedSILOptimization(SILModule &module);
-
-  /// The frontend is about to run the program as an immediate script.
-  virtual void aboutToRunImmediately(CompilerInstance &instance);
-
-  // TODO: maybe enhance this interface to hear about IRGen and LLVM
-  // progress.
 };
 
 /// Perform all the operations of the frontend, exactly as if invoked

branches/tensorflow-merge/include/swift/Runtime/BuiltinTypes.def

@@ -74,32 +74,43 @@ BUILTIN_VECTOR_TYPE(Bi16_, Int16, 4)
 BUILTIN_VECTOR_TYPE(Bi16_, Int16, 8)
 BUILTIN_VECTOR_TYPE(Bi16_, Int16, 16)
 BUILTIN_VECTOR_TYPE(Bi16_, Int16, 32)
+BUILTIN_VECTOR_TYPE(Bi16_, Int16, 64)
 
 // Int32 vector types
 BUILTIN_VECTOR_TYPE(Bi32_, Int32, 2)
 BUILTIN_VECTOR_TYPE(Bi32_, Int32, 3)
 BUILTIN_VECTOR_TYPE(Bi32_, Int32, 4)
 BUILTIN_VECTOR_TYPE(Bi32_, Int32, 8)
 BUILTIN_VECTOR_TYPE(Bi32_, Int32, 16)
+BUILTIN_VECTOR_TYPE(Bi32_, Int32, 32)
+BUILTIN_VECTOR_TYPE(Bi32_, Int32, 64)
 
 // Int64 vector types
 BUILTIN_VECTOR_TYPE(Bi64_, Int64, 2)
 BUILTIN_VECTOR_TYPE(Bi64_, Int64, 3)
 BUILTIN_VECTOR_TYPE(Bi64_, Int64, 4)
 BUILTIN_VECTOR_TYPE(Bi64_, Int64, 8)
+BUILTIN_VECTOR_TYPE(Bi64_, Int64, 16)
+BUILTIN_VECTOR_TYPE(Bi64_, Int64, 32)
+BUILTIN_VECTOR_TYPE(Bi64_, Int64, 64)
 
 // Float32 vector types
 BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 2)
 BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 3)
 BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 4)
 BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 8)
 BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 16)
+BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 32)
+BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 64)
 
 // Float64 vector types
 BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 2)
 BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 3)
 BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 4)
 BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 8)
+BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 16)
+BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 32)
+BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 64)
 
 #undef BUILTIN_VECTOR_TYPE
 #undef VECTOR_BUILTIN_SYMBOL_NAME

branches/tensorflow-merge/include/swift/Runtime/Metadata.h

@@ -495,6 +495,11 @@ SWIFT_RUNTIME_EXPORT
 const ClassMetadata *
 swift_getObjCClassFromMetadata(const Metadata *theClass);
 
+// Get the ObjC class object from class type metadata,
+// or nullptr if the type isn't an ObjC class.
+const ClassMetadata *
+swift_getObjCClassFromMetadataConditional(const Metadata *theClass);
+
 SWIFT_RUNTIME_EXPORT
 const ClassMetadata *
 swift_getObjCClassFromObject(HeapObject *object);