---

yaml
---
r: 340791
b: refs/heads/rxwei-patch-1
c: 7696a76
h: refs/heads/master
i:
  340789: b919e96
  340787: 4a21a46
  340783: a62d797

Author: mikeash

[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: a1b281135ac510ef87304aa6041aa42ea8086570
+refs/heads/rxwei-patch-1: 7696a76577c685e7cc806efdcf685fd7637f4b2f
 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/cmake/modules/AddSwift.cmake

@@ -462,10 +462,10 @@ function(_add_variant_link_flags)
     list(APPEND link_libraries "bsd" "atomic")
     list(APPEND result "-Wl,-Bsymbolic")
   elseif("${LFLAGS_SDK}" STREQUAL "ANDROID")
-    list(APPEND link_libraries "dl" "log" "atomic")
-    # We need to add the math library, which is linked implicitly by libc++
-    list(APPEND result "-lm")
-
+    list(APPEND link_libraries "dl" "log" "atomic" "icudataswift" "icui18nswift" "icuucswift")
+    # We provide our own C++ below, so we ask the linker not to do it. However,
+    # we need to add the math library, which is linked implicitly by libc++.
+    list(APPEND result "-nostdlib++" "-lm")
     if("${LFLAGS_ARCH}" MATCHES armv7)
       set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a")
     elseif("${LFLAGS_ARCH}" MATCHES aarch64)
@@ -477,17 +477,8 @@ function(_add_variant_link_flags)
     else()
       message(SEND_ERROR "unknown architecture (${LFLAGS_ARCH}) for android")
     endif()
-
-    # link against the custom C++ library
-    list(APPEND link_libraries
-      ${android_libcxx_path}/libc++abi.a
-      ${android_libcxx_path}/libc++_shared.so)
-
-    # link against the ICU libraries
-    list(APPEND link_libraries
-      ${SWIFT_ANDROID_${LFLAGS_ARCH}_ICU_I18N}
-      ${SWIFT_ANDROID_${LFLAGS_ARCH}_ICU_UC})
-
+    list(APPEND link_libraries "${android_libcxx_path}/libc++abi.a")
+    list(APPEND link_libraries "${android_libcxx_path}/libc++_shared.so")
     swift_android_lib_for_arch(${LFLAGS_ARCH} ${LFLAGS_ARCH}_LIB)
     foreach(path IN LISTS ${LFLAGS_ARCH}_LIB)
       list(APPEND library_search_directories ${path})
@@ -1380,16 +1371,8 @@ function(_add_swift_library_single target name)
         ${SWIFTLIB_SINGLE_PRIVATE_LINK_LIBRARIES})
   endif()
 
