---

yaml
---
r: 341497
b: refs/heads/rxwei-patch-1
c: 9f26fc7
h: refs/heads/master
i:
  341495: 11192cf

Author: gottesmm

[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: cb8f249e7555b13c3ff28ed802866df391bc24bc
+refs/heads/rxwei-patch-1: 9f26fc7fe72a2d1ba53b06e97f46830f808e4be3
 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/CMakeLists.txt

@@ -915,11 +915,14 @@ else()
   find_package(LibXml2)
 endif()
 
-if(LLVM_ENABLE_LIBEDIT)
-  find_package(LibEdit REQUIRED)
-else()
-  find_package(LibEdit)
+# You need libedit linked in order to check if you have el_wgets.
+cmake_push_check_state()
+list(APPEND CMAKE_REQUIRED_LIBRARIES "edit")
+check_symbol_exists(el_wgets "histedit.h" HAVE_EL_WGETS)
+if(HAVE_EL_WGETS)
+  set(HAVE_UNICODE_LIBEDIT 1)
 endif()
+cmake_pop_check_state()
 
 check_symbol_exists(wait4 "sys/wait.h" HAVE_WAIT4)
 

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

@@ -70,6 +70,7 @@ namespace swift {
   class GenericSignature;
   class GenericTypeParamDecl;
   class GenericTypeParamType;
+  class LazyResolver;
   class ModuleDecl;
   class EnumCaseDecl;
   class EnumElementDecl;
@@ -3955,7 +3956,10 @@ class ClassDecl final : public NominalTypeDecl {
 
   /// Determine whether this class inherits the convenience initializers
   /// from its superclass.
-  bool inheritsSuperclassInitializers();
+  ///
+  /// \param resolver Used to resolve the signatures of initializers, which is
+  /// required for name lookup.
+  bool inheritsSuperclassInitializers(LazyResolver *resolver);
 
   /// Marks that this class inherits convenience initializers from its
   /// superclass.
@@ -4139,7 +4143,7 @@ class ProtocolDecl final : public NominalTypeDecl {
 
   bool existentialConformsToSelfSlow();
 
-  bool existentialTypeSupportedSlow();
+  bool existentialTypeSupportedSlow(LazyResolver *resolver);
 
   ArrayRef<ProtocolDecl *> getInheritedProtocolsSlow();
 
@@ -4265,12 +4269,12 @@ class ProtocolDecl final : public NominalTypeDecl {
   /// conforming to this protocol. This is only permitted if the types of
   /// all the members do not contain any associated types, and do not
   /// contain 'Self' in 'parameter' or 'other' position.
-  bool existentialTypeSupported() const {
+  bool existentialTypeSupported(LazyResolver *resolver) const {
     if (Bits.ProtocolDecl.ExistentialTypeSupportedValid)
       return Bits.ProtocolDecl.ExistentialTypeSupported;
 
     return const_cast<ProtocolDecl *>(this)
-             ->existentialTypeSupportedSlow();
+             ->existentialTypeSupportedSlow(resolver);
   }
 
   /// Explicitly set the existentialTypeSupported flag, without computing

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

@@ -91,10 +91,6 @@ WARNING(implicit_bridging_header_imported_from_module,none,
         "is deprecated and will be removed in a later version of Swift",
         (StringRef, Identifier))
 
-WARNING(clang_vfs_overlay_is_ignored,none,
-        "ignoring '-ivfsoverlay' options provided to '-Xcc' in favor of "
-        "'-vfsoverlay'", ())
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG