---

yaml
---
r: 237567
b: refs/heads/master-next
c: 958ee1a
h: refs/heads/master
i:
  237565: 2aeb419
  237563: db0e843
  237559: 99fd1d2
  237551: aa78284
  237535: 1f67b8c
  237503: a76939f
  237439: 5d96e94
  237311: 9722d98
  237055: 06bfcf7
  236543: d881cd7
  235519: bcf0f3c
  233471: 4aa92c8
  229375: 9ccee7d

Author: rudkx

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: ecf29e694a359d759ff0ce3d04fad1b06ec987ce
-refs/heads/master-next: 87dcd37e0bfa647c867224a1d540003f780239f8
+refs/heads/master-next: 958ee1a82b30b01a570a0c6058a13667d847864e
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/benchmark/CMakeLists.txt

@@ -88,7 +88,6 @@ set(SWIFT_BENCH_MODULES
     single-source/Hash
     single-source/HashQuadratic
     single-source/Histogram
-    single-source/InsertCharacter  
     single-source/Integrate
     single-source/IterateData
     single-source/Join

branches/master-next/benchmark/single-source/InsertCharacter.swift

@@ -76,7 +76,6 @@ import Hanoi
 import Hash
 import HashQuadratic
 import Histogram
-import InsertCharacter
 import Integrate
 import IterateData
 import Join
@@ -242,7 +241,6 @@ registerBenchmark(Hanoi)
 registerBenchmark(HashTest)
 registerBenchmark(HashQuadratic)
 registerBenchmark(Histogram)
-registerBenchmark(InsertCharacter)
 registerBenchmark(IntegrateTest)
 registerBenchmark(IterateData)
 registerBenchmark(Join)

branches/master-next/benchmark/utils/main.swift

@@ -346,7 +346,7 @@ public struct ZipIterator<... Iterators : IteratorProtocol> : Iterator {  // zer
   public mutating func next() -> Element? {
     if reachedEnd { return nil }
 
-    guard let values = (iterators.next()...) else {   // call "next" on each of the iterators, put the results into a tuple named "values"
+    guard let values = (iterators.next()...) {   // call "next" on each of the iterators, put the results into a tuple named "values"
       reachedEnd = true
       return nil
     }

branches/master-next/docs/GenericsManifesto.md

@@ -89,12 +89,6 @@ set swift_source_dir=path-to-directory-containing-all-cloned-repositories
   (`Debug`, `RelWithDebInfoAssert` or `Release`) to avoid conflicts between the debug and 
   non-debug version of the MSCRT library.
 
-- Set up the `visualc` and `ucrt` modules by copying  `ucrt.modulemap` located at
-  `swift/stdlib/public/Platform/ucrt.modulemap` into
-  `${UniversalCRTSdkDir}/Include/${UCRTVersion}/ucrt` as `module.modulemap` and copying `visualc.modulemap` located at `swift/stdlib/public/Platform/visualc.modulemap` into `${VCToolsInstallDir}/include` as `module.modulemap`
-
-
-
 ### 5. Build CMark
 - This must be done from within a developer command prompt. CMark is a fairly
   small project and should only take a few minutes to build.
@@ -156,9 +150,9 @@ cmake -G "Ninja" "%swift_source_dir%/swift"^
  -DSWIFT_PATH_TO_LLVM_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"^
  -DSWIFT_PATH_TO_CLANG_SOURCE="%swift_source_dir%/llvm/tools/clang"^
  -DSWIFT_PATH_TO_CLANG_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"^
- -DICU_UC_INCLUDE_DIRS="%swift_source_dir%/icu/include"^
+ -DICU_UC_INCLUDE_DIR="%swift_source_dir%/icu/include"^
  -DICU_UC_LIBRARY_DIRS="%swift_source_dir%/icu/lib64"^
- -DICU_I18N_INCLUDE_DIRS="%swift_source_dir%/icu/include"^
+ -DICU_I18N_INCLUDE_DIR="%swift_source_dir%/icu/include"^
  -DICU_I18N_LIBRARY_DIRS="%swift_source_dir%/icu/lib64"^
  -DICU_UC_LIB_NAME="icuuc"^
  -DICU_I18N_LIB_NAME="icuin"^

branches/master-next/docs/WindowsBuild.md

@@ -19,9 +19,9 @@ export VCToolsInstallDir=".../Microsoft Visual Studio/2017/Community"
 ## 2. Set up the `visualc` and `ucrt` modules
 The `ucrt.modulemap` located at
 `swift/stdlib/public/Platform/ucrt.modulemap` needs to be copied into
-`${UniversalCRTSdkDir}/Include/${UCRTVersion}/ucrt` as `module.modulemap`. The
-`visualc.modulemap` located at `swift/stdlib/public/Platform/visualc.modulemap`
-needs to be copied into `${VCToolsInstallDir}/include` as `module.modulemap`
+`${UniversalCRTSdkDir}/Include/${UCRTVersion}/ucrt`. The `visualc.modulemap`
+located at `swift/stdlib/public/Platform/visualc.modulemap` needs to be copied
+into `${VCToolsInstallDir}/include`.
 
 ## 3. Configure the runtime to be built with the just built `clang`
 Ensure that we use the tools from the just built LLVM and `clang` tools to 

branches/master-next/docs/WindowsCrossCompile.md

@@ -880,11 +880,7 @@ using FunctionTypeFlags = TargetFunctionTypeFlags<size_t>;
 
 template <typename int_type>
 class TargetParameterTypeFlags {
-  enum : int_type {
-    ValueOwnershipMask = 0x7F,
-    VariadicMask       = 0x80,
-    AutoClosureMask    = 0x100,
-  };
+  enum : int_type { ValueOwnershipMask = 0x7F, VariadicMask = 0x80 };
   int_type Data;
 
   constexpr TargetParameterTypeFlags(int_type Data) : Data(Data) {}
@@ -904,15 +900,8 @@ class TargetParameterTypeFlags {
                                               (isVariadic ? VariadicMask : 0));
   }
 
-  constexpr TargetParameterTypeFlags<int_type>
-  withAutoClosure(bool isAutoClosure) const {
-    return TargetParameterTypeFlags<int_type>(
-        (Data & ~AutoClosureMask) | (isAutoClosure ? AutoClosureMask : 0));
-  }
-
   bool isNone() const { return Data == 0; }
   bool isVariadic() const { return Data & VariadicMask; }
-  bool isAutoClosure() const { return Data & AutoClosureMask; }
 
   ValueOwnership getValueOwnership() const {
     return (ValueOwnership)(Data & ValueOwnershipMask);

branches/master-next/include/swift/ABI/MetadataValues.h

@@ -463,8 +463,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     HasStubImplementation : 1
   );
 
-  SWIFT_INLINE_BITFIELD_EMPTY(TypeDecl, ValueDecl);
-  SWIFT_INLINE_BITFIELD_EMPTY(AbstractTypeParamDecl, TypeDecl);
+  SWIFT_INLINE_BITFIELD_EMPTY(AbstractTypeParamDecl, ValueDecl);
 
   SWIFT_INLINE_BITFIELD_FULL(GenericTypeParamDecl, AbstractTypeParamDecl, 16+16,
     : NumPadBits,
@@ -473,7 +472,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     Index : 16
   );
 
-  SWIFT_INLINE_BITFIELD_EMPTY(GenericTypeDecl, TypeDecl);
+  SWIFT_INLINE_BITFIELD_EMPTY(GenericTypeDecl, ValueDecl);
 
   SWIFT_INLINE_BITFIELD(TypeAliasDecl, GenericTypeDecl, 1+1,
     /// Whether the typealias forwards perfectly to its underlying type.
@@ -573,22 +572,6 @@ class alignas(1 << DeclAlignInBits) Decl {
     HasAnyUnavailableValues : 1
   );
 
-  SWIFT_INLINE_BITFIELD(ModuleDecl, TypeDecl, 1+1+1+1,
-    /// If the module was or is being compiled with `-enable-testing`.
-    TestingEnabled : 1,
-
-    /// If the module failed to load
-    FailedToLoad : 1,
-
-    /// Whether the module is resilient.
-    ///
-    /// \sa ResilienceStrategy
-    RawResilienceStrategy : 1,
-
-    /// Whether all imports have been resolved. Used to detect circular imports.
-    HasResolvedImports : 1
-  );
-
   SWIFT_INLINE_BITFIELD(PrecedenceGroupDecl, Decl, 1+2,
     /// Is this an assignment operator?
     IsAssignment : 1,

branches/master-next/include/swift/AST/Decl.h

@@ -2277,7 +2277,7 @@ ERROR(multiple_enum_raw_types,none,
 ERROR(raw_type_not_first,none,
   "raw type %0 must appear first in the enum inheritance clause", (Type))
 ERROR(raw_type_not_literal_convertible,none,
-      "raw type %0 is not expressible by a string, integer, or floating-point literal",
+      "raw type %0 is not expressible by any literal",
       (Type))
 ERROR(enum_raw_type_not_equatable,none,
       "RawRepresentable conformance cannot be synthesized because raw type %0 is not "

branches/master-next/include/swift/AST/DiagnosticsSema.def

@@ -536,11 +536,22 @@ class alignas(8) Expr {
   LLVM_ATTRIBUTE_DEPRECATED(
       void dump() const LLVM_ATTRIBUTE_USED,
       "only for use within the debugger");
-  void dump(raw_ostream &OS, unsigned Indent = 0) const;
-  void dump(raw_ostream &OS, llvm::function_ref<Type(const Expr *)> getType,
-            llvm::function_ref<Type(const TypeLoc &)> getTypeOfTypeLoc,
-            unsigned Indent = 0) const;
-  
+  LLVM_ATTRIBUTE_DEPRECATED(
+      void dump(llvm::function_ref<Type(const Expr *)> getType,
+                llvm::function_ref<Type(const TypeLoc &)> getTypeOfTypeLoc)
+          const LLVM_ATTRIBUTE_USED,
+      "only for use within the debugger");
+  LLVM_ATTRIBUTE_DEPRECATED(
+      void dump(raw_ostream &OS, llvm::function_ref<Type(const Expr *)> getType,
+                llvm::function_ref<Type(const TypeLoc &)> getTypeOfTypeLoc)
+          const LLVM_ATTRIBUTE_USED,
+      "only for use within the debugger");
+
+  void dump(raw_ostream &OS) const;
+  void print(raw_ostream &OS, unsigned Indent = 0) const;
+  void print(raw_ostream &OS, llvm::function_ref<Type(const Expr *)> getType,
+             llvm::function_ref<Type(const TypeLoc &)> getTypeOfTypeLoc,
+             unsigned Indent = 0) const;
   void print(ASTPrinter &Printer, const PrintOptions &Opts) const;
 
   // Only allow allocation of Exprs using the allocator in ASTContext

branches/master-next/include/swift/AST/Expr.h

@@ -241,6 +241,13 @@ class ModuleDecl : public DeclContext, public TypeDecl {
   /// \see EntryPointInfoTy
   EntryPointInfoTy EntryPointInfo;
 
+  struct {
+    unsigned TestingEnabled : 1;
+    unsigned FailedToLoad : 1;
+    unsigned ResilienceStrategy : 1;
+    unsigned HasResolvedImports : 1;
+  } Flags;
+
   ModuleDecl(Identifier name, ASTContext &ctx);
 
 public:
@@ -277,32 +284,32 @@ class ModuleDecl : public DeclContext, public TypeDecl {
 
   /// Returns true if this module was or is being compiled for testing.
   bool isTestingEnabled() const {
-    return Bits.ModuleDecl.TestingEnabled;
+    return Flags.TestingEnabled;
   }
   void setTestingEnabled(bool enabled = true) {
-    Bits.ModuleDecl.TestingEnabled = enabled;
+    Flags.TestingEnabled = enabled;
   }
 
   /// Returns true if there was an error trying to load this module.
   bool failedToLoad() const {
-    return Bits.ModuleDecl.FailedToLoad;
+    return Flags.FailedToLoad;
   }
   void setFailedToLoad(bool failed = true) {
-    Bits.ModuleDecl.FailedToLoad = failed;
+    Flags.FailedToLoad = failed;
   }
 
   bool hasResolvedImports() const {
-    return Bits.ModuleDecl.HasResolvedImports;
+    return Flags.HasResolvedImports;
   }
   void setHasResolvedImports() {
-    Bits.ModuleDecl.HasResolvedImports = true;
+    Flags.HasResolvedImports = true;
   }
 
   ResilienceStrategy getResilienceStrategy() const {
-    return ResilienceStrategy(Bits.ModuleDecl.RawResilienceStrategy);
+    return ResilienceStrategy(Flags.ResilienceStrategy);
   }
   void setResilienceStrategy(ResilienceStrategy strategy) {
-    Bits.ModuleDecl.RawResilienceStrategy = unsigned(strategy);
+    Flags.ResilienceStrategy = unsigned(strategy);
   }
 
   /// Look up a (possibly overloaded) value set at top-level scope

branches/master-next/include/swift/AST/Module.h

@@ -133,7 +133,7 @@ class alignas(8) Stmt {
   LLVM_ATTRIBUTE_DEPRECATED(
       void dump() const LLVM_ATTRIBUTE_USED,
       "only for use within the debugger");
-  void dump(raw_ostream &OS, const ASTContext *Ctx = nullptr, unsigned Indent = 0) const;
+  void print(raw_ostream &OS, const ASTContext *Ctx = nullptr, unsigned Indent = 0) const;
 
   // Only allow allocation of Exprs using the allocator in ASTContext
   // or by doing a placement new.

branches/master-next/include/swift/AST/Stmt.h

@@ -1726,12 +1726,6 @@ class ParameterTypeFlags {
             | ParameterFlags(uint8_t(ownership) << OwnershipShift);
   }
 
-  ParameterTypeFlags withAutoClosure(bool isAutoClosure) const {
-    return ParameterTypeFlags(isAutoClosure
-                                  ? value | ParameterTypeFlags::AutoClosure
-                                  : value - ParameterTypeFlags::AutoClosure);
-  }
-
   bool operator ==(const ParameterTypeFlags &other) const {
     return value.toRaw() == other.value.toRaw();
   }

branches/master-next/include/swift/AST/Types.h

@@ -23,7 +23,7 @@ namespace llvm {
   class Twine;
 }
 
-namespace llvm {
+namespace clang {
   namespace vfs {
     class FileSystem;
   }
@@ -58,7 +58,7 @@ namespace swift {
 
   namespace vfs {
     llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>
-    getFileOrSTDIN(llvm::vfs::FileSystem &FS,
+    getFileOrSTDIN(clang::vfs::FileSystem &FS,
                    const llvm::Twine &Name, int64_t FileSize = -1,
                    bool RequiresNullTerminator = true, bool IsVolatile = false);
   } // end namespace vfs