---

yaml
---
r: 340951
b: refs/heads/rxwei-patch-1
c: 35c31e7
h: refs/heads/master
i:
  340949: 105f158
  340947: 916b730
  340943: 97af6d8

Author: dan-zheng

[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: 5c4bedede0892e4e5846c3cf09270a321bd3ed94
+refs/heads/rxwei-patch-1: 35c31e71790af25143edbecdaecc9da2620de1b2
 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

@@ -638,9 +638,9 @@ endif()
 if(SWIFT_HOST_VARIANT_ARCH)
   set(SWIFT_HOST_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
 else()
-  if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
+  if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
     set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
     set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64")
     set(SWIFT_HOST_VARIANT_ARCH_default "powerpc64")
@@ -653,6 +653,8 @@ else()
     set(SWIFT_HOST_VARIANT_ARCH_default "armv6")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "armv7l|armv7-a")
     set(SWIFT_HOST_VARIANT_ARCH_default "armv7")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
+    set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "IA64")
     set(SWIFT_HOST_VARIANT_ARCH_default "itanium")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86|i686)")
@@ -1104,7 +1106,6 @@ else()
   # ensure we build that when building tools.
   if(SWIFT_INCLUDE_TOOLS)
     add_subdirectory(stdlib/public/Reflection)
-    add_subdirectory(stdlib/public/SwiftShims)
   endif()
 endif()
 

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

@@ -1107,10 +1107,6 @@ function(_add_swift_library_single target name)
     set_target_properties("${target}"
       PROPERTIES
       INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin")
-  elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID")
-    # CMake generates incorrect rule `$SONAME_FLAG $INSTALLNAME_DIR$SONAME` for Android build on macOS cross-compile host.
-    # Proper linker flags constructed manually. See below variable `swiftlib_link_flags_all`.
-    set_target_properties("${target}" PROPERTIES NO_SONAME TRUE)
   endif()
 
   # SWIFT_ENABLE_TENSORFLOW
@@ -1420,7 +1416,7 @@ function(_add_swift_library_single target name)
   # 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")
+  if(SWIFTLIB_SINGLE_SDK STREQUAL ANDROID)
     set_property(TARGET "${target}" PROPERTY
       LINKER_LANGUAGE "C")
   else()
@@ -1919,16 +1915,6 @@ function(add_swift_target_library name)
        NOT ${name} STREQUAL swiftRemoteMirror)
       list(APPEND swiftlib_link_flags_all "-Wl,-z,defs")
     endif()
-    # Setting back linker flags which are not supported when making Android build on macOS cross-compile host.
-    if(SWIFTLIB_SHARED)
-      if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)
-        list(APPEND swiftlib_link_flags_all "-dynamiclib -Wl,-headerpad_max_install_names")
-      elseif(sdk STREQUAL ANDROID)
-        list(APPEND swiftlib_link_flags_all "-shared")
-        # TODO: Instead of `lib${name}.so` find variable or target property which already have this value.
-        list(APPEND swiftlib_link_flags_all "-Wl,-soname,lib${name}.so")
-      endif()
-    endif()
 
     set(sdk_supported_archs
       ${SWIFT_SDK_${sdk}_ARCHITECTURES}
@@ -2405,17 +2391,6 @@ function(_add_swift_executable_single name)
   target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES})
   swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_LINK_COMPONENTS})
 
-  # 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(SWIFTEXE_SINGLE_SDK STREQUAL ANDROID)
-    set_property(TARGET "${name}" PROPERTY
-      LINKER_LANGUAGE "C")
-  else()
-    set_property(TARGET "${name}" PROPERTY
-      LINKER_LANGUAGE "CXX")
-  endif()
-
   set_target_properties(${name} PROPERTIES FOLDER "Swift executables")
 
   # SWIFT_ENABLE_TENSORFLOW

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

