---

yaml
---
r: 341962
b: refs/heads/rxwei-patch-1
c: 2fdae64
h: refs/heads/master

Author: hborla

[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: 71fb2629acfdc05a981aa19e3cc6f93102673a0e
+refs/heads/rxwei-patch-1: 2fdae648b786292f1c2b010165b87e8c421a12bc
 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,27 +26,24 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SR-8974][]:
+* [SR-4206][]:
 
-  Duplicate tuple element labels are no longer allowed, because it leads
-  to incorrect behavior. For example:
+  A method override is no longer allowed to have a generic signature with 
+  requirements not imposed by the base method. 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)
+  protocol P {}
+  
+  class Base {
+    func foo<T>(arg: T) {}
+  }
+  
+  class Derived: Base {
+    override func foo<T: P>(arg: T) {}
+  }
   ```
 
-  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 {}
-  ```
+  will now be diagnosed as an error.
 
 * [SR-6118][]:
 
@@ -68,6 +65,28 @@ Swift Next
 Swift 5.1
 ---------
 
+* [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 argument labels when declaring functions and
+  subscripts, as long as the internal parameter names are different. For example:
+
+  ```
+  func foo(bar x: Int, bar y: Int) {}
+  subscript(a x: Int, a y: Int) -> Int {}
+  ```
+
 * [SE-0244][]:
 
   Functions can now hide their concrete return type by declaring what protocols
@@ -7708,6 +7727,7 @@ Swift 1.0
 [SR-2608]: <https://bugs.swift.org/browse/SR-2608>
 [SR-2672]: <https://bugs.swift.org/browse/SR-2672>
 [SR-2688]: <https://bugs.swift.org/browse/SR-2688>
+[SR-4206]: <https://bugs.swift.org/browse/SR-4206>
 [SR-4248]: <https://bugs.swift.org/browse/SR-4248>
 [SR-5581]: <https://bugs.swift.org/browse/SR-5581>
 [SR-5719]: <https://bugs.swift.org/browse/SR-5719>

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

@@ -1512,10 +1512,9 @@ function(add_swift_host_library name)
 
   if(NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     swift_install_in_component(TARGETS ${name}
-                               ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
-                               LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
-                               RUNTIME DESTINATION bin
-                               COMPONENT dev)
+      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT dev
+      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT dev
+      RUNTIME DESTINATION bin COMPONENT dev)
   endif()
 
   swift_is_installing_component(dev is_installing)
@@ -2139,10 +2138,15 @@ function(add_swift_target_library name)
 
       if(sdk STREQUAL WINDOWS AND CMAKE_SYSTEM_NAME STREQUAL Windows)
         swift_install_in_component(TARGETS ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH}
-                                   RUNTIME DESTINATION "bin"
-                                   LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}/${SWIFT_PRIMARY_VARIANT_ARCH}"
-                                   ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}/${SWIFT_PRIMARY_VARIANT_ARCH}"
-                                   COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
+                                   RUNTIME
+                                     DESTINATION "bin"
+                                     COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
+                                   LIBRARY
+                                     DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}/${SWIFT_PRIMARY_VARIANT_ARCH}"
+                                     COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
+                                   ARCHIVE
+                                     DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}/${SWIFT_PRIMARY_VARIANT_ARCH}"
+                                     COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
                                    PERMISSIONS ${file_permissions})
       else()
         swift_install_in_component(FILES "${UNIVERSAL_LIBRARY_NAME}"
@@ -2423,8 +2427,9 @@ function(add_swift_host_tool executable)
     ${ASHT_UNPARSED_ARGUMENTS})
 
   swift_install_in_component(TARGETS ${executable}
-                             RUNTIME DESTINATION bin
-                             COMPONENT ${ASHT_SWIFT_COMPONENT})
+                             RUNTIME
+                               DESTINATION bin
+                               COMPONENT ${ASHT_SWIFT_COMPONENT})
 
   swift_is_installing_component(${ASHT_SWIFT_COMPONENT} is_installing)
 

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

