Skip to content

Commit 92c8bd8

Browse files
pschuhpschuh
authored
---
yaml --- r: 340955 b: refs/heads/rxwei-patch-1 c: 930fbea h: refs/heads/master i: 340953: 643e9b0 340951: cdba2f1
1 parent 1f4438b commit 92c8bd8

File tree

309 files changed

+5830
-2510
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+5830
-2510
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
10151015
refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
10161016
refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
10171017
refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
1018-
refs/heads/rxwei-patch-1: 06a93b8e8ce41d162fe12b67c3bed55b1a058c50
1018+
refs/heads/rxwei-patch-1: 930fbeacd1e01af451991eec02e0d51d9ca22771
10191019
refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
10201020
refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
10211021
refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

‎branches/rxwei-patch-1/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -638,9 +638,9 @@ endif()
638638
if(SWIFT_HOST_VARIANT_ARCH)
639639
set(SWIFT_HOST_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
640640
else()
641-
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
641+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
642642
set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
643-
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
643+
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64")
644644
set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")
645645
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64")
646646
set(SWIFT_HOST_VARIANT_ARCH_default "powerpc64")
@@ -653,8 +653,6 @@ else()
653653
set(SWIFT_HOST_VARIANT_ARCH_default "armv6")
654654
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "armv7l|armv7-a")
655655
set(SWIFT_HOST_VARIANT_ARCH_default "armv7")
656-
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
657-
set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
658656
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "IA64")
659657
set(SWIFT_HOST_VARIANT_ARCH_default "itanium")
660658
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86|i686)")
@@ -1106,6 +1104,7 @@ else()
11061104
# ensure we build that when building tools.
11071105
if(SWIFT_INCLUDE_TOOLS)
11081106
add_subdirectory(stdlib/public/Reflection)
1107+
add_subdirectory(stdlib/public/SwiftShims)
11091108
endif()
11101109
endif()
11111110

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

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,6 +1107,10 @@ function(_add_swift_library_single target name)
11071107
set_target_properties("${target}"
11081108
PROPERTIES
11091109
INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin")
1110+
elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID")
1111+
# CMake generates incorrect rule `$SONAME_FLAG $INSTALLNAME_DIR$SONAME` for Android build on macOS cross-compile host.
1112+
# Proper linker flags constructed manually. See below variable `swiftlib_link_flags_all`.
1113+
set_target_properties("${target}" PROPERTIES NO_SONAME TRUE)
11101114
endif()
11111115

11121116
# SWIFT_ENABLE_TENSORFLOW
@@ -1416,7 +1420,7 @@ function(_add_swift_library_single target name)
14161420
# NOTE(compnerd) use the C linker language to invoke `clang` rather than
14171421
# `clang++` as we explicitly link against the C++ runtime. We were previously
14181422
# actually passing `-nostdlib++` to avoid the C++ runtime linkage.
1419-
if(SWIFTLIB_SINGLE_SDK STREQUAL ANDROID)
1423+
if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID")
14201424
set_property(TARGET "${target}" PROPERTY
14211425
LINKER_LANGUAGE "C")
14221426
else()
@@ -1915,6 +1919,16 @@ function(add_swift_target_library name)
19151919
NOT ${name} STREQUAL swiftRemoteMirror)
19161920
list(APPEND swiftlib_link_flags_all "-Wl,-z,defs")
19171921
endif()
1922+
# Setting back linker flags which are not supported when making Android build on macOS cross-compile host.
1923+
if(SWIFTLIB_SHARED)
1924+
if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)
1925+
list(APPEND swiftlib_link_flags_all "-dynamiclib -Wl,-headerpad_max_install_names")
1926+
elseif(sdk STREQUAL ANDROID)
1927+
list(APPEND swiftlib_link_flags_all "-shared")
1928+
# TODO: Instead of `lib${name}.so` find variable or target property which already have this value.
1929+
list(APPEND swiftlib_link_flags_all "-Wl,-soname,lib${name}.so")
1930+
endif()
1931+
endif()
19181932

19191933
set(sdk_supported_archs
19201934
${SWIFT_SDK_${sdk}_ARCHITECTURES}
@@ -2391,6 +2405,17 @@ function(_add_swift_executable_single name)
23912405
target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES})
23922406
swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_LINK_COMPONENTS})
23932407

