---

yaml
---
r: 340921
b: refs/heads/rxwei-patch-1
c: 7e8ce6c
h: refs/heads/master
i:
  340919: dd26165

Author: aschwaighofer

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

@@ -1082,6 +1082,7 @@ 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/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
+#endif // SWIFT_ABI_KEYPATH_H

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,7 +286,6 @@ 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,20 +18,26 @@
 
 namespace swift {
 class Decl;
-class DocComment;
+class TypeDecl;
 struct RawComment;
 
 class DocComment {
   const Decl *D;
-  const swift::markup::Document *Doc = nullptr;
-  const swift::markup::CommentParts Parts;
+  swift::markup::Document *Doc = nullptr;
+  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; }
 
@@ -87,19 +93,23 @@ class DocComment {
 };
 
 /// Get a parsed documentation comment for the declaration, if there is one.
-Optional<DocComment *>getSingleDocComment(swift::markup::MarkupContext &Context,
-                                          const Decl *D);
+DocComment *getSingleDocComment(swift::markup::MarkupContext &Context,
+                                const Decl *D);
+
+const Decl *getDocCommentProvidingDecl(const Decl *D);
 
 /// Attempt to get a doc comment from the declaration, or other inherited
 /// sources, like from base classes or protocols.
-Optional<DocComment *> getCascadingDocComment(swift::markup::MarkupContext &MC,
-                                             const Decl *D);
+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
-

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

@@ -40,4 +40,4 @@ class DiagnosticSuppression {
 };
 
 }
-#endif /* SWIFT_AST_DIAGNOSTIC_SUPPRESSION_H */
+#endif // SWIFT_AST_DIAGNOSTIC_SUPPRESSION_H

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

@@ -628,7 +628,7 @@ ERROR(sema_opening_import,Fatal,
       "opening import file for module %0: %1", (Identifier, StringRef))
 
 ERROR(serialization_load_failed,Fatal,
-      "failed to load module %0", (Identifier))
+      "failed to load module '%0'", (StringRef))
 ERROR(serialization_malformed_module,Fatal,
       "malformed compiled module: %0", (StringRef))
 ERROR(serialization_module_too_new,Fatal,
@@ -997,6 +997,10 @@ ERROR(missing_address_of,none,
 ERROR(missing_address_of_yield,none,
       "yielding mutable value of type %0 requires explicit '&'",
       (Type))
+ERROR(extraneous_property_wrapper_unwrap,none,
+      "property %0 will be unwrapped to value of type %1, use '$' to refer to "
+      "wrapper type %2",
+      (DeclName, Type, Type))
 ERROR(extraneous_address_of,none,
       "use of extraneous '&'",
       ())

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

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef ExperimentalDependencies_h
-#define ExperimentalDependencies_h
+#ifndef SWIFT_AST_EXPERIMENTAL_DEPENDENCIES_H
+#define SWIFT_AST_EXPERIMENTAL_DEPENDENCIES_H
 
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/Range.h"
@@ -982,4 +982,4 @@ struct SequenceTraits<
 LLVM_YAML_DECLARE_MAPPING_TRAITS(
     swift::experimental_dependencies::SourceFileDepGraph)
 
-#endif /* ExperimentalDependencies_h */
+#endif // SWIFT_AST_EXPERIMENTAL_DEPENDENCIES_H

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

@@ -349,7 +349,7 @@ struct PrintOptions {
 
   /// Whether to print the doc-comment from the conformance if a member decl
   /// has no associated doc-comment by itself.
-  bool ElevateDocCommentFromConformance = false;
+  bool CascadeDocComment = false;
 
   /// Whether to print the content of an extension decl inside the type decl where it
   /// extends from.
@@ -480,7 +480,7 @@ struct PrintOptions {
     result.SkipDeinit = true;
     result.ExcludeAttrList.push_back(DAK_DiscardableResult);
     result.EmptyLineBetweenMembers = true;
-    result.ElevateDocCommentFromConformance = true;
+    result.CascadeDocComment = true;
     result.ShouldQualifyNestedDeclarations =
         QualifyNestedDeclarations::Always;
     result.PrintDocumentationComments = true;

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

@@ -127,4 +127,4 @@ class TrailingCallArguments
 
 } // end namespace swift
 
-#endif /* SWIFT_AST_TRAILINGCALLARGUMENTS_H */
+#endif // SWIFT_AST_TRAILINGCALLARGUMENTS_H

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

@@ -42,4 +42,4 @@ void simple_display(llvm::raw_ostream &out, const TypeResolutionStage &value);
 
 } // end namespace swift
 
-#endif /* SWIFT_AST_TYPE_RESOLUTION_STAGE_H */
+#endif // SWIFT_AST_TYPE_RESOLUTION_STAGE_H

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

@@ -91,4 +91,4 @@ class ExponentialGrowthAppendingBinaryByteStream
 
 } // end namespace swift
 
-#endif /* SWIFT_BASIC_EXPONENTIALGROWTHAPPENDINGBINARYBYTESTREAM_H */
+#endif // SWIFT_BASIC_EXPONENTIALGROWTHAPPENDINGBINARYBYTESTREAM_H

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

@@ -52,4 +52,4 @@ class PrimarySpecificPaths {
 };
 } // namespace swift
 
