---

yaml
---
r: 339711
b: refs/heads/rxwei-patch-1
c: d3262ec
h: refs/heads/master
i:
  339709: cbde1a7
  339707: ea77afd
  339703: 379d35d
  339695: ff52327
  339679: cb3652f
  339647: c79b73f
  339583: 157ae1a
  339455: 0e8f52e

Author: mundaym

[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: af7b461db2d25dc54e52ab50026e569505abb7eb
+refs/heads/rxwei-patch-1: d3262ec10d7e41b9403f83f2f89474795f9eed3a
 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

@@ -26,28 +26,6 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SR-8974][]:
-
-  Duplicate tuple element labels are no longer allowed, because it leads
-  to incorrect behavior. For example:
-
-  ```
-  let dupLabels: (foo: Int, foo: Int) = (foo: 1, foo: 2)
-
-  enum Foo { case bar(x: Int, x: Int) }
-  let f: Foo = .bar(x: 0, x: 1)
-  ```
-
-  will now be diagnosed as an error. 
-
-  Note: You can still use duplicate labels when declaring functions and
-  subscripts, as long as the internal labels are different. For example:
-
-  ```
-  func foo(bar x: Int, bar y: Int) {}
-  subscript(a x: Int, a y: Int) -> Int {}
-  ```
-
 * [SR-6118][]:
 
   Subscripts can now declare default arguments:
@@ -7718,6 +7696,5 @@ Swift 1.0
 [SR-7799]: <https://bugs.swift.org/browse/SR-7799>
 [SR-8109]: <https://bugs.swift.org/browse/SR-8109>
 [SR-8546]: <https://bugs.swift.org/browse/SR-8546>
-[SR-8974]: <https://bugs.swift.org/browse/SR-8974>
 [SR-9043]: <https://bugs.swift.org/browse/SR-9043>
 [SR-9827]: <https://bugs.swift.org/browse/SR-9827>

branches/rxwei-patch-1/CMakeLists.txt

@@ -117,6 +117,8 @@ endif()
 
 set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
     "Build Swift with code coverage instrumenting enabled [FALSE, NOT-MERGED, MERGED]")
+set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
+    STRINGS FALSE "NOT-MERGED" "MERGED")
 
 # 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
@@ -169,20 +171,8 @@ endif()
 
 set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
     "Build type for the Swift standard library and SDK overlays [Debug, RelWithDebInfo, Release, MinSizeRel]")
-# Allow the user to specify the standard library CMAKE_MSVC_RUNTIME_LIBRARY
-# value.  The following values are valid:
-#   - MultiThreaded (/MT)
-#   - MultiThreadedDebug (/MTd)
-#   - MultiThreadedDLL (/MD)
-#   - MultiThreadedDebugDLL (/MDd)
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
-  set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDebugDLL)
-else()
-  set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDLL)
-endif()
-set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY
-  ${SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default}
-  CACHE STRING "MSVC Runtime Library for the standard library")
+set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
+    STRINGS "Debug" "RelWithDebInfo" "Release" "MinSizeRel")
 
 is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" swift_optimized)
 if(swift_optimized)

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

@@ -400,6 +400,12 @@ function(_add_variant_swift_compile_flags
     list(APPEND result "-D" "SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS")
   endif()
 
+  if(sdk STREQUAL WINDOWS)
+    list(APPEND result "-Xcc" "-D_MT")
+    # TODO(compnerd) handle /MT /MTd
+    list(APPEND result "-Xcc" "-D_DLL")
+  endif()
+
   set("${result_var_name}" "${result}" PARENT_SCOPE)
 endfunction()
 
@@ -867,8 +873,13 @@ function(_add_swift_library_single target name)
     if("${SWIFTLIB_SINGLE_ARCHITECTURE}" MATCHES arm)
       list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS -Xcc;-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE)
     endif()
-    list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS
-      -libc;${SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY})
+    list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS -Xfrontend;-autolink-library;-Xfrontend;oldnames)
+    # TODO(compnerd) handle /MT and /MTd
+    if(CMAKE_BUILD_TYPE MATCHES Debug)
+      list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS -Xfrontend;-autolink-library;-Xfrontend;msvcrtd)
+    else()
+      list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS -Xfrontend;-autolink-library;-Xfrontend;msvcrt)
+    endif()
   endif()
 
   # FIXME: don't actually depend on the libraries in SWIFTLIB_SINGLE_LINK_LIBRARIES,