2408+
# NOTE(compnerd) use the C linker language to invoke `clang` rather than
2409+
# `clang++` as we explicitly link against the C++ runtime. We were previously
2410+
# actually passing `-nostdlib++` to avoid the C++ runtime linkage.
2411+
if(SWIFTEXE_SINGLE_SDK STREQUAL ANDROID)
2412+
set_property(TARGET "${name}" PROPERTY
2413+
LINKER_LANGUAGE "C")
2414+
else()
2415+
set_property(TARGET "${name}" PROPERTY
2416+
LINKER_LANGUAGE "CXX")
2417+
endif()
2418+
23942419
set_target_properties(${name} PROPERTIES FOLDER "Swift executables")
23952420

23962421
# SWIFT_ENABLE_TENSORFLOW

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

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -63,32 +63,36 @@ macro(swift_common_standalone_build_config_llvm product)
6363
endif()
6464

6565
if(SWIFT_INCLUDE_TOOLS)
66-
if(CMAKE_CROSSCOMPILING)
67-
set(LLVM_NATIVE_BUILD_DIR "${LLVM_BINARY_DIR}/NATIVE")
68-
if(NOT EXISTS "${LLVM_NATIVE_BUILD_DIR}")
69-
message(FATAL_ERROR
70-
"Attempting to cross-compile swift standalone but no native LLVM build
71-
found. Please cross-compile LLVM as well.")
72-
endif()
73-
74-
if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
75-
set(HOST_EXECUTABLE_SUFFIX ".exe")
76-
endif()
77-
78-
if(NOT CMAKE_CONFIGURATION_TYPES)
79-
set(LLVM_TABLEGEN_EXE
80-
"${LLVM_NATIVE_BUILD_DIR}/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
81-
else()
82-
# NOTE: LLVM NATIVE build is always built Release, as is specified in
83-
# CrossCompile.cmake
84-
set(LLVM_TABLEGEN_EXE
85-
"${LLVM_NATIVE_BUILD_DIR}/Release/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
86-
endif()
66+
if(LLVM_TABLEGEN)
67+
set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN})
8768
else()
88-
find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" HINTS ${LLVM_TOOLS_BINARY_DIR}
89-
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
90-
if(LLVM_TABLEGEN_EXE STREQUAL "LLVM_TABLEGEN_EXE-NOTFOUND")
91-
message(FATAL_ERROR "Failed to find tablegen in ${LLVM_TOOLS_BINARY_DIR}")
69+
if(CMAKE_CROSSCOMPILING)
70+
set(LLVM_NATIVE_BUILD_DIR "${LLVM_BINARY_DIR}/NATIVE")
71+
if(NOT EXISTS "${LLVM_NATIVE_BUILD_DIR}")
72+
message(FATAL_ERROR
73+
"Attempting to cross-compile swift standalone but no native LLVM build
74+
found. Please cross-compile LLVM as well.")
75+
endif()
76+
77+
if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
78+
set(HOST_EXECUTABLE_SUFFIX ".exe")
79+
endif()
80+
81+
if(NOT CMAKE_CONFIGURATION_TYPES)
82+
set(LLVM_TABLEGEN_EXE
83+
"${LLVM_NATIVE_BUILD_DIR}/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
84+
else()
85+
# NOTE: LLVM NATIVE build is always built Release, as is specified in
86+
# CrossCompile.cmake
87+
set(LLVM_TABLEGEN_EXE
88+
"${LLVM_NATIVE_BUILD_DIR}/Release/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
89+
endif()
90+
else()
91+
find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" HINTS ${LLVM_TOOLS_BINARY_DIR}
92+
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
93+
if(LLVM_TABLEGEN_EXE STREQUAL "LLVM_TABLEGEN_EXE-NOTFOUND")
94+
message(FATAL_ERROR "Failed to find tablegen in ${LLVM_TOOLS_BINARY_DIR}")
95+
endif()
9296
endif()
9397
endif()
9498
endif()
@@ -110,6 +114,9 @@ macro(swift_common_standalone_build_config_llvm product)
110114
# add_swift_host_library and add_swift_target_library within AddSwift.cmake.
111115
string(REGEX REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
112116
string(REGEX REPLACE "-Wl,-z,nodelete" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
117+
# Android build on macOS cross-compile host don't support `-Wl,-headerpad_max_install_names` and `-dynamiclib` as a linker flags.
118+
string(REGEX REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}")
119+
string(REGEX REPLACE "-dynamiclib" "" CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}")
113120

114121
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
115122
string(REGEX REPLACE "([0-9]+)\\.[0-9]+(\\.[0-9]+)?" "\\1" PACKAGE_VERSION_MAJOR

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ function(_compile_swift_files
278278
# into the new runtime.
279279
if (SWIFTFILE_IS_STDLIB OR SWIFTFILE_IS_SDK_OVERLAY)
280280
list(APPEND swift_flags "-runtime-compatibility-version" "none")
281+
list(APPEND swift_flags "-disable-autolinking-runtime-compatibility-dynamic-replacements")
281282
endif()
282283

283284
if (SWIFTFILE_IS_STDLIB_CORE OR SWIFTFILE_IS_SDK_OVERLAY)

‎branches/rxwei-patch-1/include/swift/ABI/Class.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ inline ObjCClassFlags operator|(ObjCClassFlags lhs, ObjCClassFlags rhs) {
6565

6666
}
6767

68-
#endif /* SWIFT_ABI_CLASS_H */
68+
#endif // SWIFT_ABI_CLASS_H

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#ifndef __SWIFT_ABI_HEAPOBJECT_H__
18-
#define __SWIFT_ABI_HEAPOBJECT_H__
17+
#ifndef SWIFT_ABI_HEAPOBJECT_H
18+
#define SWIFT_ABI_HEAPOBJECT_H
1919

2020
#include "../../../stdlib/public/SwiftShims/HeapObject.h"
2121

22-
#endif // __SWIFT_ABI_HEAPOBJECT_H__
22+
#endif // SWIFT_ABI_HEAPOBJECT_H

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#ifndef __SWIFT_ABI_KEYPATH_H__
18-
#define __SWIFT_ABI_KEYPATH_H__
17+
#ifndef SWIFT_ABI_KEYPATH_H
18+
#define SWIFT_ABI_KEYPATH_H
1919

2020
// We include the basic constants in a shim header so that it can be shared with
2121
// the Swift implementation in the standard library.
@@ -235,4 +235,4 @@ class KeyPathComponentHeader {
235235

236236
}
237237

238-
#endif
238+
#endif // SWIFT_ABI_KEYPATH_H

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4442,4 +4442,4 @@ class DynamicReplacementScope
44424442

44434443
#pragma clang diagnostic pop
44444444

4445-
#endif /* SWIFT_ABI_METADATA_H */
4445+
#endif // SWIFT_ABI_METADATA_H

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1770,4 +1770,4 @@ class IntegerLiteralFlags {
17701770

17711771
} // end namespace swift
17721772

1773-
#endif /* SWIFT_ABI_METADATAVALUES_H */
1773+
#endif // SWIFT_ABI_METADATAVALUES_H

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#ifndef __SWIFT_ABI_SYSTEM_H__
18-
#define __SWIFT_ABI_SYSTEM_H__
17+
#ifndef SWIFT_ABI_SYSTEM_H
18+
#define SWIFT_ABI_SYSTEM_H
1919

2020
#include "../../../stdlib/public/SwiftShims/System.h"
2121

22-
#endif // __SWIFT_ABI_SYSTEM_H__
22+
#endif // SWIFT_ABI_SYSTEM_H

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,4 +215,4 @@ class ParsedTypeIdentity {
215215

216216
} // end namespace swift
217217

218-
#endif /* SWIFT_ABI_TYPEIDENTITY_H */
218+
#endif // SWIFT_ABI_TYPEIDENTITY_H

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,10 @@ class ASTContext final {
616616
/// Get the runtime availability of the opaque types language feature for the target platform.
617617
AvailabilityContext getOpaqueTypeAvailability();
618618

619+
/// Get the runtime availability of features introduced in the Swift 5.1
620+
/// compiler for the target platform.
621+
AvailabilityContext getSwift51Availability();
622+
619623
//===--------------------------------------------------------------------===//
620624
// Diagnostics Helper functions
621625
//===--------------------------------------------------------------------===//

‎branches/rxwei-patch-1/include/swift/AST/ASTDemangler.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
//
2020
//===----------------------------------------------------------------------===//
2121

22-
#ifndef __SWIFT_AST_ASTDEMANGLER_H__
23-
#define __SWIFT_AST_ASTDEMANGLER_H__
22+
#ifndef SWIFT_AST_ASTDEMANGLER_H
23+
#define SWIFT_AST_ASTDEMANGLER_H
2424

2525
#include "llvm/ADT/ArrayRef.h"
2626
#include "llvm/ADT/StringRef.h"
@@ -185,4 +185,4 @@ class ASTBuilder {
185185

186186
} // namespace swift
187187

188-
#endif // __SWIFT_AST_ASTDEMANGLER_H__
188+
#endif // SWIFT_AST_ASTDEMANGLER_H

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef __SWIFT_AST_ASTMANGLER_H__
14-
#define __SWIFT_AST_ASTMANGLER_H__
13+
#ifndef SWIFT_AST_ASTMANGLER_H
14+
#define SWIFT_AST_ASTMANGLER_H
1515

1616
#include "swift/Basic/Mangler.h"
1717
#include "swift/AST/Types.h"
@@ -350,4 +350,4 @@ class ASTMangler : public Mangler {
350350
} // end namespace Mangle
351351
} // end namespace swift
352352

353-
#endif // __SWIFT_AST_ASTMANGLER_H__
353+
#endif // SWIFT_AST_ASTMANGLER_H

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ class ASTPrinter {
286286

287287
/// To sanitize a malformed utf8 string to a well-formed one.
288288
static std::string sanitizeUtf8(StringRef Text);
289-
static ValueDecl* findConformancesWithDocComment(ValueDecl *VD);
290289

291290
private:
292291
virtual void anchor();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ class Type;
3838

3939
} // end namespace swift
4040

41-
#endif /* SWIFT_AST_ASTTYPEIDS_H */
41+
#endif // SWIFT_AST_ASTTYPEIDS_H

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ SIMPLE_DECL_ATTR(_alwaysEmitIntoClient, AlwaysEmitIntoClient,
400400
83)
401401

402402
SIMPLE_DECL_ATTR(_implementationOnly, ImplementationOnly,
403-
OnImport | UserInaccessible,
403+
OnImport | OnFunc | OnConstructor | OnVar | OnSubscript | UserInaccessible,
404404
84)
405405
DECL_ATTR(_custom, Custom,
406406
OnAnyDecl | UserInaccessible,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,6 +1737,9 @@ class DeclAttributes {
17371737
void dump(const Decl *D = nullptr) const;
17381738
void print(ASTPrinter &Printer, const PrintOptions &Options,
17391739
const Decl *D = nullptr) const;
1740+
static void print(ASTPrinter &Printer, const PrintOptions &Options,
1741+
ArrayRef<const DeclAttribute *> FlattenedAttrs,
1742+
const Decl *D = nullptr);
17401743

17411744
template <typename T, typename DERIVED>
17421745
class iterator_base : public std::iterator<std::forward_iterator_tag, T *> {

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

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,26 @@
1818

1919
namespace swift {
2020
class Decl;
21-
class DocComment;
21+
class TypeDecl;
2222
struct RawComment;
2323

2424
class DocComment {
2525
const Decl *D;
26-
const swift::markup::Document *Doc = nullptr;
27-
const swift::markup::CommentParts Parts;
26+
swift::markup::Document *Doc = nullptr;
27+
swift::markup::CommentParts Parts;
2828

29-
public:
3029
DocComment(const Decl *D, swift::markup::Document *Doc,
3130
swift::markup::CommentParts Parts)
3231
: D(D), Doc(Doc), Parts(Parts) {}
3332

33+
public:
34+
static DocComment *create(const Decl *D, swift::markup::MarkupContext &MC,
35+
RawComment RC);
36+
37+
void addInheritanceNote(swift::markup::MarkupContext &MC, TypeDecl *base);
38+
3439
const Decl *getDecl() const { return D; }
40+
void setDecl(const Decl *D) { this->D = D; }
3541

3642
const swift::markup::Document *getDocument() const { return Doc; }
3743

@@ -87,19 +93,23 @@ class DocComment {
8793
};
8894

8995
/// Get a parsed documentation comment for the declaration, if there is one.
90-
Optional<DocComment *>getSingleDocComment(swift::markup::MarkupContext &Context,
91-
const Decl *D);
96+
DocComment *getSingleDocComment(swift::markup::MarkupContext &Context,
97+
const Decl *D);
98+
99+
const Decl *getDocCommentProvidingDecl(const Decl *D);
92100

93101
/// Attempt to get a doc comment from the declaration, or other inherited
94102
/// sources, like from base classes or protocols.
95-
Optional<DocComment *> getCascadingDocComment(swift::markup::MarkupContext &MC,
96-
const Decl *D);
103+
DocComment *getCascadingDocComment(swift::markup::MarkupContext &MC,
104+
const Decl *D);
97105

98106
/// Extract comments parts from the given Markup node.
99107
swift::markup::CommentParts
100108
extractCommentParts(swift::markup::MarkupContext &MC,
101109
swift::markup::MarkupASTNode *Node);
110+
111+
/// Extract brief comment from \p RC, and print it to \p OS .
112+
void printBriefComment(RawComment RC, llvm::raw_ostream &OS);
102113
} // namespace swift
103114

104115
#endif // LLVM_SWIFT_AST_COMMENT_H
105-

0 commit comments

Comments
 (0)