---

yaml
---
r: 292347
b: refs/heads/tensorflow
c: 1a38073
h: refs/heads/master
i:
  292345: 0f750fc
  292343: e964fb1

Author: drodriguez

[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: 07a29d5ff712180e23dcf042558d2673b7d40fe3
+refs/heads/tensorflow: 1a38073c6e384c93d618c0e438e2c8666a27082d
 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/WindowsBuild.md

@@ -125,7 +125,7 @@ cmake -G Ninja^
  -DLLVM_ENABLE_ASSERTIONS=ON^
  -DLLVM_ENABLE_PDB=YES^
  -DLLVM_ENABLE_PROJECTS=clang^
- -DLLVM_TARGETS_TO_BUILD="AArch64;ARM;X86"^
+ -DLLVM_TARGETS_TO_BUILD=X86^
  S:/llvm
 popd
 cmake --build "S:\b\llvm"
@@ -208,7 +208,7 @@ cmake -G Ninja^
   -DLLDB_PATH_TO_LLVM_BUILD="S:\b\llvm"^
   -DLLDB_PATH_TO_SWIFT_BUILD="S:\b\swift"^
   -DLLVM_ENABLE_ASSERTIONS=ON^
-  -DPYTHON_HOME="%ProgramFiles(x86)%\Microsoft Visual Studio\Shared\Python37_64"^
+  -DPYTHON_HOME=%ProgramFiles(x86)%\Microsoft Visual Studio\Shared\Python37_64^
   S:\lldb
 popd
 cmake --build S:\b\lldb

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

@@ -4715,7 +4715,7 @@ class VarDecl : public AbstractStorageDecl {
   /// Set \p v to be the pattern produced VarDecl that is the parent of this
   /// var decl.
   void setParentVarDecl(VarDecl *v) {
-    assert(v && v != this);
+    assert(v);
     Parent = v;
   }
 
@@ -4906,7 +4906,7 @@ class ParamDecl : public VarDecl {
   SourceLoc SpecifierLoc;
 
   struct StoredDefaultArgument {
-    PointerUnion<Expr *, VarDecl *> DefaultArg;
+    Expr *DefaultArg = nullptr;
     Initializer *InitContext = nullptr;
     StringRef StringRepresentation;
   };
@@ -4963,20 +4963,12 @@ class ParamDecl : public VarDecl {
 
   Expr *getDefaultValue() const {
     if (auto stored = DefaultValueAndFlags.getPointer())
-      return stored->DefaultArg.dyn_cast<Expr *>();
-    return nullptr;
-  }
-
-  VarDecl *getStoredProperty() const {
-    if (auto stored = DefaultValueAndFlags.getPointer())
-      return stored->DefaultArg.dyn_cast<VarDecl *>();
+      return stored->DefaultArg;
     return nullptr;
   }
 
   void setDefaultValue(Expr *E);
 
-  void setStoredProperty(VarDecl *var);
-
   Initializer *getDefaultArgumentInitContext() const {
     if (auto stored = DefaultValueAndFlags.getPointer())
       return stored->InitContext;
@@ -5569,14 +5561,12 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
 
 class OperatorDecl;
 
+/// Note: These align with '%select's in diagnostics.
 enum class SelfAccessKind : uint8_t {
-  NonMutating,
-  Mutating,
-  __Consuming,
+  NonMutating = 0,
+  Mutating    = 1,
+  __Consuming = 2,
 };
-
-/// Diagnostic printing of \c SelfAccessKind.
-llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, SelfAccessKind SAK);
 
 /// FuncDecl - 'func' declaration.
 class FuncDecl : public AbstractFunctionDecl {

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

@@ -52,10 +52,6 @@ enum class DefaultArgumentKind : uint8_t {
   EmptyArray,
   /// An empty dictionary literal.
   EmptyDictionary,
-  /// A reference to the stored property. This is a special default argument
-  /// kind for the synthesized memberwise constructor to emit a call to the
-  // property's initializer.
-  StoredProperty,
 };
 enum { NumDefaultArgumentKindBits = 4 };
 

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

@@ -30,7 +30,6 @@ namespace swift {
   class ValueDecl;
 
   enum class PatternKind : uint8_t;
-  enum class SelfAccessKind : uint8_t;
   enum class ReferenceOwnership : uint8_t;
   enum class StaticSpellingKind : uint8_t;
   enum class DescriptiveDeclKind : uint8_t;
@@ -78,7 +77,6 @@ namespace swift {
     Type,
     TypeRepr,
     PatternKind,
-    SelfAccessKind,
     ReferenceOwnership,
     StaticSpellingKind,
     DescriptiveDeclKind,
@@ -107,7 +105,6 @@ namespace swift {
       Type TypeVal;
       TypeRepr *TyR;
       PatternKind PatternKindVal;
-      SelfAccessKind SelfAccessKindVal;
       ReferenceOwnership ReferenceOwnershipVal;
       StaticSpellingKind StaticSpellingKindVal;
       DescriptiveDeclKind DescriptiveDeclKindVal;
@@ -172,10 +169,6 @@ namespace swift {
         : Kind(DiagnosticArgumentKind::ReferenceOwnership),
           ReferenceOwnershipVal(RO) {}
 
-    DiagnosticArgument(SelfAccessKind SAK)
-        : Kind(DiagnosticArgumentKind::SelfAccessKind),
-          SelfAccessKindVal(SAK) {}
-
     DiagnosticArgument(StaticSpellingKind SSK)
         : Kind(DiagnosticArgumentKind::StaticSpellingKind),
           StaticSpellingKindVal(SSK) {}
@@ -256,11 +249,6 @@ namespace swift {
       return ReferenceOwnershipVal;
     }
 
-    SelfAccessKind getAsSelfAccessKind() const {
-      assert(Kind == DiagnosticArgumentKind::SelfAccessKind);
-      return SelfAccessKindVal;
-    }
-
     StaticSpellingKind getAsStaticSpellingKind() const {
       assert(Kind == DiagnosticArgumentKind::StaticSpellingKind);
       return StaticSpellingKindVal;

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

@@ -1108,20 +1108,24 @@ ERROR(attribute_requires_operator_identifier,none,
 ERROR(attribute_requires_single_argument,none,
       "'%0' requires a function with one argument", (StringRef))
 
-ERROR(mutating_invalid_global_scope,none, "%0 is only valid on methods",
-      (SelfAccessKind))
-ERROR(mutating_invalid_classes,none, "%0 isn't valid on methods in "
-      "classes or class-bound protocols", (SelfAccessKind))
+ERROR(mutating_invalid_global_scope,none,
+      "'%select{nonmutating|mutating|__consuming}0' is only valid on methods",
+      (unsigned))
+ERROR(mutating_invalid_classes,none,
+      "'%select{nonmutating|mutating|__consuming}0' isn't valid on methods in "
+      "classes or class-bound protocols", (bool))
 
 ERROR(functions_mutating_and_not,none,
-      "method must not be declared both %0 and %1",
-      (SelfAccessKind, SelfAccessKind))
+      "method must not be declared both "
+      "%select{nonmutating|mutating|__consuming}0 and "
+      "%select{nonmutating|mutating|__consuming}1",
+      (unsigned, unsigned))
 ERROR(static_functions_not_mutating,none,
       "static functions must not be declared mutating", ())
 
 ERROR(modify_mutatingness_differs_from_setter,none,
-      "'modify' accessor cannot be %0 when the setter is %1",
-      (SelfAccessKind, SelfAccessKind))
+      "'modify' accessor cannot be %select{nonmutating|mutating}0 "
+      "when the setter is %select{mutating|nonmutating}0", (bool))
 
 ERROR(transparent_in_protocols_not_supported,none,
       "'@_transparent' attribute is not supported on declarations within protocols", ())
@@ -1869,8 +1873,8 @@ NOTE(protocol_witness_prefix_postfix_conflict,none,
      "candidate is %select{|prefix, |postfix, }1not "
      "%select{prefix|postfix}0 as required", (bool, unsigned))
 NOTE(protocol_witness_mutation_modifier_conflict,none,
-     "candidate is marked %0 but protocol does not allow it",
-     (SelfAccessKind))
+     "candidate is marked '%select{nonmutating|mutating|__consuming}0' but "
+     "protocol does not allow it", (unsigned))
 NOTE(protocol_witness_settable_conflict,none,
      "candidate is not settable, but protocol requires it", ())
 NOTE(protocol_witness_rethrows_conflict,none,

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

@@ -17,13 +17,12 @@
 #ifndef SWIFT_AST_STMT_H
 #define SWIFT_AST_STMT_H
 
-#include "swift/AST/ASTNode.h"
 #include "swift/AST/Availability.h"
 #include "swift/AST/AvailabilitySpec.h"
+#include "swift/AST/ASTNode.h"
 #include "swift/AST/IfConfigClause.h"
 #include "swift/AST/TypeAlignments.h"
 #include "swift/Basic/NullablePtr.h"
-#include "llvm/ADT/TinyPtrVector.h"
 #include "llvm/Support/TrailingObjects.h"
 
 namespace swift {
@@ -985,22 +984,24 @@ class CaseStmt final
   SourceLoc CaseLoc;
   SourceLoc ColonLoc;
 
-  llvm::PointerIntPair<Stmt *, 1, bool> BodyAndHasFallthrough;
+  llvm::PointerIntPair<Stmt *, 1, bool> BodyAndHasBoundDecls;
 
-  Optional<MutableArrayRef<VarDecl *>> CaseBodyVariables;
+  /// Set to true if we have a fallthrough.
+  ///
+  /// TODO: Once we have CaseBodyVarDecls, use the bit in BodyAndHasBoundDecls
+  /// for this instead. This is separate now for staging reasons.
+  bool hasFallthrough;
 
   CaseStmt(SourceLoc CaseLoc, ArrayRef<CaseLabelItem> CaseLabelItems,
-           SourceLoc UnknownAttrLoc, SourceLoc ColonLoc, Stmt *Body,
-           Optional<MutableArrayRef<VarDecl *>> CaseBodyVariables,
-           Optional<bool> Implicit,
+           bool HasBoundDecls, SourceLoc UnknownAttrLoc, SourceLoc ColonLoc,
+           Stmt *Body, Optional<bool> Implicit,
            NullablePtr<FallthroughStmt> fallthroughStmt);
 
 public:
   static CaseStmt *
   create(ASTContext &C, SourceLoc CaseLoc,
-         ArrayRef<CaseLabelItem> CaseLabelItems, SourceLoc UnknownAttrLoc,
-         SourceLoc ColonLoc, Stmt *Body,
-         Optional<MutableArrayRef<VarDecl *>> CaseBodyVariables,
+         ArrayRef<CaseLabelItem> CaseLabelItems, bool HasBoundDecls,
+         SourceLoc UnknownAttrLoc, SourceLoc ColonLoc, Stmt *Body,
          Optional<bool> Implicit = None,
          NullablePtr<FallthroughStmt> fallthroughStmt = nullptr);
 
@@ -1019,18 +1020,18 @@ class CaseStmt final
   }
 
   NullablePtr<CaseStmt> getFallthroughDest() {
-    if (!hasFallthroughDest())
+    if (!hasFallthrough)
       return nullptr;
     return (*getTrailingObjects<FallthroughStmt *>())->getFallthroughDest();
   }
 
-  bool hasFallthroughDest() const { return BodyAndHasFallthrough.getInt(); }
+  bool hasFallthroughDest() const { return hasFallthrough; }
 
-  Stmt *getBody() const { return BodyAndHasFallthrough.getPointer(); }
-  void setBody(Stmt *body) { BodyAndHasFallthrough.setPointer(body); }
+  Stmt *getBody() const { return BodyAndHasBoundDecls.getPointer(); }
+  void setBody(Stmt *body) { BodyAndHasBoundDecls.setPointer(body); }
 
   /// True if the case block declares any patterns with local variable bindings.
-  bool hasBoundDecls() const { return CaseBodyVariables.hasValue(); }
+  bool hasBoundDecls() const { return BodyAndHasBoundDecls.getInt(); }
 
   /// Get the source location of the 'case' or 'default' of the first label.
   SourceLoc getLoc() const { return CaseLoc; }
@@ -1055,38 +1056,14 @@ class CaseStmt final
     return UnknownAttrLoc.isValid();
   }
 
-  Optional<ArrayRef<VarDecl *>> getCaseBodyVariables() const {
-    if (!CaseBodyVariables)
-      return None;
-    ArrayRef<VarDecl *> a = *CaseBodyVariables;
-    return a;
-  }
-
-  Optional<MutableArrayRef<VarDecl *>> getCaseBodyVariables() {
-    return CaseBodyVariables;
-  }
-
-  ArrayRef<VarDecl *> getCaseBodyVariablesOrEmptyArray() const {
-    if (!CaseBodyVariables)
-      return ArrayRef<VarDecl *>();
-    ArrayRef<VarDecl *> a = *CaseBodyVariables;
-    return a;
-  }
-
-  MutableArrayRef<VarDecl *> getCaseBodyVariablesOrEmptyArray() {
-    if (!CaseBodyVariables)
-      return MutableArrayRef<VarDecl *>();
-    return *CaseBodyVariables;
-  }
-
   static bool classof(const Stmt *S) { return S->getKind() == StmtKind::Case; }
 
   size_t numTrailingObjects(OverloadToken<CaseLabelItem>) const {
     return getNumCaseLabelItems();
   }
 
   size_t numTrailingObjects(OverloadToken<FallthroughStmt *>) const {
-    return hasFallthroughDest() ? 1 : 0;
+    return hasFallthrough ? 1 : 0;
   }
 };
 

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

@@ -4186,17 +4186,9 @@ class ConvertEscapeToNoEscapeInst final
          SILFunction &F, SILOpenedArchetypesState &OpenedArchetypes,
          bool lifetimeGuaranteed);
 public:
-  /// Return true if we have extended the lifetime of the argument of the
-  /// convert_escape_to_no_escape to be over all uses of the trivial type.
   bool isLifetimeGuaranteed() const {
     return lifetimeGuaranteed;
   }
-
-  /// Mark that we have extended the lifetime of the argument of the
-  /// convert_escape_to_no_escape to be over all uses of the trivial type.
-  ///
-  /// NOTE: This is a one way operation.
-  void setLifetimeGuaranteed() { lifetimeGuaranteed = true; }
 };
 
 /// ThinFunctionToPointerInst - Convert a thin function pointer to a

branches/tensorflow/include/swift/Serialization/ModuleFormat.h

@@ -52,7 +52,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 479; // stored property default arg
+const uint16_t SWIFTMODULE_VERSION_MINOR = 477; // SILUndef serialized with ownership kind
 
 using DeclIDField = BCFixed<31>;
 
@@ -379,7 +379,6 @@ enum class DefaultArgumentKind : uint8_t {
   NilLiteral,
   EmptyArray,
   EmptyDictionary,
-  StoredProperty,
 };
 using DefaultArgumentField = BCFixed<4>;
 

branches/tensorflow/lib/AST/ASTDumper.cpp

@@ -305,7 +305,6 @@ static StringRef getDefaultArgumentKindString(DefaultArgumentKind value) {
     case DefaultArgumentKind::EmptyArray: return "[]";
     case DefaultArgumentKind::EmptyDictionary: return "[:]";
     case DefaultArgumentKind::Normal: return "normal";
-    case DefaultArgumentKind::StoredProperty: return "stored property";
   }
 
   llvm_unreachable("Unhandled DefaultArgumentKind in switch.");
@@ -1620,24 +1619,6 @@ class PrintStmt : public StmtVisitor<PrintStmt> {
     printCommon(S, "case_stmt");
     if (S->hasUnknownAttr())
       OS << " @unknown";
-
-    if (auto caseBodyVars = S->getCaseBodyVariables()) {
-      OS << '\n';
-      OS.indent(Indent + 2);
-      PrintWithColorRAII(OS, ParenthesisColor) << '(';
-      PrintWithColorRAII(OS, StmtColor) << "case_body_variables";
-      OS << '\n';
-      for (auto *vd : *caseBodyVars) {
-        OS.indent(2);
-        // TODO: Printing a var decl does an Indent ... dump(vd) ... '\n'. We
-        // should see if we can factor this dumping so that the caller of
-        // printRec(VarDecl) has more control over the printing.
-        printRec(vd);
-      }
-      OS.indent(Indent + 2);
-      PrintWithColorRAII(OS, ParenthesisColor) << ')';
-    }
-
     for (const auto &LabelItem : S->getCaseLabelItems()) {
       OS << '\n';
       OS.indent(Indent + 2);