-  # NOTE(compnerd) use the C linker language to invoke `clang` rather than
-  # `clang++` as we explicitly link against the C++ runtime.  We were previously
-  # actually passing `-nostdlib++` to avoid the C++ runtime linkage.
-  if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID")
-    set_property(TARGET "${target}" PROPERTY
-      LINKER_LANGUAGE "C")
-  else()
-    set_property(TARGET "${target}" PROPERTY
+  set_property(TARGET "${target}" PROPERTY
       LINKER_LANGUAGE "CXX")
-  endif()
 
   if(target_static)
     set_property(TARGET "${target_static}" APPEND_STRING PROPERTY

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

@@ -269,7 +269,6 @@ function(_compile_swift_files
   # into the new runtime.
   if (SWIFTFILE_IS_STDLIB OR SWIFTFILE_IS_SDK_OVERLAY)
     list(APPEND swift_flags "-runtime-compatibility-version" "none")
-    list(APPEND swift_flags "-disable-autolinking-runtime-compatibility-dynamic-replacements")
   endif()
 
   if (SWIFTFILE_IS_STDLIB_CORE OR SWIFTFILE_IS_SDK_OVERLAY)

branches/rxwei-patch-1/docs/WindowsBuild.md

@@ -355,8 +355,8 @@ cmake -G Ninja^
   -DFOUNDATION_BUILD_DIR=S:\b\foundation^
   -DLIBDISPATCH_BUILD_DIR=S:\b\libdispatch^
   -DLIBDISPATCH_SOURCE_DIR=S:\swift-corelibs-libdispatch^
-  -DSQLite3_INCLUDE_DIR=S:\sqlite-amalgamation-3270200^
-  -DSQLite3_LIBRARY=S:\b\sqlite\sqlite3.lib^
+  -DLLBUILD_PATH_TO_SQLITE_SOURCE=S:\sqlite-amalgamation-3270200^
+  -DLLBUILD_PATH_TO_SQLITE_BUILD=S:\b\sqlite^
   -DLLBUILD_SUPPORT_BINDINGS=Swift^
   S:\llbuild
 ninja

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

@@ -590,10 +590,6 @@ class ASTContext final {
   /// Get the runtime availability of the opaque types language feature for the target platform.
   AvailabilityContext getOpaqueTypeAvailability();
 
-  /// Get the runtime availability of features introduced in the Swift 5.1
-  /// compiler for the target platform.
-  AvailabilityContext getSwift51Availability();
-
   //===--------------------------------------------------------------------===//
   // Diagnostics Helper functions
   //===--------------------------------------------------------------------===//

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

@@ -605,7 +605,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     HasAnyUnavailableValues : 1
   );
 
-  SWIFT_INLINE_BITFIELD(ModuleDecl, TypeDecl, 1+1+1+1+1+1+1+1,
+  SWIFT_INLINE_BITFIELD(ModuleDecl, TypeDecl, 1+1+1+1+1+1+1,
     /// If the module was or is being compiled with `-enable-testing`.
     TestingEnabled : 1,
 
@@ -620,18 +620,14 @@ class alignas(1 << DeclAlignInBits) Decl {
     /// Whether all imports have been resolved. Used to detect circular imports.
     HasResolvedImports : 1,
 
-    /// If the module was or is being compiled with `-enable-private-imports`.
+    // If the module was or is being compiled with `-enable-private-imports`.
     PrivateImportsEnabled : 1,
 
-    /// If the module is compiled with `-enable-implicit-dynamic`.
+    // If the module is compiled with `-enable-implicit-dynamic`.
     ImplicitDynamicEnabled : 1,
 
-    /// Whether the module is a system module.
-    IsSystemModule : 1,
-
-    /// Whether the module was imported from Clang (or, someday, maybe another
-    /// language).
-    IsNonSwiftModule : 1
+    // Whether the module is a system module.
+    IsSystemModule : 1
   );
 
   SWIFT_INLINE_BITFIELD(PrecedenceGroupDecl, Decl, 1+2,
@@ -2700,11 +2696,7 @@ class ValueDecl : public Decl {
   /// True if this is a C function that was imported as a member of a type in
   /// Swift.
   bool isImportAsMember() const;
-
-  /// Returns true if the declaration's interface type is a function type with a
-  /// curried self parameter.
-  bool hasCurriedSelf() const;
-
+  
   /// Get the decl for this value's opaque result type, if it has one.
   OpaqueTypeDecl *getOpaqueResultTypeDecl() const;
 
@@ -7193,14 +7185,6 @@ inline bool ValueDecl::isImportAsMember() const {
   return false;
 }
 
-inline bool ValueDecl::hasCurriedSelf() const {
-  if (auto *afd = dyn_cast<AbstractFunctionDecl>(this))
-    return afd->hasImplicitSelfDecl();
-  if (isa<EnumElementDecl>(this))
-    return true;
-  return false;
-}
-
 inline bool Decl::isPotentiallyOverridable() const {
   if (isa<VarDecl>(this) ||
       isa<SubscriptDecl>(this) ||

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

@@ -101,6 +101,9 @@ NOTE(note_typo_candidate,none,
 NOTE(profile_read_error,none,
      "failed to load profile data '%0': '%1'", (StringRef, StringRef))
 
+ERROR(generic_signature_not_minimal,none,
+      "generic requirement '%0' is redundant in %1", (StringRef, StringRef))
+
 WARNING(protocol_extension_redundant_requirement,none,
       "requirement of '%1' to '%2' is redundant in an extension of '%0'",
       (StringRef, StringRef, StringRef))
@@ -111,15 +114,6 @@ ERROR(attr_only_on_parameters, none,
 ERROR(function_type_no_parens,none,
       "single argument function types require parentheses", ())
 
-// Used by -verify-generic-signatures
-ERROR(generic_signature_not_minimal,none,
-      "generic requirement '%0' is redundant in %1", (StringRef, StringRef))
-ERROR(generic_signature_not_valid,none,
-      "generic signature %0 is invalid", (StringRef))
-ERROR(generic_signature_not_equal,none,
-      "generic signature %0 is not equal to new signature %1",
-      (StringRef, StringRef))
-
 // FIXME: Used by swift-api-digester. Don't want to set up a separate diagnostics
 // file just for a few errors.
 ERROR(sdk_node_unrecognized_key,none,

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

@@ -792,11 +792,6 @@ ERROR(module_not_compiled_for_private_import,none,
 ERROR(import_implementation_cannot_be_exported,none,
       "module %0 cannot be both exported and implementation-only", (Identifier))
 
-WARNING(module_not_compiled_with_library_evolution,none,
-        "module %0 was not compiled with library evolution support; "
-        "using it means binary compatibility for %1 can't be guaranteed",
-        (Identifier, Identifier))
-
 
 // Operator decls
 ERROR(ambiguous_operator_decls,none,
@@ -4157,9 +4152,6 @@ ERROR(availability_protocol_requires_version,
 NOTE(availability_protocol_requirement_here, none,
      "protocol requirement here", ())
 
-WARNING(public_decl_needs_availability, none,
-     "public declarations should have an availability attribute with -require-explicit-availability", ())
-
 // This doesn't display as an availability diagnostic, but it's
 // implemented there and fires when these subscripts are marked
 // unavailable, so it seems appropriate to put it here.

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

@@ -2126,6 +2126,8 @@ class CollectionExpr : public Expr {
   SourceLoc RBracketLoc;
   ConcreteDeclRef Initializer;
 
+  Expr *SemanticExpr = nullptr;
+
   /// Retrieve the intrusive pointer storage from the subtype
   Expr *const *getTrailingObjectsPointer() const;
   Expr **getTrailingObjectsPointer() {
@@ -2190,6 +2192,9 @@ class CollectionExpr : public Expr {
   SourceRange getSourceRange() const {
     return SourceRange(LBracketLoc, RBracketLoc);
   }
+  
+  Expr *getSemanticExpr() const { return SemanticExpr; }
+  void setSemanticExpr(Expr *e) { SemanticExpr = e; }
 
   static bool classof(const Expr *e) {
     return e->getKind() >= ExprKind::First_CollectionExpr &&
@@ -2267,8 +2272,6 @@ class DictionaryExpr final : public CollectionExpr,
   static bool classof(const Expr *e) {
     return e->getKind() == ExprKind::Dictionary;
   }
-
-  Type getElementType();
 };
 
 /// Subscripting expressions like a[i] that refer to an element within a

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

@@ -228,7 +228,6 @@ class IRGenOptions {
 
   /// Pull in runtime compatibility shim libraries by autolinking.
   Optional<llvm::VersionTuple> AutolinkRuntimeCompatibilityLibraryVersion;
-  Optional<llvm::VersionTuple> AutolinkRuntimeCompatibilityDynamicReplacementLibraryVersion;
 
   IRGenOptions()
       : DWARFVersion(2), OutputKind(IRGenOutputKind::LLVMAssembly),

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

@@ -337,18 +337,6 @@ class ModuleDecl : public DeclContext, public TypeDecl {
     Bits.ModuleDecl.IsSystemModule = flag;
   }
 
-  /// Returns true if this module is a non-Swift module that was imported into
-  /// Swift.
-  ///
-  /// Right now that's just Clang modules.
-  bool isNonSwiftModule() const {
-    return Bits.ModuleDecl.IsNonSwiftModule;
-  }
-  /// \see #isNonSwiftModule
-  void setIsNonSwiftModule(bool flag = true) {
-    Bits.ModuleDecl.IsNonSwiftModule = flag;
-  }
-
   bool isResilient() const {
     return getResilienceStrategy() != ResilienceStrategy::Default;
   }

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

@@ -494,7 +494,7 @@ struct PrintOptions {
   /// consistent and well-formed.
   ///
   /// \see swift::emitParseableInterface
-  static PrintOptions printParseableInterfaceFile(bool preferTypeRepr);
+  static PrintOptions printParseableInterfaceFile();
 
   static PrintOptions printModuleInterface();
   static PrintOptions printTypeInterface(Type T);

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

@@ -96,13 +96,6 @@ namespace swift {
     /// Enable 'availability' restrictions for App Extensions.
     bool EnableAppExtensionRestrictions = false;
 
-    /// Require public declarations to declare an introduction OS version.
-    bool RequireExplicitAvailability = false;
-
-    /// Introduction platform and version to suggest as fix-it
-    /// when using RequireExplicitAvailability.
-    std::string RequireExplicitAvailabilityTarget;
-
     ///
     /// Support for alternate usage modes
     ///

branches/rxwei-patch-1/include/swift/Frontend/ParseableInterfaceSupport.h

@@ -27,10 +27,6 @@ class ModuleDecl;
 
 /// Options for controlling the generation of the .swiftinterface output.
 struct ParseableInterfaceOptions {
-  /// Should we prefer printing TypeReprs when writing out types in a module
-  /// interface, or should we fully-qualify them?
-  bool PreserveTypesAsWritten = false;
-
   /// Copy of all the command-line flags passed at .swiftinterface
   /// generation time, re-applied to CompilerInvocation when reading
   /// back .swiftinterface and reconstructing .swiftmodule.

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

@@ -535,11 +535,6 @@ def build_module_from_parseable_interface :
   Alias<compile_module_from_interface>,
   ModeOpt;
 
-def module_interface_preserve_types_as_written :
-  Flag<["-"], "module-interface-preserve-types-as-written">,
-  HelpText<"When emitting a module interface, preserve types as they were "
-           "written in the source">;
-
 def prebuilt_module_cache_path :
   Separate<["-"], "prebuilt-module-cache-path">,
   HelpText<"Directory of prebuilt modules for loading module interfaces">;

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

@@ -312,14 +312,6 @@ def enable_library_evolution : Flag<["-"], "enable-library-evolution">,
   Flags<[FrontendOption, ModuleInterfaceOption]>,
   HelpText<"Build the module to allow binary-compatible library evolution">;
 
-def require_explicit_availability : Flag<["-"], "require-explicit-availability">,
-  Flags<[FrontendOption, NoInteractiveOption]>,
-  HelpText<"Require explicit availability on public declarations">;
-def require_explicit_availability_target : Separate<["-"], "require-explicit-availability-target">,
-  Flags<[FrontendOption, NoInteractiveOption]>,
-  HelpText<"Suggest fix-its adding @available(<target>, *) to public declarations without availability">,
-  MetaVarName<"<target>">;
-
 def module_name : Separate<["-"], "module-name">,
   Flags<[FrontendOption, ModuleInterfaceOption]>,
   HelpText<"Name of the module to build">;
@@ -912,10 +904,4 @@ def disable_autolinking_runtime_compatibility : Flag<["-"], "disable-autolinking
   Flags<[FrontendOption]>,
   HelpText<"Do not use autolinking for runtime compatibility libraries">;
 
-def disable_autolinking_runtime_compatibility_dynamic_replacements
-    : Flag<[ "-" ], "disable-autolinking-runtime-compatibility-dynamic-replacements">,
-      Flags<[ FrontendOption ]>,
-      HelpText<"Do not use autolinking for the dynamic replacement runtime "
-               "compatibility library">;
-
 include "FrontendOptions.td"

branches/rxwei-patch-1/include/swift/Runtime/Exclusivity.h

@@ -44,19 +44,13 @@ void swift_beginAccess(void *pointer, ValueBuffer *buffer,
 /// replacement function if it should be called.
 /// Returns null if the original function (which is passed in \p CurrFn) should
 /// be called.
-#ifdef __APPLE__
-__attribute__((weak_import))
-#endif
 SWIFT_RUNTIME_EXPORT
 char *swift_getFunctionReplacement(char **ReplFnPtr, char *CurrFn);
 
 /// Returns the original function of a replaced function, which is loaded from
 /// \p OrigFnPtr.
 /// This function is called from a replacement function to call the original
 /// function.
-#ifdef __APPLE__
-__attribute__((weak_import))
-#endif
 SWIFT_RUNTIME_EXPORT
 char *swift_getOrigOfReplaceable(char **OrigFnPtr);
 

branches/rxwei-patch-1/include/swift/Runtime/RuntimeFnWrappersGen.h

@@ -22,13 +22,6 @@
 namespace swift {
 
 class AvailabilityContext;
-class ASTContext;
-
-enum class RuntimeAvailability {
-  AlwaysAvailable,
-  AvailableByCompatibilityLibrary,
-  ConditionallyAvailable
-};
 
 /// Generate an llvm declaration for a runtime entry with a
 /// given name, return types, argument types, attributes and
@@ -37,8 +30,7 @@ llvm::Constant *getRuntimeFn(llvm::Module &Module,
                       llvm::Constant *&cache,
                       char const *name,
                       llvm::CallingConv::ID cc,
-                      RuntimeAvailability availability,
-                      ASTContext *context,
+                      bool isWeakLinked,
                       llvm::ArrayRef<llvm::Type*> retTypes,
                       llvm::ArrayRef<llvm::Type*> argTypes,
                       llvm::ArrayRef<llvm::Attribute::AttrKind> attrs);