---

yaml
---
r: 340922
b: refs/heads/rxwei-patch-1
c: ebe0e42
h: refs/heads/master

Author: xedin

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

@@ -621,9 +621,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")
@@ -636,6 +636,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)")
@@ -1082,7 +1084,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/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()

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

@@ -1752,4 +1752,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/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/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
+