Skip to content

Silence Some Warnings #40230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 18, 2021
Merged

Silence Some Warnings #40230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f97d0cc
[NFC] Initialize Members in Order
CodaFi Nov 17, 2021
924d15b
[NFC] Swap LLVM_NODISCARD for LLVM_ATTRIBUTE_NORETURN
CodaFi Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/ClangImporter/ClangImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2206,8 +2206,8 @@ ClangImporter::Implementation::Implementation(
EnableClangSPI(ctx.ClangImporterOpts.EnableClangSPI),
IsReadingBridgingPCH(false),
CurrentVersion(ImportNameVersion::fromOptions(ctx.LangOpts)),
BridgingHeaderLookupTable(new SwiftLookupTable(nullptr)),
BuffersForDiagnostics(ctx.SourceMgr),
BridgingHeaderLookupTable(new SwiftLookupTable(nullptr)),
platformAvailability(ctx.LangOpts), nameImporter(),
DisableSourceImport(ctx.ClangImporterOpts.DisableSourceImport),
DWARFImporter(dwarfImporterDelegate) {}
Expand Down
7 changes: 4 additions & 3 deletions lib/Demangling/Demangler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,10 @@ static bool isRequirement(Node::Kind kind) {
// Public utility functions //
//////////////////////////////////

LLVM_NODISCARD void swift::Demangle::failAssert(const char *file, unsigned line,
NodePointer node,
const char *expr) {
LLVM_ATTRIBUTE_NORETURN void swift::Demangle::failAssert(const char *file,
unsigned line,
NodePointer node,
const char *expr) {
fprintf(stderr, "%s:%u: assertion failed for Node %p: %s", file, line, node,
expr);
abort();
Expand Down
4 changes: 2 additions & 2 deletions lib/Demangling/DemanglerAssert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ namespace swift {
namespace Demangle {
SWIFT_BEGIN_INLINE_NAMESPACE

LLVM_NODISCARD void failAssert(const char *file, unsigned line,
NodePointer node, const char *expr);
LLVM_ATTRIBUTE_NORETURN void failAssert(const char *file, unsigned line,
NodePointer node, const char *expr);

SWIFT_END_INLINE_NAMESPACE
} // end namespace Demangle
Expand Down