@@ -63,36 +63,32 @@ macro(swift_common_standalone_build_config_llvm product)
   endif()
 
   if(SWIFT_INCLUDE_TOOLS)
-    if(LLVM_TABLEGEN)
-      set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN})
-    else()
-      if(CMAKE_CROSSCOMPILING)
-        set(LLVM_NATIVE_BUILD_DIR "${LLVM_BINARY_DIR}/NATIVE")
-        if(NOT EXISTS "${LLVM_NATIVE_BUILD_DIR}")
-          message(FATAL_ERROR
-            "Attempting to cross-compile swift standalone but no native LLVM build
-            found.  Please cross-compile LLVM as well.")
-        endif()
-
-        if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-          set(HOST_EXECUTABLE_SUFFIX ".exe")
-        endif()
-
-        if(NOT CMAKE_CONFIGURATION_TYPES)
-          set(LLVM_TABLEGEN_EXE
-            "${LLVM_NATIVE_BUILD_DIR}/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
-        else()
-          # NOTE: LLVM NATIVE build is always built Release, as is specified in
-          # CrossCompile.cmake
-          set(LLVM_TABLEGEN_EXE
-            "${LLVM_NATIVE_BUILD_DIR}/Release/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
-        endif()
+    if(CMAKE_CROSSCOMPILING)
+      set(LLVM_NATIVE_BUILD_DIR "${LLVM_BINARY_DIR}/NATIVE")
+      if(NOT EXISTS "${LLVM_NATIVE_BUILD_DIR}")
+        message(FATAL_ERROR
+          "Attempting to cross-compile swift standalone but no native LLVM build
+          found.  Please cross-compile LLVM as well.")
+      endif()
+
+      if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+        set(HOST_EXECUTABLE_SUFFIX ".exe")
+      endif()
+
+      if(NOT CMAKE_CONFIGURATION_TYPES)
+        set(LLVM_TABLEGEN_EXE
+          "${LLVM_NATIVE_BUILD_DIR}/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
       else()
-        find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" HINTS ${LLVM_TOOLS_BINARY_DIR}
-          NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-        if(LLVM_TABLEGEN_EXE STREQUAL "LLVM_TABLEGEN_EXE-NOTFOUND")
-          message(FATAL_ERROR "Failed to find tablegen in ${LLVM_TOOLS_BINARY_DIR}")
-        endif()
+        # NOTE: LLVM NATIVE build is always built Release, as is specified in
+        # CrossCompile.cmake
+        set(LLVM_TABLEGEN_EXE
+          "${LLVM_NATIVE_BUILD_DIR}/Release/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
+      endif()
+    else()
+      find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" HINTS ${LLVM_TOOLS_BINARY_DIR}
+        NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+      if(LLVM_TABLEGEN_EXE STREQUAL "LLVM_TABLEGEN_EXE-NOTFOUND")
+        message(FATAL_ERROR "Failed to find tablegen in ${LLVM_TOOLS_BINARY_DIR}")
       endif()
     endif()
   endif()
@@ -114,9 +110,6 @@ macro(swift_common_standalone_build_config_llvm product)
   # add_swift_host_library and add_swift_target_library within AddSwift.cmake.
   string(REGEX REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
   string(REGEX REPLACE "-Wl,-z,nodelete" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
-  # Android build on macOS cross-compile host don't support `-Wl,-headerpad_max_install_names` and `-dynamiclib` as a linker flags.
-  string(REGEX REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}")
-  string(REGEX REPLACE "-dynamiclib" "" CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}")
 
   set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
   string(REGEX REPLACE "([0-9]+)\\.[0-9]+(\\.[0-9]+)?" "\\1" PACKAGE_VERSION_MAJOR

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

@@ -278,7 +278,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/include/swift/ABI/Class.h

@@ -65,4 +65,4 @@ inline ObjCClassFlags operator|(ObjCClassFlags lhs, ObjCClassFlags rhs) {
 
 }
 
-#endif // SWIFT_ABI_CLASS_H
+#endif /* SWIFT_ABI_CLASS_H */

branches/rxwei-patch-1/include/swift/ABI/HeapObject.h

@@ -14,9 +14,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_ABI_HEAPOBJECT_H
-#define SWIFT_ABI_HEAPOBJECT_H
+#ifndef __SWIFT_ABI_HEAPOBJECT_H__
+#define __SWIFT_ABI_HEAPOBJECT_H__
 
 #include "../../../stdlib/public/SwiftShims/HeapObject.h"
 
-#endif // SWIFT_ABI_HEAPOBJECT_H
+#endif // __SWIFT_ABI_HEAPOBJECT_H__

branches/rxwei-patch-1/include/swift/ABI/KeyPath.h

@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_ABI_KEYPATH_H
-#define SWIFT_ABI_KEYPATH_H
+#ifndef __SWIFT_ABI_KEYPATH_H__
+#define __SWIFT_ABI_KEYPATH_H__
 
 // We include the basic constants in a shim header so that it can be shared with
 // the Swift implementation in the standard library.
@@ -235,4 +235,4 @@ class KeyPathComponentHeader {
 
 }
 
-#endif // SWIFT_ABI_KEYPATH_H
+#endif

branches/rxwei-patch-1/include/swift/ABI/Metadata.h

@@ -4442,4 +4442,4 @@ class DynamicReplacementScope
 
 #pragma clang diagnostic pop
 
-#endif // SWIFT_ABI_METADATA_H
+#endif /* SWIFT_ABI_METADATA_H */

branches/rxwei-patch-1/include/swift/ABI/MetadataValues.h

@@ -1770,4 +1770,4 @@ class IntegerLiteralFlags {
 
 } // end namespace swift
 
-#endif // SWIFT_ABI_METADATAVALUES_H
+#endif /* SWIFT_ABI_METADATAVALUES_H */

branches/rxwei-patch-1/include/swift/ABI/System.h

@@ -14,9 +14,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_ABI_SYSTEM_H
-#define SWIFT_ABI_SYSTEM_H
+#ifndef __SWIFT_ABI_SYSTEM_H__
+#define __SWIFT_ABI_SYSTEM_H__
 
 #include "../../../stdlib/public/SwiftShims/System.h"
 
-#endif // SWIFT_ABI_SYSTEM_H
+#endif // __SWIFT_ABI_SYSTEM_H__

branches/rxwei-patch-1/include/swift/ABI/TypeIdentity.h

@@ -215,4 +215,4 @@ class ParsedTypeIdentity {
 
 } // end namespace swift
 
-#endif // SWIFT_ABI_TYPEIDENTITY_H
+#endif  /* SWIFT_ABI_TYPEIDENTITY_H */

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

@@ -616,10 +616,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/ASTDemangler.h

@@ -19,8 +19,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_AST_ASTDEMANGLER_H
-#define SWIFT_AST_ASTDEMANGLER_H
+#ifndef __SWIFT_AST_ASTDEMANGLER_H__
+#define __SWIFT_AST_ASTDEMANGLER_H__
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
@@ -185,4 +185,4 @@ class ASTBuilder {
 
 }  // namespace swift
 
-#endif  // SWIFT_AST_ASTDEMANGLER_H
+#endif  // __SWIFT_AST_ASTDEMANGLER_H__

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

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_AST_ASTMANGLER_H
-#define SWIFT_AST_ASTMANGLER_H
+#ifndef __SWIFT_AST_ASTMANGLER_H__
+#define __SWIFT_AST_ASTMANGLER_H__
 
 #include "swift/Basic/Mangler.h"
 #include "swift/AST/Types.h"
@@ -350,4 +350,4 @@ class ASTMangler : public Mangler {
 } // end namespace Mangle
 } // end namespace swift
 
-#endif // SWIFT_AST_ASTMANGLER_H
+#endif // __SWIFT_AST_ASTMANGLER_H__

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

@@ -286,6 +286,7 @@ class ASTPrinter {
 
   /// To sanitize a malformed utf8 string to a well-formed one.
   static std::string sanitizeUtf8(StringRef Text);
+  static ValueDecl* findConformancesWithDocComment(ValueDecl *VD);
 
 private:
   virtual void anchor();

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

@@ -38,4 +38,4 @@ class Type;
 
 } // end namespace swift
 
-#endif // SWIFT_AST_ASTTYPEIDS_H
+#endif /* SWIFT_AST_ASTTYPEIDS_H */

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

@@ -400,7 +400,7 @@ SIMPLE_DECL_ATTR(_alwaysEmitIntoClient, AlwaysEmitIntoClient,
   83)
 
 SIMPLE_DECL_ATTR(_implementationOnly, ImplementationOnly,
-  OnImport | OnFunc | OnConstructor | OnVar | OnSubscript | UserInaccessible,
+  OnImport | UserInaccessible,
   84)
 DECL_ATTR(_custom, Custom,
   OnAnyDecl | UserInaccessible,

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

@@ -1737,9 +1737,6 @@ class DeclAttributes {
   void dump(const Decl *D = nullptr) const;
   void print(ASTPrinter &Printer, const PrintOptions &Options,
              const Decl *D = nullptr) const;
-  static void print(ASTPrinter &Printer, const PrintOptions &Options,
-                    ArrayRef<const DeclAttribute *> FlattenedAttrs,
-                    const Decl *D = nullptr);
 
   template <typename T, typename DERIVED>
   class iterator_base : public std::iterator<std::forward_iterator_tag, T *> {

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

@@ -18,26 +18,20 @@
 
 namespace swift {
 class Decl;
-class TypeDecl;
+class DocComment;
 struct RawComment;
 
 class DocComment {
   const Decl *D;
-  swift::markup::Document *Doc = nullptr;
-  swift::markup::CommentParts Parts;
+  const swift::markup::Document *Doc = nullptr;
+  const swift::markup::CommentParts Parts;
 
+public:
   DocComment(const Decl *D, swift::markup::Document *Doc,
              swift::markup::CommentParts Parts)
       : D(D), Doc(Doc), Parts(Parts) {}
 
-public:
-  static DocComment *create(const Decl *D, swift::markup::MarkupContext &MC,
-                            RawComment RC);
-
-  void addInheritanceNote(swift::markup::MarkupContext &MC, TypeDecl *base);
-
   const Decl *getDecl() const { return D; }
-  void setDecl(const Decl *D) { this->D = D; }
 
   const swift::markup::Document *getDocument() const { return Doc; }
 
@@ -93,23 +87,19 @@ class DocComment {
 };
 
 /// Get a parsed documentation comment for the declaration, if there is one.
-DocComment *getSingleDocComment(swift::markup::MarkupContext &Context,
-                                const Decl *D);
-
-const Decl *getDocCommentProvidingDecl(const Decl *D);
+Optional<DocComment *>getSingleDocComment(swift::markup::MarkupContext &Context,
+                                          const Decl *D);
 
 /// Attempt to get a doc comment from the declaration, or other inherited
 /// sources, like from base classes or protocols.
-DocComment *getCascadingDocComment(swift::markup::MarkupContext &MC,
-                                   const Decl *D);
+Optional<DocComment *> getCascadingDocComment(swift::markup::MarkupContext &MC,
+                                             const Decl *D);
 
 /// Extract comments parts from the given Markup node.
 swift::markup::CommentParts
 extractCommentParts(swift::markup::MarkupContext &MC,
                     swift::markup::MarkupASTNode *Node);
-
-/// Extract brief comment from \p RC, and print it to \p OS .
-void printBriefComment(RawComment RC, llvm::raw_ostream &OS);
 } // namespace swift
 
 #endif // LLVM_SWIFT_AST_COMMENT_H
+