@@ -1914,20 +1925,6 @@ function(add_swift_target_library name)
         GYB_SOURCES ${SWIFTLIB_GYB_SOURCES}
       )
 
-      if(sdk STREQUAL WINDOWS)
-        if(SWIFT_COMPILER_IS_MSVC_LIKE)
-          if (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreadedDebugDLL)
-            target_compile_options(${VARIANT_NAME} PRIVATE /MDd /D_DLL /D_DEBUG)
-          elseif (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreadedDebug)
-            target_compile_options(${VARIANT_NAME} PRIVATE /MTd /U_DLL /D_DEBUG)
-          elseif (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreadedDLL)
-            target_compile_options(${VARIANT_NAME} PRIVATE /MD /D_DLL /U_DEBUG)
-          elseif (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreaded)
-            target_compile_options(${VARIANT_NAME} PRIVATE /MT /U_DLL /U_DEBUG)
-          endif()
-        endif()
-      endif()
-
       if(NOT SWIFTLIB_OBJECT_LIBRARY)
         # Add dependencies on the (not-yet-created) custom lipo target.
         foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})

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

@@ -65,6 +65,10 @@ option(SWIFT_ENABLE_PARSEABLE_MODULE_INTERFACES
 set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
   "Build type for the Swift standard library and SDK overlays.")
 
+set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
+  STRINGS
+    "Debug" "RelWithDebInfo" "Release" "MinSizeRel")
+
 # -----------------------------------------------------------------------------
 # Constants
 

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSema.def