-#endif /* SWIFT_BASIC_PRIMARYSPECIFICPATHS_H */
+#endif // SWIFT_BASIC_PRIMARYSPECIFICPATHS_H

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

@@ -137,4 +137,4 @@ struct SupplementaryOutputPaths {
 };
 } // namespace swift
 
-#endif /* SWIFT_FRONTEND_SUPPLEMENTARYOUTPUTPATHS_H */
+#endif // SWIFT_FRONTEND_SUPPLEMENTARYOUTPUTPATHS_H

branches/rxwei-patch-1/include/swift/Driver/ExperimentalDependencyDriverGraph.h

@@ -468,4 +468,4 @@ class ModuleDepGraph {
 } // namespace experimental_dependencies
 } // namespace swift
 
-#endif /* ExperimentalDependencyGraph_h */
+#endif // ExperimentalDependencyGraph_h

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

@@ -243,4 +243,4 @@ class FrontendInputsAndOutputs {
 
 } // namespace swift
 
-#endif /* SWIFT_FRONTEND_FRONTENDINPUTS_H */
+#endif // SWIFT_FRONTEND_FRONTENDINPUTS_H

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

@@ -102,4 +102,4 @@ class InputFile {
 };
 } // namespace swift
 
-#endif /* SWIFT_FRONTEND_INPUTFILE_H */
+#endif // SWIFT_FRONTEND_INPUTFILE_H

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

@@ -246,4 +246,4 @@ const WitnessTable *swift_conformsToProtocol(const Metadata *type,
 
 } // end namespace swift
 
-#endif /* SWIFT_RUNTIME_CASTING_H */
+#endif // SWIFT_RUNTIME_CASTING_H

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

@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _SWIFT_RUNTIME_DEBUG_HELPERS_
-#define _SWIFT_RUNTIME_DEBUG_HELPERS_
+#ifndef SWIFT_RUNTIME_DEBUG_HELPERS_H
+#define SWIFT_RUNTIME_DEBUG_HELPERS_H
 
 #include <cstdarg>
 #include <cstdio>
@@ -268,4 +268,4 @@ inline static int swift_asprintf(char **strp, const char *fmt, ...) {
 // namespace swift
 }
 
-#endif // _SWIFT_RUNTIME_DEBUG_HELPERS_
+#endif // SWIFT_RUNTIME_DEBUG_HELPERS_H

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

@@ -17,4 +17,4 @@
 #ifndef SWIFT_RUNTIME_HEAP_H
 #define SWIFT_RUNTIME_HEAP_H
 
-#endif /* SWIFT_RUNTIME_HEAP_H */
+#endif // SWIFT_RUNTIME_HEAP_H