---

yaml
---
r: 349519
b: refs/heads/master-next
c: e3af7f8
h: refs/heads/master
i:
  349517: 6e8a614
  349515: 5900d4f
  349511: 732e80f
  349503: 50ed6e1

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 002bd80873d594aeae4d6b160fc8d6ea9cea001c
+refs/heads/master-next: e3af7f8c0609b3c7fa4727e501249319c2bac9af
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/stdlib/tools/swift-reflection-test/swift-reflection-test.c

@@ -34,6 +34,10 @@
 #include <fcntl.h>
 #endif
 
+#if defined(__clang__) || defined(__GNUC__)
+#define NORETURN __attribute__((noreturn))
+#endif
+
 typedef struct PipeMemoryReader {
   int to_child[2];
   int from_child[2];
@@ -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();

branches/master-next/tools/swift-ast-script/swift-ast-script.cpp

@@ -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]
+int main2(int argc, const char *argv[]) {
   PROGRAM_START(argc, argv);
 
   // Look for the first "--" in the arguments.
@@ -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);
+}