Skip to content

[Testing] Fix some build warnings #26840

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 1 commit into from
Aug 26, 2019
Merged

[Testing] Fix some build warnings #26840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions stdlib/tools/swift-reflection-test/swift-reflection-test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
#include <fcntl.h>
#endif

#if defined(__clang__) || defined(__GNUC__)
#define NORETURN __attribute__((noreturn))
#endif
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need an #else #define NORETURN here for other compilers?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, duh. Ya. Normally I'd not ifdef this, but given that Windows support is being pushed forward, I thought I'd make a nod towards portability. See also: #26868


typedef struct PipeMemoryReader {
int to_child[2];
int from_child[2];
Expand All @@ -56,11 +60,13 @@ typedef struct RemoteReflectionInfo {
size_t TotalSize;
} RemoteReflectionInfo;

NORETURN
static void errorAndExit(const char *message) {
fprintf(stderr, "%s\n", message);
abort();
}

NORETURN
static void errnoAndExit(const char *message) {
fprintf(stderr, "%s: %s\n", message, strerror(errno));
abort();
Expand Down
9 changes: 7 additions & 2 deletions tools/swift-ast-script/swift-ast-script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ class Observer : public FrontendObserver {

}

int main(int argc, const char *argv[]) {
// ISO C++ does not allow 'main' to be used by a program [-Wmain]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, never knew about this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya, clang top-of-tree is now warning about this by default.

int main2(int argc, const char *argv[]) {
PROGRAM_START(argc, argv);

// Look for the first "--" in the arguments.
Expand All @@ -87,7 +88,11 @@ int main(int argc, const char *argv[]) {
frontendArgs.push_back("-typecheck");

int frontendResult =
performFrontend(frontendArgs, argv[0], (void*) &main, &observer);
performFrontend(frontendArgs, argv[0], (void*) &main2, &observer);

return (observer.hadError() ? 1 : frontendResult);
}

int main(int argc, const char *argv[]) {
return main2(argc, argv);
}