---

yaml
---
r: 294399
b: refs/heads/tensorflow
c: 94a9a9b
h: refs/heads/master
i:
  294397: 1479541
  294395: bf9ca51
  294391: be15774
  294383: a85dac4
  294367: fe4a7b9
  294335: f716bd5
  294271: 6cb8350
  294143: 4e34cbd
  293887: bed83aa

Author: LucianoPAlmeida

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: ca3449568f13dda1d7a3c8bafc80af11c15a960a
+refs/heads/tensorflow: 94a9a9b68fe966a64541e0add693d7d4a814d0bf
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/CMakeLists.txt

@@ -123,7 +123,7 @@ set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
 # SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
 # can be reused when a new version of Swift comes out (assuming the user hasn't
 # manually set it as part of their own CMake configuration).
-set(SWIFT_VERSION "5.1")
+set(SWIFT_VERSION "5.0")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")
@@ -262,15 +262,9 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
 set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
     "The name of the toolchain to pass to 'xcrun'")
 
-set(SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR "/usr/lib/swift" CACHE STRING
+set(SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR "@rpath" CACHE STRING
     "The directory of the install_name for standard library dylibs")
 
-# We don't want to use the same install_name_dir as the standard library which
-# will be installed in /usr/lib/swift. These private libraries should continue
-# to use @rpath for now.
-set(SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR "@rpath" CACHE STRING
-    "The directory of the install_name for the private standard library dylibs")
-
 set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.9" CACHE STRING
     "Minimum deployment target version for OS X")
 

branches/tensorflow/README.md

@@ -25,7 +25,6 @@
 |**[macOS 10.13 (TensorFlow)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_macos_high_sierra_tensorflow.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow)|
 |**[Ubuntu 16.04 (TensorFlow with GPU)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_tensorflow_gpu.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu)|
 |**[Debian 9.5](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_debian_9.5.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5)|
-|**[Windows 2019](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_windows_2019.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-windows-x86_64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-windows-x86_64)|
 
 
 ## Welcome to Swift

branches/tensorflow/cmake/modules/AddSwift.cmake

@@ -744,7 +744,6 @@ function(_add_swift_library_single target name)
         DEPLOYMENT_VERSION_TVOS
         DEPLOYMENT_VERSION_WATCHOS
         INSTALL_IN_COMPONENT
