---

yaml
---
r: 303039
b: refs/heads/tensorflow
c: 46b5af5
h: refs/heads/master
i:
  303037: 3e703f2
  303035: a1c3150
  303031: 05d1230
  303023: 90a7049
  303007: adc672e
  302975: 9b2cd1b

Author: nkcsgexi

[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: de1718ed1beb91743006f6b98ef4111186e7bbf6
+refs/heads/tensorflow: 46b5af59df707763ec782d6099586dd67a5da0b6
 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/docs/CompilerPerformance.md

@@ -717,7 +717,6 @@ $ cat /tmp/stats/*.json
   "AST.NumSourceLinesPerSecond": 3,
   "AST.NumLinkLibraries": 0,
   "AST.NumLoadedModules": 4,
-  "AST.NumImportedExternalDefinitions": 0,
   "AST.NumTotalClangImportedEntities": 0,
   ...
   "time.swift.Parsing.wall": 5.038023e-03,

branches/tensorflow/docs/DebuggingTheCompiler.rst

@@ -457,6 +457,44 @@ One can also use shell regex to visit multiple files in the same directory. Exam
 
     clang-tidy -p=$PATH_TO_BUILD/swift-macosx-x86_64/compile_commands.json $FULL_PATH_TO_DIR/*.cpp
 
+Identifying an optimizer bug
+----------------------------
+
+If a compiled executable is crashing when built with optimizations, but not
+crashing when built with -Onone, it's most likely one of the SIL optimizations
+which causes the miscompile.
+
+Currently there is no tool to automatically identify the bad optimization, but
+it's quite easy to do this manually:
+
+1. Find the offending optimization with bisecting:
+
+  a. Add the compiler option ``-Xllvm -sil-opt-pass-count=<n>``, where ``<n>``
+     is the number of optimizations to run.
+  b. Bisect: find n where the executable crashes, but does not crash with n-1.
+     Note that n can be quite large, e.g. > 100000 (just try
+     n = 10, 100, 1000, 10000, etc. to find an upper bound).
+  c. Add another option ``-Xllvm -sil-print-pass-name``. The output can be
+     large, so it's best to redirect stderr to a file (``2> output``).
+     In the output search for the last pass before ``stage Address Lowering``.
+     It should be the ``Run #<n-1>``. This line tells you the name of the bad
+     optimization pass and on which function it run.
+
+2. Get the SIL before and after the bad optimization.
+
+  a. Add the compiler options
+     ``-Xllvm -sil-print-all -Xllvm -sil-print-only-function='<function>'``
+     where ``<function>`` is the function name (including the preceding ``$``).
+     For example:
+     ``-Xllvm -sil-print-all -Xllvm -sil-print-only-function='$s4test6testityS2iF'``.
+     Again, the output can be large, so it's best to redirect stderr to a file.
+  b. From the output, copy the SIL of the function *before* the bad
+     run into a separate file and the SIL *after* the bad run into a file.
+  c. Compare both SIL files and try to figure out what the optimization pass
+     did wrong. To simplify the comparison, it's sometimes helpful to replace
+     all SIL values (e.g. ``%27``) with a constant string (e.g. ``%x``).
+
+
 Debugging Swift Executables
 ===========================
 

branches/tensorflow/docs/SIL.rst

@@ -2333,15 +2333,15 @@ with a sequence that also correctly destroys the current value.
 This instruction is only valid in Raw SIL and is rewritten as appropriate
 by the definitive initialization pass.
 
-assign_by_delegate
+assign_by_wrapper
 ``````````````````
 ::
 
-  sil-instruction ::= 'assign_by_delegate' sil-operand 'to' sil-operand ',' 'init' sil-operand ',' 'set' sil-operand
+  sil-instruction ::= 'assign_by_wrapper' sil-operand 'to' sil-operand ',' 'init' sil-operand ',' 'set' sil-operand
 
-  assign_by_delegate %0 : $S to %1 : $*T, init %2 : $F, set %3 : $G
+  assign_by_wrapper %0 : $S to %1 : $*T, init %2 : $F, set %3 : $G
   // $S can be a value or address type
-  // $T must be the type of a property delegate.
+  // $T must be the type of a property wrapper.
   // $F must be a function type, taking $S as a single argument and returning $T
   // $G must be a function type, taking $S as a single argument and with not return value
 

branches/tensorflow/docs/WindowsBuild.md

@@ -158,10 +158,10 @@ cmake -G Ninja^
  -DLLVM_DIR=S:\b\llvm\lib\cmake\llvm^
  -DClang_DIR=S:\b\llvm\lib\cmake\clang^
  -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE="S:\swift-corelibs-libdispatch"^
- -DSWIFT_WINDOWS_x86_64_ICU_UC_INCLUDE="S:/thirdparty/icu4c-63_1-Win64-MSVC2017/include"^
- -DSWIFT_WINDOWS_x86_64_ICU_UC="S:/thirdparty/icu4c-63_1-Win64-MSVC2017/lib64/icuuc.lib"^
- -DSWIFT_WINDOWS_x86_64_ICU_I18N_INCLUDE="S:/thirdparty/icu4c-63_1-Win64-MSVC2017/include"^
- -DSWIFT_WINDOWS_x86_64_ICU_I18N="S:/thirdparty/icu4c-63_1-Win64-MSVC2017/lib64/icuin.lib"^
+ -DSWIFT_WINDOWS_x86_64_ICU_UC_INCLUDE="S:/thirdparty/icu4c-64_2-Win64-MSVC2017/include"^
+ -DSWIFT_WINDOWS_x86_64_ICU_UC="S:/thirdparty/icu4c-64_2-Win64-MSVC2017/lib64/icuuc.lib"^
+ -DSWIFT_WINDOWS_x86_64_ICU_I18N_INCLUDE="S:/thirdparty/icu4c-64_2-Win64-MSVC2017/include"^
+ -DSWIFT_WINDOWS_x86_64_ICU_I18N="S:/thirdparty/icu4c-64_2-Win64-MSVC2017/lib64/icuin.lib"^
  -DCMAKE_INSTALL_PREFIX="C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr"^
  -DPYTHON_EXECUTABLE=C:\Python27\python.exe^
  S:\swift
@@ -258,7 +258,7 @@ cmake -G Ninja^
   -DCURL_LIBRARY="S:/curl/builds/libcurl-vc15-x64-release-static-ipv6-sspi-winssl/lib/libcurl_a.lib"^
   -DCURL_INCLUDE_DIR="S:/curl/builds/libcurl-vc15-x64-release-static-ipv6-sspi-winssl/include"^
   -DENABLE_TESTING=NO^
-  -DICU_ROOT="S:/thirdparty/icu4c-63_1-Win64-MSVC2017"^
+  -DICU_ROOT="S:/thirdparty/icu4c-64_2-Win64-MSVC2017"^
   -DLIBXML2_LIBRARY="S:/libxml2/win32/bin.msvc/libxml2_a.lib"^
   -DLIBXML2_INCLUDE_DIR="S:/libxml2/include"^
   -DFOUNDATION_PATH_TO_LIBDISPATCH_SOURCE=S:\swift-corelibs-libdispatch^
@@ -312,7 +312,7 @@ cmake -G Ninja^
   -DCURL_LIBRARY="S:/curl/builds/libcurl-vc15-x64-release-static-ipv6-sspi-winssl/lib/libcurl_a.lib"^
   -DCURL_INCLUDE_DIR="S:/curl/builds/libcurl-vc15-x64-release-static-ipv6-sspi-winssl/include"^
   -DENABLE_TESTING=YES^
-  -DICU_ROOT="S:/thirdparty/icu4c-63_1-Win64-MSVC2017"^
+  -DICU_ROOT="S:/thirdparty/icu4c-64_2-Win64-MSVC2017"^
   -DLIBXML2_LIBRARY="S:/libxml2/win32/bin.msvc/libxml2_a.lib"^
   -DLIBXML2_INCLUDE_DIR="S:/libxml2/include"^
   -DFOUNDATION_PATH_TO_LIBDISPATCH_SOURCE=S:\swift-corelibs-libdispatch^

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

@@ -255,13 +255,6 @@ class ASTContext final {
 #define IDENTIFIER_WITH_NAME(Name, IdStr) Identifier Id_##Name;
 #include "swift/AST/KnownIdentifiers.def"
 
-  /// The list of external definitions imported by this context.
-  llvm::SetVector<Decl *> ExternalDefinitions;
-
-  /// FIXME: HACK HACK HACK
-  /// This state should be tracked somewhere else.
-  unsigned LastCheckedExternalDefinition = 0;
-
   /// A consumer of type checker debug output.
   std::unique_ptr<TypeCheckerDebugConsumer> TypeCheckerDebug;
 
@@ -580,14 +573,8 @@ class ASTContext final {
                                ForeignLanguage language,
                                const DeclContext *dc);
 
-  /// Add a declaration to a list of declarations that need to be emitted
-  /// as part of the current module or source file, but are otherwise not
-  /// nested within it.
-  void addExternalDecl(Decl *decl);
-
   /// Add a declaration that was synthesized to a per-source file list if
-  /// if is part of a source file, or the external declarations list if
-  /// it is part of an imported type context.
+  /// if is part of a source file.
   void addSynthesizedDecl(Decl *decl);
 
   /// Add a cleanup function to be called when the ASTContext is deallocated.
@@ -851,11 +838,11 @@ class ASTContext final {
                                               const IterableDeclContext *idc,
                                               LazyMemberLoader *lazyLoader);
 
-  /// Access the side cache for property delegate backing property types,
+  /// Access the side cache for property wrapper backing property types,
   /// used because TypeChecker::typeCheckBinding() needs somewhere to stash
   /// the backing property type.
-  Type getSideCachedPropertyDelegateBackingPropertyType(VarDecl *var) const;
-  void setSideCachedPropertyDelegateBackingPropertyType(VarDecl *var,
+  Type getSideCachedPropertyWrapperBackingPropertyType(VarDecl *var) const;
+  void setSideCachedPropertyWrapperBackingPropertyType(VarDecl *var,
                                                         Type type);
 
   /// Returns memory usage of this ASTContext.

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

@@ -17,7 +17,7 @@
 SWIFT_TYPEID_NAMED(NominalTypeDecl *, NominalTypeDecl)
 SWIFT_TYPEID_NAMED(VarDecl *, VarDecl)
 SWIFT_TYPEID(Type)
-SWIFT_TYPEID(PropertyDelegateBackingPropertyInfo)
-SWIFT_TYPEID(PropertyDelegateTypeInfo)
+SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)
+SWIFT_TYPEID(PropertyWrapperTypeInfo)
 SWIFT_TYPEID_NAMED(CustomAttr *, CustomAttr)
 SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)

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

@@ -22,8 +22,8 @@ namespace swift {
 
 class CustomAttr;
 class NominalTypeDecl;
-struct PropertyDelegateBackingPropertyInfo;
-struct PropertyDelegateTypeInfo;
+struct PropertyWrapperBackingPropertyInfo;
+struct PropertyWrapperTypeInfo;
 class Type;
 class VarDecl;
 class TypeAliasDecl;

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

@@ -399,7 +399,7 @@ SIMPLE_DECL_ATTR(_implementationOnly, ImplementationOnly,
 DECL_ATTR(_custom, Custom,
   OnAnyDecl | UserInaccessible,
   85)
-SIMPLE_DECL_ATTR(_propertyDelegate, PropertyDelegate,
+SIMPLE_DECL_ATTR(_propertyWrapper, PropertyWrapper,
   OnStruct | OnClass | OnEnum,
   86)
 SIMPLE_DECL_ATTR(_disfavoredOverload, DisfavoredOverload,

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

@@ -78,8 +78,8 @@ namespace swift {
   class ParameterTypeFlags;
   class Pattern;
   struct PrintOptions;
-  struct PropertyDelegateBackingPropertyInfo;
-  struct PropertyDelegateTypeInfo;
+  struct PropertyWrapperBackingPropertyInfo;
+  struct PropertyWrapperTypeInfo;
   class ProtocolDecl;
   class ProtocolType;
   struct RawComment;
@@ -391,8 +391,8 @@ class alignas(1 << DeclAlignInBits) Decl {
     /// FIXME: Remove this once LLDB has proper support for resilience.
     IsREPLVar : 1,
 
-    /// Whether this is the backing storage for a property delegate.
-    IsPropertyDelegateBackingProperty : 1
+    /// Whether this is the backing storage for a property wrapper.
+    IsPropertyWrapperBackingProperty : 1
   );
 
   SWIFT_INLINE_BITFIELD(ParamDecl, VarDecl, 1 + NumDefaultArgumentKindBits,
@@ -3394,8 +3394,8 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
   /// Is this a key path type?
   Optional<KeyPathTypeKind> getKeyPathTypeKind() const;
 
-  /// Retrieve information about this type as a property delegate.
-  PropertyDelegateTypeInfo getPropertyDelegateTypeInfo() const;
+  /// Retrieve information about this type as a property wrapper.
+  PropertyWrapperTypeInfo getPropertyWrapperTypeInfo() const;
 
 private:
   /// Predicate used to filter StoredPropertyRange.
@@ -4745,14 +4745,14 @@ class AbstractStorageDecl : public ValueDecl {
 };
 
 /// Describes which synthesized property for a property with an attached
-/// delegate is being referenced.
-enum class PropertyDelegateSynthesizedPropertyKind {
+/// wrapper is being referenced.
+enum class PropertyWrapperSynthesizedPropertyKind {
   /// The backing storage property, which is a stored property of the
-  /// delegate type.
+  /// wrapper type.
   Backing,
-  /// A storage delegate (e.g., `$foo`), which is a wrapper over the
-  /// delegate instance's `delegateValue` property.
-  StorageDelegate,
+  /// A storage wrapper (e.g., `$foo`), which is a wrapper over the
+  /// wrapper instance's `wrapperValue` property.
+  StorageWrapper,
 };
 
 /// VarDecl - 'var' and 'let' declarations.
@@ -4785,7 +4785,7 @@ class VarDecl : public AbstractStorageDecl {
     Bits.VarDecl.IsDebuggerVar = false;
     Bits.VarDecl.IsREPLVar = false;
     Bits.VarDecl.HasNonPatternBindingInit = false;
-    Bits.VarDecl.IsPropertyDelegateBackingProperty = false;
+    Bits.VarDecl.IsPropertyWrapperBackingProperty = false;
   }
 
   /// This is the type specified, including location information.
@@ -5080,64 +5080,64 @@ class VarDecl : public AbstractStorageDecl {
     Bits.VarDecl.IsREPLVar = IsREPLVar;
   }
 
-  /// Retrieve the custom attribute that attaches a property delegate to this
+  /// Retrieve the custom attribute that attaches a property wrapper to this
   /// property.
-  CustomAttr *getAttachedPropertyDelegate() const;
+  CustomAttr *getAttachedPropertyWrapper() const;
 
-  /// Retrieve the type of the attached property delegate as a contextual
+  /// Retrieve the type of the attached property wrapper as a contextual
   /// type.
   ///
-  /// \returns a NULL type for properties without attached delegates,
-  /// an error type when the property delegate type itself is erroneous,
-  /// or the delegate type itself, which may involve unbound generic
+  /// \returns a NULL type for properties without attached wrappers,
+  /// an error type when the property wrapper type itself is erroneous,
+  /// or the wrapper type itself, which may involve unbound generic
   /// types.
-  Type getAttachedPropertyDelegateType() const;
+  Type getAttachedPropertyWrapperType() const;
 
-  /// Retrieve information about the attached property delegate type.
-  PropertyDelegateTypeInfo getAttachedPropertyDelegateTypeInfo() const;
+  /// Retrieve information about the attached property wrapper type.
+  PropertyWrapperTypeInfo getAttachedPropertyWrapperTypeInfo() const;
 
-  /// Retrieve the fully resolved attached property delegate type.
+  /// Retrieve the fully resolved attached property wrapper type.
   ///
   /// This type will be the fully-resolved form of
-  /// \c getAttachedPropertyDelegateType(), which will not contain any
+  /// \c getAttachedPropertyWrapperType(), which will not contain any
   /// unbound generic types. It will be the type of the backing property.
-  Type getPropertyDelegateBackingPropertyType() const;
+  Type getPropertyWrapperBackingPropertyType() const;
 
   /// Retrieve information about the backing properties of the attached
-  /// property delegate.
-  PropertyDelegateBackingPropertyInfo
-      getPropertyDelegateBackingPropertyInfo() const;
+  /// property wrapper.
+  PropertyWrapperBackingPropertyInfo
+      getPropertyWrapperBackingPropertyInfo() const;
 
   /// Retrieve the backing storage property for a property that has an
-  /// attached property delegate.
+  /// attached property wrapper.
   ///
   /// The backing storage property will be a stored property of the
-  /// delegate's type. This will be equivalent to
-  /// \c getAttachedPropertyDelegateType() when it is fully-specified;
-  /// if \c getAttachedPropertyDelegateType() involves an unbound
+  /// wrapper's type. This will be equivalent to
+  /// \c getAttachedPropertyWrapperType() when it is fully-specified;
+  /// if \c getAttachedPropertyWrapperType() involves an unbound
   /// generic type, the backing storage property will be the appropriate
   /// bound generic version.
-  VarDecl *getPropertyDelegateBackingProperty() const;
+  VarDecl *getPropertyWrapperBackingProperty() const;
 
-  /// Whether this is a property with a property delegate that was initialized
+  /// Whether this is a property with a property wrapper that was initialized
   /// via a value of the original type, e.g.,
   ///
   /// \code
   /// @Lazy var i = 17
   /// \end
-  bool isPropertyDelegateInitializedWithInitialValue() const;
+  bool isPropertyWrapperInitializedWithInitialValue() const;
 
   /// If this property is the backing storage for a property with an attached
-  /// property delegate, return the original property.
+  /// property wrapper, return the original property.
   ///
   /// \param kind If not \c None, only returns the original property when
   /// \c this property is the specified synthesized property.
-  VarDecl *getOriginalDelegatedProperty(
-      Optional<PropertyDelegateSynthesizedPropertyKind> kind = None) const;
+  VarDecl *getOriginalWrappedProperty(
+      Optional<PropertyWrapperSynthesizedPropertyKind> kind = None) const;
 
-  /// Set the property that delegates to this property as it's backing
+  /// Set the property that wraps to this property as it's backing
   /// property.
-  void setOriginalDelegatedProperty(VarDecl *originalProperty);
+  void setOriginalWrappedProperty(VarDecl *originalProperty);
 
   /// Return the Objective-C runtime name for this property.
   Identifier getObjCPropertyName() const;
@@ -5164,7 +5164,7 @@ class VarDecl : public AbstractStorageDecl {
   /// initializer.
   ///
   /// \param preferDeclaredProperties When encountering a `lazy` property
-  /// or a property that has an attached property delegate, prefer the
+  /// or a property that has an attached property wrapper, prefer the
   /// actual declared property (which may or may not be considered "stored"
   /// as the moment) to the backing storage property. Otherwise, the stored
   /// backing property will be treated as the member-initialized property.