@@ -452,7 +452,7 @@ ERROR(cannot_convert_sequence_element_value,none,
       "cannot convert sequence element type %0 to expected type %1",
       (Type, Type))
 ERROR(cannot_convert_sequence_element_protocol,none,
-      "sequence element type %0 does not conform to expected protocol %1",
+      "sequence element type %0 does not conform to expected type %1",
       (Type, Type))
 
 ERROR(throws_functiontype_mismatch,none,
@@ -3523,8 +3523,6 @@ ERROR(tuple_single_element,none,
       "cannot create a single-element tuple with an element label", ())
 ERROR(tuple_ellipsis,none,
       "cannot create a variadic tuple", ())
-ERROR(tuple_duplicate_label,none,
-      "cannot create a tuple with a duplicate element label", ())
 ERROR(enum_element_ellipsis,none,
       "variadic enum cases are not supported", ())
 
@@ -3953,9 +3951,17 @@ ERROR(borrowed_on_objc_protocol_requirement,none,
 // MARK: dynamic
 //------------------------------------------------------------------------------
 
+ERROR(dynamic_not_in_class,none,
+      "only members of classes may be dynamic", ())
+ERROR(dynamic_with_nonobjc,none,
+      "a declaration cannot be both '@nonobjc' and 'dynamic'",
+      ())
 ERROR(dynamic_with_transparent,none,
       "a declaration cannot be both '@_tranparent' and 'dynamic'",
       ())
+ERROR(dynamic_requires_objc,none,
+      "'dynamic' %0 %1 must also be '@objc'",
+      (DescriptiveDeclKind, DeclName))
 
 //------------------------------------------------------------------------------
 // MARK: @_dynamicReplacement(for:)

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

@@ -953,25 +953,15 @@ class TapExpr : public Expr {
 class InterpolatedStringLiteralExpr : public LiteralExpr {
   /// Points at the beginning quote.
   SourceLoc Loc;
-  /// Points at the ending quote.
-  /// Needed for the upcoming \c ASTScope subsystem because lookups can be
-  /// targeted to inside an \c InterpolatedStringLiteralExpr. It would be nicer
-  /// to use \c EndLoc for this value, but then \c Lexer::getLocForEndOfToken()
-  /// would not work for \c stringLiteral->getEndLoc().
-  SourceLoc TrailingQuoteLoc;
   TapExpr *AppendingExpr;
   Expr *SemanticExpr;
 
 public:
-  InterpolatedStringLiteralExpr(SourceLoc Loc,
-                                SourceLoc TrailingQuoteLoc,
-                                unsigned LiteralCapacity,
+  InterpolatedStringLiteralExpr(SourceLoc Loc, unsigned LiteralCapacity, 
                                 unsigned InterpolationCount,
                                 TapExpr *AppendingExpr)
       : LiteralExpr(ExprKind::InterpolatedStringLiteral, /*Implicit=*/false),
-        Loc(Loc),
-        TrailingQuoteLoc(TrailingQuoteLoc),
-        AppendingExpr(AppendingExpr), SemanticExpr() {
+        Loc(Loc), AppendingExpr(AppendingExpr), SemanticExpr() {
     Bits.InterpolatedStringLiteralExpr.InterpolationCount = InterpolationCount;
     Bits.InterpolatedStringLiteralExpr.LiteralCapacity = LiteralCapacity;
   }
@@ -1008,11 +998,6 @@ class InterpolatedStringLiteralExpr : public LiteralExpr {
     // token, so the range should be (Start == End).
     return Loc;
   }
-  SourceLoc getTrailingQuoteLoc() const {
-    // Except when computing a SourceRange for an ASTScope. Then the range
-    // must be (Start - TrainingQuoteLoc).
-    return TrailingQuoteLoc;
-  }
 
   /// Call the \c callback with information about each segment in turn.
   void forEachSegment(ASTContext &Ctx,

branches/rxwei-patch-1/include/swift/Basic/ClusteredBitVector.h

@@ -539,48 +539,6 @@ class ClusteredBitVector {
     return !any();
   }
 
-  /// A class for scanning for set bits, from low indices to high ones.
-  class SetBitEnumerator {
-    ChunkType CurChunk;
-    const ChunkType *Chunks;
-    unsigned CurChunkIndex;
-    unsigned NumChunks;
-  public:
-    explicit SetBitEnumerator(const ClusteredBitVector &vector) {
-      if (vector.isInlineAndAllClear()) {
-        CurChunkIndex = 0;
-        NumChunks = 0;
-      } else {
-        Chunks = vector.getChunksPtr();
-        CurChunk = Chunks[0];
-        CurChunkIndex = 0;
-        NumChunks = vector.getLengthInChunks();
-      }
-    }
-
-    /// Search for another bit.  Returns false if it can't find one.
-    Optional<size_t> findNext() {
-      if (CurChunkIndex == NumChunks) return None;
-      auto cur = CurChunk;
-      while (!cur) {
-        if (++CurChunkIndex == NumChunks) return None;
-        cur = Chunks[CurChunkIndex];
-      }
-
-      // Find the index of the lowest set bit.
-      size_t bitIndex = llvm::countTrailingZeros(cur, llvm::ZB_Undefined);
-
-      // Clear that bit in the current chunk.
-      CurChunk = cur ^ (ChunkType(1) << bitIndex);
-      assert(!(CurChunk & (ChunkType(1) << bitIndex)));
-
-      return (CurChunkIndex * ChunkSizeInBits + bitIndex);
-    }
-  };
-  SetBitEnumerator enumerateSetBits() const {
-    return SetBitEnumerator(*this);
-  }
-
   friend bool operator==(const ClusteredBitVector &lhs,
                          const ClusteredBitVector &rhs) {
     if (lhs.size() != rhs.size())

branches/rxwei-patch-1/include/swift/Driver/Driver.h

@@ -87,18 +87,9 @@ class OutputInfo {
     Immediate,
   };
 
-  enum class MSVCRuntime {
-    MultiThreaded,
-    MultiThreadedDebug,
-    MultiThreadedDLL,
-    MultiThreadedDebugDLL,
-  };
-
   /// The mode in which the driver should invoke the frontend.
   Mode CompilerMode = Mode::StandardCompile;
 
-  Optional<MSVCRuntime> RuntimeVariant = llvm::None;
-
   /// The output type which should be used for compile actions.
   file_types::ID CompilerOutputType = file_types::ID::TY_INVALID;
 

branches/rxwei-patch-1/include/swift/FrontendTool/FrontendTool.h

@@ -42,19 +42,6 @@ class FrontendObserver {
 
   /// The frontend has configured the compiler instance.
   virtual void configuredCompiler(CompilerInstance &instance);
-
-  /// The frontend has performed semantic analysis.
-  virtual void performedSemanticAnalysis(CompilerInstance &instance);
-
-  /// The frontend has performed basic SIL generation.
-  /// SIL diagnostic passes have not yet been applied.
-  virtual void performedSILGeneration(SILModule &module);
-
-  /// The frontend has executed the SIL optimization and diagnostics pipelines.
-  virtual void performedSILProcessing(SILModule &module);
-
-  // TODO: maybe enhance this interface to hear about IRGen and LLVM
-  // progress.
 };
 
 namespace frontend {

branches/rxwei-patch-1/include/swift/Option/Options.td

@@ -455,8 +455,6 @@ def enable_app_extension : Flag<["-"], "application-extension">,
   Flags<[FrontendOption, NoInteractiveOption]>,
   HelpText<"Restrict code to those available for App Extensions">;
 
-def libc : Separate<["-"], "libc">, HelpText<"libc runtime library to use">;
-
 // Linker options
 
 def linker_option_Group : OptionGroup<"<linker-specific options>">;

branches/rxwei-patch-1/include/swift/SIL/SILBasicBlock.h

@@ -232,20 +232,11 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
                                                const ValueDecl *D = nullptr);
 
   /// Replace the \p{i}th BB arg with a new BBArg with SILType \p Ty and
-  /// ValueDecl \p D.
-  ///
-  /// NOTE: This assumes that the current argument in position \p i has had its
-  /// uses eliminated. To replace/replace all uses with, use
-  /// replacePhiArgumentAndRAUW.
-  SILPhiArgument *replacePhiArgument(unsigned i, SILType type,
-                                     ValueOwnershipKind kind,
-                                     const ValueDecl *decl = nullptr);
-
-  /// Replace phi argument \p i and RAUW all uses.
-  SILPhiArgument *
-  replacePhiArgumentAndReplaceAllUses(unsigned i, SILType type,
-                                      ValueOwnershipKind kind,
-                                      const ValueDecl *decl = nullptr);
+  /// ValueDecl
+  /// \p D.
+  SILPhiArgument *replacePhiArgument(unsigned i, SILType Ty,
+                                     ValueOwnershipKind Kind,
+                                     const ValueDecl *D = nullptr);
 
   /// Allocate a new argument of type \p Ty and append it to the argument
   /// list. Optionally you can pass in a value decl parameter.

branches/rxwei-patch-1/include/swift/SIL/SILBuilder.h

@@ -1938,7 +1938,11 @@ class SILBuilder {
                           SILType destTy, SILBasicBlock *successBB,
                           SILBasicBlock *failureBB,
                           ProfileCounter Target1Count = ProfileCounter(),
-                          ProfileCounter Target2Count = ProfileCounter());
+                          ProfileCounter Target2Count = ProfileCounter()) {
+    return insertTerminator(CheckedCastBranchInst::create(
+        getSILDebugLocation(Loc), isExact, op, destTy, successBB, failureBB,
+        getFunction(), C.OpenedArchetypes, Target1Count, Target2Count));
+  }
 
   CheckedCastValueBranchInst *
   createCheckedCastValueBranch(SILLocation Loc, SILValue op, SILType destTy,

branches/rxwei-patch-1/include/swift/SIL/SILInstruction.h

@@ -1841,8 +1841,6 @@ class ApplyInstBase<Impl, Base, false> : public Base {
   /// issues. It is at the bottom of the file.
   SILFunction *getCalleeFunction() const;
 
-  bool isCalleeDynamicallyReplaceable() const;
-
   /// Gets the referenced function if the callee is a function_ref instruction.
   SILFunction *getReferencedFunction() const {
     if (auto *FRI = dyn_cast<FunctionRefBaseInst>(getCallee()))
@@ -7775,27 +7773,6 @@ SILValue ApplyInstBase<Impl, Base, false>::getCalleeOrigin() const {
   }
 }
 
-template <class Impl, class Base>
-bool ApplyInstBase<Impl, Base, false>::isCalleeDynamicallyReplaceable() const {
-  SILValue Callee = getCalleeOrigin();
-
-  while (true) {
-    if (auto *FRI = dyn_cast<FunctionRefInst>(Callee))
-      return false;
-
-    if (auto *FRI = dyn_cast<DynamicFunctionRefInst>(Callee))
-      return true;
-    if (auto *FRI = dyn_cast<PreviousDynamicFunctionRefInst>(Callee))
-      return true;
-
-    if (auto *PAI = dyn_cast<PartialApplyInst>(Callee)) {
-      Callee = PAI->getCalleeOrigin();
-      continue;
-    }
-    return false;
-  }
-}
-
 template <class Impl, class Base>
 SILFunction *ApplyInstBase<Impl, Base, false>::getCalleeFunction() const {
   SILValue Callee = getCalleeOrigin();