-        DARWIN_INSTALL_NAME_DIR
         MODULE_TARGET
         SDK)
   set(SWIFTLIB_SINGLE_multiple_parameter_options
@@ -1058,10 +1057,6 @@ function(_add_swift_library_single target name)
       set(install_name_dir "@rpath")
     endif()
 
-    if(SWIFTLIB_SINGLE_DARWIN_INSTALL_NAME_DIR)
-      set(install_name_dir "${SWIFTLIB_SINGLE_DARWIN_INSTALL_NAME_DIR}")
-    endif()
-
     set_target_properties("${target}"
       PROPERTIES
       INSTALL_NAME_DIR "${install_name_dir}")
@@ -1614,8 +1609,7 @@ function(add_swift_target_library name)
         DEPLOYMENT_VERSION_OSX
         DEPLOYMENT_VERSION_TVOS
         DEPLOYMENT_VERSION_WATCHOS
-        INSTALL_IN_COMPONENT
-        DARWIN_INSTALL_NAME_DIR)
+        INSTALL_IN_COMPONENT)
   set(SWIFTLIB_multiple_parameter_options
         C_COMPILE_FLAGS
         DEPENDS
@@ -1916,7 +1910,6 @@ function(add_swift_target_library name)
         ${SWIFTLIB_TARGET_LIBRARY_keyword}
         ${SWIFTLIB_FORCE_BUILD_OPTIMIZED_keyword}
         ${SWIFTLIB_NOSWIFTRT_keyword}
-        DARWIN_INSTALL_NAME_DIR "${SWIFTLIB_DARWIN_INSTALL_NAME_DIR}"
         INSTALL_IN_COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
         DEPLOYMENT_VERSION_OSX "${SWIFTLIB_DEPLOYMENT_VERSION_OSX}"
         DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"

branches/tensorflow/cmake/modules/StandaloneOverlay.cmake

@@ -9,12 +9,6 @@ if(DEFINED SWIFT_MASTER_LOADED
 endif()
 
 
-list(APPEND CMAKE_MODULE_PATH
-  "${SWIFT_SOURCE_ROOT}/llvm/cmake/modules"
-  "${PROJECT_SOURCE_DIR}/../../../../cmake/modules"
-  "${PROJECT_SOURCE_DIR}/../../../cmake/modules")
-
-
 # -----------------------------------------------------------------------------
 # Preconditions
 
@@ -75,6 +69,11 @@ set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
 set(CMAKE_INSTALL_PREFIX
   "${SWIFT_DEST_ROOT}${TOOLCHAIN_DIR}/usr")
 
+list(APPEND CMAKE_MODULE_PATH
+  "${SWIFT_SOURCE_ROOT}/llvm/cmake/modules"
+  "${PROJECT_SOURCE_DIR}/../../../../cmake/modules"
+  "${PROJECT_SOURCE_DIR}/../../../cmake/modules")
+
 
 set(SWIFT_APPLE_PLATFORMS
   OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR)
@@ -84,7 +83,6 @@ set(SWIFT_APPLE_PLATFORMS
 set(BUILD_STANDALONE TRUE)
 set(SWIFT_BUILD_STANDALONE_OVERLAY TRUE)
 
-set(SWIFT_STDLIB_LIBRARY_BUILD_TYPES "SHARED")
 set(SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES "SHARED")
 
 

branches/tensorflow/docs/ARCOptimization.rst

@@ -439,8 +439,8 @@ In the following we assume that all loops are canonicalized such that:
 2. The loop has one backedge.
 3. All exiting edges have a unique exit block.
 
-Motivation
-----------
+Motiviation
+-----------
 
 Consider the following simple loop::
 

branches/tensorflow/include/swift/AST/DeclContext.h

@@ -149,8 +149,6 @@ enum class ConformanceLookupKind : unsigned {
   All,
   /// Only the explicit conformance.
   OnlyExplicit,
-  /// All conformances except for inherited ones.
-  NonInherited,
 };
 
 /// Describes a diagnostic for a conflict between two protocol

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

@@ -470,27 +470,6 @@ NOTE(switch_value_case_doesnt_yield, none, "missing yield in the %0 case",
 NOTE(try_branch_doesnt_yield, none, "missing yield when error is "
      "%select{not |}0thrown", (bool))
 
-// OS log optimization dianostics.
-
-ERROR(oslog_message_argument_not_found, none, "no argument of type %0 in "
-  " the os log call", (Identifier))
-
-ERROR(oslog_dynamic_message, none, "os log methods must be passed a string "
-      "interpolation literal. 'OSLogMessage' must not be constructed explicitly",
-      ())
-
-ERROR(oslog_const_evaluation_error, none, "constant evaluating 'OSLogMessage'"
-  "implementation failed.", ())
-
-ERROR(oslog_non_constant_message, none, "'OSLogMessage' struct is "
-      "unoptimizable: 'init' is not constant evaluable", ())
-
-ERROR(oslog_non_constant_interpolation, none, "'OSLogInterpolation' struct is "
-      "unoptimizable: 'init' is not constant evaluable", ())
-
-ERROR(oslog_property_not_constant, none, "'OSLogInterpolation.%0' is not a "
-      "constant: formatting and privacy options must be literals", (StringRef))
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

branches/tensorflow/include/swift/AST/DiagnosticsSema.def

@@ -625,7 +625,7 @@ ERROR(serialization_missing_dependencies,Fatal,
 ERROR(serialization_circular_dependency,Fatal,
       "circular dependency between modules '%0' and %1",
       (StringRef, Identifier))
-ERROR(serialization_missing_underlying_module,Fatal,
+ERROR(serialization_missing_shadowed_module,Fatal,
       "cannot load underlying module for %0", (Identifier))
 ERROR(serialization_name_mismatch,Fatal,
       "cannot load module '%0' as '%1'", (StringRef, StringRef))

branches/tensorflow/include/swift/AST/KnownIdentifiers.def

@@ -178,9 +178,6 @@ IDENTIFIER_(ErrorType)
 IDENTIFIER(Code)
 IDENTIFIER_(nsError)
 
-// Custom string interpolation type used by os log APIs.
-IDENTIFIER(OSLogMessage)
-
 #undef IDENTIFIER
 #undef IDENTIFIER_
 #undef IDENTIFIER_WITH_NAME

branches/tensorflow/include/swift/Basic/Statistics.def

@@ -141,9 +141,6 @@ FRONTEND_STATISTIC(AST, NumPrefixOperators)
 /// Number of precedence groups in the AST context.
 FRONTEND_STATISTIC(AST, NumPrecedenceGroups)
 
-/// Number of precedence groups in the AST context.
-FRONTEND_STATISTIC(AST, NumStoredPropertiesQueries)
-
 /// Number of full function bodies parsed.
 FRONTEND_STATISTIC(Parse, NumFunctionsParsed)
 

branches/tensorflow/include/swift/Frontend/ParseableInterfaceModuleLoader.h

@@ -167,8 +167,7 @@ class ParseableInterfaceModuleLoader : public SerializedModuleLoaderBase {
   static bool buildSwiftModuleFromSwiftInterface(
     ASTContext &Ctx, StringRef CacheDir, StringRef PrebuiltCacheDir,
     StringRef ModuleName, StringRef InPath, StringRef OutPath,
-    bool SerializeDependencyHashes, bool TrackSystemDependencies,
-    bool RemarkOnRebuildFromInterface);
+    bool SerializeDependencyHashes, bool TrackSystemDependencies);
 };
 
 /// Extract the specified-or-defaulted -module-cache-path that winds up in

branches/tensorflow/include/swift/SIL/MemAccessUtils.h

@@ -29,27 +29,43 @@ inline bool accessKindMayConflict(SILAccessKind a, SILAccessKind b) {
 }
 
 /// Represents the identity of a stored class property as a combination
-/// of a base and projection.
+/// of a base, projection and projection path.
+/// we pre-compute the base and projection path, even though we can
+/// lazily do so, because it is more expensive otherwise
+/// We lazily compute the projection path,
+/// In the rare occasions we need it, because of Its destructor and
+/// its non-trivial copy constructor
 class ObjectProjection {
   SILValue object;
+  const RefElementAddrInst *REA;
   Projection proj;
 
 public:
-  ObjectProjection(SILValue object, const Projection &projection)
-      : object(object), proj(projection) {
-    assert(object->getType().isObject());
-  }
+  ObjectProjection(const RefElementAddrInst *REA)
+      : object(stripBorrow(REA->getOperand())), REA(REA),
+        proj(Projection(REA)) {}
+
+  ObjectProjection(SILValue object, const RefElementAddrInst *REA)
+      : object(object), REA(REA), proj(Projection(REA)) {}
+
+  const RefElementAddrInst *getInstr() const { return REA; }
 
   SILValue getObject() const { return object; }
 
   const Projection &getProjection() const { return proj; }
 
+  const Optional<ProjectionPath> getProjectionPath() const {
+    return ProjectionPath::getProjectionPath(stripBorrow(REA->getOperand()),
+                                             REA);
+  }
+
   bool operator==(const ObjectProjection &other) const {
-    return object == other.object && proj == other.proj;
+    return getObject() == other.getObject() &&
+           getProjection() == other.getProjection();
   }
 
   bool operator!=(const ObjectProjection &other) const {
-    return object != other.object || proj != other.proj;
+    return !operator==(other);
   }
 };
 
@@ -173,8 +189,8 @@ class AccessedStorage {
 
   AccessedStorage(SILValue base, Kind kind);
 
-  AccessedStorage(SILValue object, Projection projection)
-      : objProj(object, projection) {
+  AccessedStorage(SILValue object, const RefElementAddrInst *REA)
+      : objProj(object, REA) {
     initKind(Class);
   }
 
@@ -279,20 +295,20 @@ class AccessedStorage {
     if (isUniquelyIdentified() && other.isUniquelyIdentified()) {
       return !hasIdenticalBase(other);
     }
-    if (getKind() != Class || other.getKind() != Class)
-      // At least one side is an Argument or Yield, or is unidentified.
+    if (getKind() != Class || other.getKind() != Class) {
+      return false;
+    }
+    if (getObjectProjection().getProjection() ==
+        other.getObjectProjection().getProjection()) {
+      return false;
+    }
+    auto projPath = getObjectProjection().getProjectionPath();
+    auto otherProjPath = other.getObjectProjection().getProjectionPath();
+    if (!projPath.hasValue() || !otherProjPath.hasValue()) {
       return false;
-
-    // Classes are not uniquely identified by their base. However, if the
-    // underling objects have identical types and distinct property indices then
-    // they are distinct storage locations.
-    auto &proj = getObjectProjection();
-    auto &otherProj = other.getObjectProjection();
-    if (proj.getObject()->getType() == otherProj.getObject()->getType()
-        && proj.getProjection() != otherProj.getProjection()) {
-      return true;
     }
-    return false;
+    return projPath.getValue().hasNonEmptySymmetricDifference(
+        otherProjPath.getValue());
   }
 
   /// Returns the ValueDecl for the underlying storage, if it can be

branches/tensorflow/include/swift/SIL/Projection.h

@@ -289,9 +289,6 @@ class Projection {
 
   /// Apply this projection to \p BaseType and return the relevant subfield's
   /// SILType if BaseField has less subtypes than projection's offset.
-  ///
-  /// WARNING: This is not a constant time operation because it is implemented
-  /// in terms of getVarDecl, which requests all BaseType's stored properties.
   SILType getType(SILType BaseType, SILModule &M) const {
     assert(isValid());
     switch (getKind()) {
@@ -317,8 +314,6 @@ class Projection {
     llvm_unreachable("Unhandled ProjectionKind in switch.");
   }
 
-  /// WARNING: This is not a constant time operation because it requests all
-  /// BaseType's stored properties.
   VarDecl *getVarDecl(SILType BaseType) const {
     assert(isValid());
     assert((getKind() == ProjectionKind::Struct ||