---

yaml
---
r: 335743
b: refs/heads/rxwei-patch-1
c: 65d8d29
h: refs/heads/master
i:
  335741: 0af4fd2
  335739: 902957e
  335735: 37cf94d
  335727: 5023812
  335711: 50dd15a
  335679: e8ddc03
  335615: 5c1b079

Author: rintaro

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 697675b6a3b5a829cb4ecfc94a6b12ecfe8eca2c
+refs/heads/rxwei-patch-1: 65d8d29d2a1b4778097101c3aed1b1df963d3441
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/CHANGELOG.md

@@ -99,11 +99,6 @@ Swift 5.1
   foo(0) // prints "Any" in Swift < 5.1, "T" in Swift 5.1
   ```
 
-* [SE-0245][]:
-
-  `Array` and `ContiguousArray` now have `init(unsafeUninitializedCapacity:initializingWith:)`,
-  which provides access to the array's uninitialized storage.
-
 **Add new entries to the top of this section, not here!**
 
 Swift 5.0
@@ -7511,7 +7506,6 @@ Swift 1.0
 [SE-0228]: <https://github.com/apple/swift-evolution/blob/master/proposals/0228-fix-expressiblebystringinterpolation.md>
 [SE-0230]: <https://github.com/apple/swift-evolution/blob/master/proposals/0230-flatten-optional-try.md>
 [SE-0235]: <https://github.com/apple/swift-evolution/blob/master/proposals/0235-add-result.md>
-[SE-0245]: <https://github.com/apple/swift-evolution/blob/master/proposals/0245-array-uninitialized-initializer.md>
 
 [SR-106]: <https://bugs.swift.org/browse/SR-106>
 [SR-419]: <https://bugs.swift.org/browse/SR-419>

branches/rxwei-patch-1/CMakeLists.txt

@@ -883,11 +883,12 @@ find_package(PythonInterp REQUIRED)
 # Find optional dependencies.
 #
 
-if(LLVM_ENABLE_LIBXML2)
-  find_package(Libxml2 REQUIRED)
-else()
-  find_package(LibXml2)
-endif()
+# Find libxml.
+# FIXME: unify with CLANG_HAVE_LIBXML, which is set in LLVM anyway.
+find_package(LibXml2)
+option(SWIFT_HAVE_LIBXML
+    "Whether to build with libxml"
+    ${LIBXML2_FOUND})
 
 # You need libedit linked in order to check if you have el_wgets.
 cmake_push_check_state()

branches/rxwei-patch-1/README.md

@@ -297,7 +297,7 @@ To read the compiler documentation, start by installing the
 [Sphinx](http://sphinx-doc.org) documentation generator tool by running the
 command:
 
-    easy_install -U "Sphinx < 2.0"
+    easy_install -U Sphinx
 
 Once complete, you can build the Swift documentation by changing directory into
 [docs](https://github.com/apple/swift/tree/master/docs) and typing `make`. This

branches/rxwei-patch-1/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -314,6 +314,7 @@ function (swift_benchmark_compile_archopts)
 
   set(common_options
       "-c"
+      "-Xfrontend" "-verify-sil-ownership"
       "-target" "${target}"
       "-${BENCH_COMPILE_ARCHOPTS_OPT}" ${PAGE_ALIGNMENT_OPTION})
 
@@ -343,6 +344,7 @@ function (swift_benchmark_compile_archopts)
 
   set(common_options_driver
       "-c"
+      "-Xfrontend" "-verify-sil-ownership"
       "-target" "${target}"
       "-${driver_opt}")
 

branches/rxwei-patch-1/cmake/modules/SwiftSource.cmake

@@ -236,6 +236,7 @@ function(_compile_swift_files
   endif()
 
   if(SWIFTFILE_IS_STDLIB)
+    list(APPEND swift_flags "-Xfrontend" "-verify-sil-ownership")
     list(APPEND swift_flags "-Xfrontend" "-enable-mandatory-semantic-arc-opts")
   endif()
 

branches/rxwei-patch-1/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/rxwei-patch-1/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/rxwei-patch-1/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/rxwei-patch-1/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/rxwei-patch-1/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", ())
@@ -1518,8 +1522,6 @@ ERROR(extension_specialization,none,
       "type %0 with constraints specified by a 'where' clause", (Identifier))
 ERROR(extension_stored_property,none,
       "extensions must not contain stored properties", ())
-NOTE(extension_stored_property_fixit,none,
-     "Remove '=' to make %0 a computed property", (Identifier))
 ERROR(extension_nongeneric_trailing_where,none,
       "trailing 'where' clause for extension of non-generic type %0",
       (DeclName))
@@ -1869,8 +1871,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/rxwei-patch-1/include/swift/AST/KnownProtocols.def

@@ -67,7 +67,6 @@ PROTOCOL(Error)
 PROTOCOL_(ErrorCodeProtocol)
 PROTOCOL(OptionSet)
 PROTOCOL(CaseIterable)
-PROTOCOL(SIMDScalar)
 
 PROTOCOL_(BridgedNSError)
 PROTOCOL_(BridgedStoredNSError)

branches/rxwei-patch-1/include/swift/AST/SILOptions.h

@@ -112,7 +112,7 @@ class SILOptions {
   std::string SILOutputFileNameForDebugging;
 
   /// If set to true, compile with the SIL Ownership Model enabled.
-  bool VerifySILOwnership = true;
+  bool VerifySILOwnership = false;
 
   /// Assume that code will be executed in a single-threaded environment.
   bool AssumeSingleThreaded = false;

branches/rxwei-patch-1/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;
   }
 };