@@ -314,6 +314,11 @@ BUILTIN_SIL_OPERATION(BeginUnpairedModifyAccess, "beginUnpairedModifyAccess",
 /// be a pointer to an UnsafeValueBuffer that records an in progress access.
 BUILTIN_SIL_OPERATION(EndUnpairedAccess, "endUnpairedAccess", Special)
 
+/// condfail(Int1) -> ()
+/// Triggers a runtime failure if the condition is true.
+/// This builtin is deprecated. Use condfail_message instead.
+BUILTIN_SIL_OPERATION(LegacyCondFail, "condfail", Special)
+
 /// fixLifetime(T) -> ()
 /// Fixes the lifetime of any heap references in a value.
 BUILTIN_SIL_OPERATION(FixLifetime, "fixLifetime", Special)
@@ -400,9 +405,9 @@ BUILTIN_RUNTIME_CALL(IsOptionalType, "isOptional", "")
           BUILTIN(Id, Name, Attrs)
 #endif
 
-/// condfail(Int1, RawPointer) -> ()
+/// condfail_message(Int1, RawPointer) -> ()
 /// Triggers a runtime failure if the condition is true.
-BUILTIN_MISC_OPERATION(CondFail, "condfail", "", Special)
+BUILTIN_MISC_OPERATION(CondFailMessage, "condfail_message", "", Special)
 
 /// Sizeof has type T.Type -> Int
 BUILTIN_MISC_OPERATION(Sizeof, "sizeof", "n", Special)

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

@@ -762,6 +762,13 @@ ERROR(extra_rbracket,PointsToFirstBadToken,
       "unexpected ']' in type; did you mean to write an array type?", ())
 ERROR(extra_colon,PointsToFirstBadToken,
       "unexpected ':' in type; did you mean to write a dictionary type?", ())
+WARNING(subscript_array_element, none,
+        "unexpected subscript in array literal; did you mean to write two "
+        "separate elements instead?", ())
+NOTE(subscript_array_element_fix_it_add_comma, none, "add a separator between "
+     "the elements", ())
+NOTE(subscript_array_element_fix_it_remove_space, none,
+     "remove the space between the elements to silence this warning", ())
 
 // Tuple Types
 ERROR(expected_rparen_tuple_type_list,none,

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

@@ -461,6 +461,10 @@ class alignas(1 << TypeAlignInBits) TypeBase {
   /// types, optionals, etc.
   TypeBase *reconstituteSugar(bool Recursive);
 
+  // If this type is a syntax sugar type, desugar it. Also desugar any nested
+  // syntax sugar types.
+  TypeBase *getWithoutSyntaxSugar();
+
   /// getASTContext - Return the ASTContext that this type belongs to.
   ASTContext &getASTContext() {
     // If this type is canonical, it has the ASTContext in it.

branches/rxwei-patch-1/include/swift/ClangImporter/ClangImporterOptions.h

@@ -100,6 +100,10 @@ class ClangImporterOptions {
   /// When set, don't enforce warnings with -Werror.
   bool DebuggerSupport = false;
 
+  /// When set, clobber the Clang instance's virtual file system with the Swift
+  /// virtual file system.
+  bool ForceUseSwiftVirtualFileSystem = false;
+
   /// Return a hash code of any components from these options that should
   /// contribute to a Swift Bridging PCH hash.
   llvm::hash_code getPCHHashComponents() const {

branches/rxwei-patch-1/include/swift/IDE/IDERequestIDZone.def

@@ -15,3 +15,4 @@
 //
 //===----------------------------------------------------------------------===//
 SWIFT_TYPEID(CursorInfoRequest)
+SWIFT_TYPEID(RangeInfoRequest)

branches/rxwei-patch-1/include/swift/IDE/IDERequests.h

@@ -23,6 +23,9 @@
 #include "swift/IDE/IDETypeIDs.h"
 
 namespace swift {
+//----------------------------------------------------------------------------//
+// Cusor info
+//----------------------------------------------------------------------------//
 
 // Input for CursorInfoRequest.
 // Putting the source file and location together allows us to print the request
@@ -76,6 +79,67 @@ class CursorInfoRequest:
   SourceLoc getNearestLoc() const;
 };
 
+//----------------------------------------------------------------------------//
+// Range info
+//----------------------------------------------------------------------------//
+
+// Input for RangeInfoRequest.
+// Putting the source file and location together allows us to print the request
+// input well e.g. file.swift:3:4
+struct RangeInfoOwner {
+  SourceFile *File;
+  SourceLoc StartLoc;
+  SourceLoc EndLoc;
+
+  RangeInfoOwner(SourceFile *File, SourceLoc StartLoc, SourceLoc EndLoc):
+    File(File), StartLoc(StartLoc), EndLoc(EndLoc) {}
+  RangeInfoOwner(SourceFile *File, unsigned Offset, unsigned Length);
+
+  friend llvm::hash_code hash_value(const RangeInfoOwner &CI) {
+    return hash_combine(hash_value(CI.File),
+                        hash_value(CI.StartLoc.getOpaquePointerValue()),
+                        hash_value(CI.EndLoc.getOpaquePointerValue()));
+  }
+
+  friend bool operator==(const RangeInfoOwner &lhs, const RangeInfoOwner &rhs) {
+    return lhs.File == rhs.File && lhs.StartLoc == rhs.StartLoc &&
+      lhs.EndLoc == rhs.EndLoc;
+  }
+
+  friend bool operator!=(const RangeInfoOwner &lhs, const RangeInfoOwner &rhs) {
+    return !(lhs == rhs);
+  }
+
+  bool isValid() const {
+    return File && File->getBufferID() && StartLoc.isValid() && EndLoc.isValid();
+  }
+};
+
+void simple_display(llvm::raw_ostream &out, const RangeInfoOwner &owner);
+
+/// Resolve cursor info at a given location.
+class RangeInfoRequest:
+    public SimpleRequest<RangeInfoRequest,
+                         ide::ResolvedRangeInfo(RangeInfoOwner),
+                         CacheKind::Cached>
+{
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<ide::ResolvedRangeInfo> evaluate(Evaluator &evaluator,
+    RangeInfoOwner CI) const;
+
+public:
+  // Caching
+  bool isCached() const { return true; }
+  // Source location
+  SourceLoc getNearestLoc() const;
+};
+
 /// The zone number for the IDE.
 #define SWIFT_IDE_REQUESTS_TYPEID_ZONE 137
 #define SWIFT_TYPEID_ZONE SWIFT_IDE_REQUESTS_TYPEID_ZONE

branches/rxwei-patch-1/include/swift/IDE/IDETypeIDZone.def

@@ -15,3 +15,4 @@
 //
 //===----------------------------------------------------------------------===//
 SWIFT_TYPEID_NAMED(ide::ResolvedCursorInfo, ResolvedCursorInfo)
+SWIFT_TYPEID_NAMED(ide::ResolvedRangeInfo, ResolvedRangeInfo)

branches/rxwei-patch-1/include/swift/IDE/Utils.h

@@ -368,32 +368,26 @@ struct ResolvedRangeInfo {
                     TokensInRange, nullptr, /*Commom Expr Parent*/nullptr,
                     /*Single entry*/true, /*unhandled error*/false,
                     OrphanKind::None, {}, {}, {}) {}
-  void print(llvm::raw_ostream &OS);
+  ResolvedRangeInfo(): ResolvedRangeInfo(ArrayRef<Token>()) {}
+  void print(llvm::raw_ostream &OS) const;
   ExitState exit() const { return ExitInfo.Exit; }
   Type getType() const { return ExitInfo.ReturnType; }
 
+  friend bool operator==(const ResolvedRangeInfo &lhs,
+                         const ResolvedRangeInfo &rhs) {
+    if (lhs.TokensInRange.size() != rhs.TokensInRange.size())
+      return false;
+    if (lhs.TokensInRange.empty())
+      return true;
+    return lhs.TokensInRange.front().getLoc() ==
+      rhs.TokensInRange.front().getLoc();
+  }
+
 private:
   static CharSourceRange calculateContentRange(ArrayRef<Token> Tokens);
 };
 
-class RangeResolver : public SourceEntityWalker {
-  struct Implementation;
-  std::unique_ptr<Implementation> Impl;
-  bool walkToExprPre(Expr *E) override;
-  bool walkToExprPost(Expr *E) override;
-  bool walkToStmtPre(Stmt *S) override;
-  bool walkToStmtPost(Stmt *S) override;
-  bool walkToDeclPre(Decl *D, CharSourceRange Range) override;
-  bool walkToDeclPost(Decl *D) override;
-  bool visitDeclReference(ValueDecl *D, CharSourceRange Range,
-                          TypeDecl *CtorTyRef, ExtensionDecl *ExtTyRef, Type T,
-                          ReferenceMetaData Data) override;
-public:
-  RangeResolver(SourceFile &File, SourceLoc Start, SourceLoc End);
-  RangeResolver(SourceFile &File, unsigned Offset, unsigned Length);
-  ~RangeResolver();
-  ResolvedRangeInfo resolve();
-};
+void simple_display(llvm::raw_ostream &out, const ResolvedRangeInfo &info);
 
 /// This provides a utility to view a printed name by parsing the components
 /// of that name. The components include a base name and an array of argument

branches/rxwei-patch-1/include/swift/Parse/Parser.h

@@ -1435,6 +1435,8 @@ class Parser {
 
   UnresolvedDeclRefExpr *parseExprOperator();
 
+  void validateCollectionElement(ParserResult<Expr> element);
+
   //===--------------------------------------------------------------------===//
   // Statement Parsing
 

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

@@ -54,7 +54,8 @@ struct BuiltinNameStringLiteral {
   const StringLiteral literal;
 
   constexpr operator StringRef() const { return literal; }
-  constexpr const StringRef getWithoutPrefix() const {
+
+  StringRef getWithoutPrefix() const {
     return literal.drop_front(BUILTIN_TYPE_NAME_PREFIX.size());
   }
 };

branches/rxwei-patch-1/lib/AST/Builtins.cpp

@@ -1035,6 +1035,13 @@ static ValueDecl *getCanBeObjCClassOperation(ASTContext &Context,
   return builder.build(Id);
 }
 
+static ValueDecl *getLegacyCondFailOperation(ASTContext &C, Identifier Id) {
+  // Int1 -> ()
+  auto CondTy = BuiltinIntegerType::get(1, C);
+  auto VoidTy = TupleType::getEmpty(C);
+  return getBuiltinFunction(Id, {CondTy}, VoidTy);
+}
+
 static ValueDecl *getCondFailOperation(ASTContext &C, Identifier Id) {
   // Int1 -> ()
   auto CondTy = BuiltinIntegerType::get(1, C);
@@ -1890,11 +1897,14 @@ ValueDecl *swift::getBuiltinValueDecl(ASTContext &Context, Identifier Id) {
     if (!Types.empty()) return nullptr;
     return getAddressOfOperation(Context, Id);
 
+  case BuiltinValueKind::LegacyCondFail:
+    return getLegacyCondFailOperation(Context, Id);
+
   case BuiltinValueKind::AddressOfBorrow:
     if (!Types.empty()) return nullptr;
     return getAddressOfBorrowOperation(Context, Id);
 
-  case BuiltinValueKind::CondFail:
+  case BuiltinValueKind::CondFailMessage:
     return getCondFailOperation(Context, Id);
 
   case BuiltinValueKind::AssertConf:

branches/rxwei-patch-1/lib/AST/DiagnosticEngine.cpp

@@ -468,6 +468,13 @@ static void formatDiagnosticArgument(StringRef Modifier,
 
     // Strip extraneous parentheses; they add no value.
     auto type = Arg.getAsType()->getWithoutParens();
+
+    // If a type has an unresolved type, print it with syntax sugar removed for
+    // clarity. For example, print `Array<_>` instead of `[_]`.
+    if (type->hasUnresolvedType()) {
+      type = type->getWithoutSyntaxSugar();
+    }
+
     bool isAmbiguous = typeSpellingIsAmbiguous(type, Args);
 
     if (isAmbiguous && isa<OpaqueTypeArchetypeType>(type.getPointer())) {