diff --git a/clang/test/Lexer/char-escapes-delimited.c b/clang/test/Lexer/char-escapes-delimited.c
@@ -15,7 +15,7 @@ const char *errors =
     "\o{8}" //expected-error {{invalid digit '8' in escape sequence}}
     ;
 
-void ucn() {
+void ucn(void) {
   char a = '\u{1234}'; // expected-error {{character too large for enclosing character literal type}}
                        // expected-warning@-1 {{delimited escape sequences are a Clang extension}}
 
@@ -31,7 +31,7 @@ void ucn() {
   unsigned d = U'\u{111111111}';       //expected-error {{hex escape sequence out of range}}
 }
 
-void hex() {
+void hex(void) {
   char a = '\x{1}';             // expected-warning {{extension}}
   char b = '\x{abcdegggggabc}'; // expected-error 5{{invalid digit 'g' in escape sequence}}
   char c = '\x{ff1}';           // expected-error {{hex escape sequence out of range}}
@@ -47,7 +47,7 @@ void hex() {
   unsigned i = U'\x{100000000}'; // expected-error {{hex escape sequence out of range}}
 }
 
-void octal() {
+void octal(void) {
   char a = '\o{1}';              // expected-warning {{extension}}
   char b = '\o{12345678881238}'; // expected-error 4{{invalid digit '8' in escape sequence}}
   char c = '\o{777}';            // //expected-error {{octal escape sequence out of range}}
@@ -60,7 +60,7 @@ void octal() {
 #endif
 }
 
-void concat() {
+void concat(void) {
   (void)"\x{" "12}"; // expected-error {{expected '}'}}
   (void)"\u{" "12}"; // expected-error {{expected '}'}}
   (void)"\o{" "12}"; // expected-error {{expected '}'}}
@@ -70,7 +70,7 @@ void concat() {
   (void)"\o{12" "}"; // expected-error {{expected '}'}}
 }
 
-void separators() {
+void separators(void) {
   (void)"\x{12'3}"; // expected-error {{invalid digit ''' in escape sequence}}
   (void)"\u{12'3}"; // expected-error {{invalid digit ''' in escape sequence}}
   (void)"\o{12'3}"; // expected-error {{invalid digit ''' in escape sequence}}

diff --git a/clang/test/Lexer/conflict-marker.c b/clang/test/Lexer/conflict-marker.c
@@ -32,7 +32,7 @@ int z = 2;
 y b;
 
 
-int foo() {
+int foo(void) {
   y a = x;
   return x + a - z;
 }

diff --git a/clang/test/Lexer/ms-extensions.c b/clang/test/Lexer/ms-extensions.c
@@ -23,14 +23,14 @@ __complex float c3 = 1.0if;
 #define USHORT 0xffffui16
 #define UCHAR 0xffui8
 
-void a() {
+void a(void) {
 	unsigned long long m = ULLONG_MAX;
 	unsigned int n = UINT;
         unsigned short s = USHORT;
         unsigned char c = UCHAR;
 }
 
-void pr_7968()
+void pr_7968(void)
 {
   int var1 = 0x1111111e+1;
   int var2 = 0X1111111e+1;

diff --git a/clang/test/Lexer/multiple-include.c b/clang/test/Lexer/multiple-include.c
@@ -11,7 +11,7 @@
 #include "multiple-include.c"
 #undef XVID_AUTO_INCLUDE
 
-typedef void ff();
+typedef void ff(void);
 typedef struct { ff *a;} S;
 
 S s = { H_Pass_8_C };
@@ -21,7 +21,7 @@ S s = { H_Pass_8_C };
 #if defined(XVID_AUTO_INCLUDE) && defined(REFERENCE_CODE)
 #elif defined(XVID_AUTO_INCLUDE) && !defined(REFERENCE_CODE)
 
-static void FUNC_H(){};
+static void FUNC_H(void){};
 #undef FUNC_H
 
 #endif
diff --git a/clang/test/Lexer/newline-eof.c b/clang/test/Lexer/newline-eof.c
@@ -9,7 +9,7 @@
 // RUN: %clang_cc1 -fsyntax-only -x c++ -std=c++11 -Werror -pedantic %s
 
 // Make sure the diagnostic shows up properly at the end of the last line.
-// CHECK: newline-eof.c:[[@LINE+3]]:63
+// CHECK: newline-eof.c:[[@LINE+3]]:67
 
 // The following line isn't terminated, don't fix it.
-void foo() {} // expected-warning{{no newline at end of file}}
+void foo(void) {} // expected-warning{{no newline at end of file}}
diff --git a/clang/test/Lexer/numeric-literal-trash.c b/clang/test/Lexer/numeric-literal-trash.c
@@ -7,7 +7,7 @@
 int ec(int, int);
 
 
- void x() {
+ void x(void) {
 
 XRECORD (XRECORD (1, 1), 1);
     }
diff --git a/clang/test/Lexer/objc_macros.m b/clang/test/Lexer/objc_macros.m
@@ -10,7 +10,7 @@
 // No warning because this is the default expansion anyway.
 
 // Check that this still expands to the right text.
-void test() {
+void test(void) {
   goto label; // expected-error {{cannot jump from this goto statement to its label}}
   __weak id x; // expected-note {{jump bypasses initialization of __weak variable}}
 label:

diff --git a/clang/test/Lexer/pragma-region.c b/clang/test/Lexer/pragma-region.c
@@ -17,7 +17,7 @@
 void foo(void){}
 #pragma endregion long comment
 
-void inner();
+void inner(void);
 
 __pragma(region) // no sense, but ignored
 _Pragma("region")// ditto

diff --git a/clang/test/Lexer/string_concat.cpp b/clang/test/Lexer/string_concat.cpp
@@ -7,7 +7,7 @@ typedef __CHAR16_TYPE__ char16_t;
 typedef __CHAR32_TYPE__ char32_t;
 #endif
 
-void f() {
+void f(void) {
 
   const char* a = u8"abc" u"abc"; // expected-error {{unsupported non-standard concatenation of string literals}}
   const char* b = u8"abc" U"abc"; // expected-error {{unsupported non-standard concatenation of string literals}}

diff --git a/clang/test/Lexer/unicode.c b/clang/test/Lexer/unicode.c
@@ -55,7 +55,7 @@ extern int 👷‍♀; // expected-warning {{declaration does not declare anythi
 // A 🌹 by any other name....
 extern int 🌹;
 int 🌵(int 🌻) { return 🌻+ 1; }
-int main () {
+int main (void) {
   int 🌷 = 🌵(🌹);
   return 🌷;
 }

diff --git a/clang/test/Lexer/wchar.c b/clang/test/Lexer/wchar.c
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -fsyntax-only -fwchar-type=short -fno-signed-wchar -verify %s
 
-void f() {
+void f(void) {
   (void)L"\U00010000"; // unicode escape produces UTF-16 sequence, so no warning
 
   (void)L'ab';  // expected-error {{wide character literals may not contain multiple characters}}

diff --git a/clang/test/Misc/Inputs/remapped-file-2 b/clang/test/Misc/Inputs/remapped-file-2
@@ -1,3 +1,3 @@
 #include "nonexistent.h"
 
-int *f() { return fp; }
+int *f(void) { return fp; }
diff --git a/clang/test/Misc/caret-diags-macros.c b/clang/test/Misc/caret-diags-macros.c
@@ -2,7 +2,7 @@
 
 #define M1(x) x
 #define M2 1;
-void foo() {
+void foo(void) {
   M1(
     M2);
   // CHECK: {{.*}}:7:{{[0-9]+}}: warning: expression result unused
@@ -13,7 +13,7 @@ void foo() {
 #define A(x) x
 #define B(x) A(x)
 #define C(x) B(x)
-void bar() {
+void bar(void) {
   C(1);
   // CHECK: {{.*}}:17:5: warning: expression result unused
 }
@@ -36,7 +36,7 @@ void baz(char *Msg) {
 #define macro_many_args2(x, y, z) macro_many_args1(x, y, z)
 #define macro_many_args3(x, y, z) macro_many_args2(x, y, z)
 
-void test() {
+void test(void) {
   macro_args3(11);
   // CHECK: {{.*}}:40:15: warning: expression result unused
   // Also check that the 'caret' printing agrees with the location here where
@@ -83,7 +83,7 @@ void test() {
 #define variadic_args2(x, ...) variadic_args1(x, __VA_ARGS__)
 #define variadic_args3(x, y, ...) variadic_args2(x, y, __VA_ARGS__)
 
-void test2() {
+void test2(void) {
   variadic_args3(1, 22, 3, 4);
   // CHECK: {{.*}}:87:21: warning: expression result unused
   // CHECK-NEXT:      variadic_args3(1, 22, 3, 4);
@@ -99,7 +99,7 @@ void test2() {
 #define variadic_pasting_args3(x, y, ...) variadic_pasting_args2(x, y, __VA_ARGS__)
 #define variadic_pasting_args3a(x, y, ...) variadic_pasting_args2a(x, y, __VA_ARGS__)
 
-void test3() {
+void test3(void) {
   variadic_pasting_args3(1, 2, 3, 4);
   // CHECK: {{.*}}:103:32: warning: expression result unused
   // CHECK: {{.*}}:99:72: note: expanded from macro 'variadic_pasting_args3'

diff --git a/clang/test/Misc/clear-ast-before-backend.c b/clang/test/Misc/clear-ast-before-backend.c
@@ -11,4 +11,4 @@
 // STATS: 1 Function decls
 // STATS: Total bytes =
 
-void f() {}
+void f(void) {}
diff --git a/clang/test/Misc/diag-macro-backtrace2.c b/clang/test/Misc/diag-macro-backtrace2.c
@@ -10,7 +10,7 @@
 #define g(x) h(x)
 #define h(x) x
 
-void PR16799() {
+void PR16799(void) {
   const char str[] = "string";
   a(str);
   // CHECK: :15:3: error: invalid operands to binary expression

diff --git a/clang/test/Misc/loop-opt-setup.c b/clang/test/Misc/loop-opt-setup.c
@@ -14,7 +14,7 @@ int foo(void) {
 // CHECK-LABEL: foo
 // CHECK-NOT: br i1
 
-void Helper() {
+void Helper(void) {
   const int *nodes[5];
   int num_active = 5;
 

diff --git a/clang/test/Misc/printer.c b/clang/test/Misc/printer.c
@@ -2,4 +2,4 @@
 // RUN: %clang_cc1 -emit-llvm -fexperimental-new-pass-manager -mllvm -print-after-all %s -o %t 2>&1 | FileCheck %s --check-prefix=CHECK-AFTER
 // CHECK-BEFORE: *** IR Dump Before AlwaysInlinerPass
 // CHECK-AFTER: *** IR Dump After AlwaysInlinerPass
-void foo() {}
+void foo(void) {}
diff --git a/clang/test/Misc/remap-file.c b/clang/test/Misc/remap-file.c
@@ -4,5 +4,5 @@
 
 // CHECK-EXIST: remap-file.c:1:28: warning: incompatible pointer types
 // CHECK-NONEXIST: nonexistent.c:1:28: warning: incompatible pointer types
-// CHECK-HEADER: nonexistent.c:3:19: warning: incompatible pointer types
+// CHECK-HEADER: nonexistent.c:3:23: warning: incompatible pointer types
 int
diff --git a/clang/test/Misc/serialized-diags-driver.c b/clang/test/Misc/serialized-diags-driver.c
@@ -15,7 +15,7 @@
 // CHECK: note: initialize the variable 'voodoo' to silence this warning []
 // CHECK: Number of diagnostics: 2
 
-void foo() {
+void foo(void) {
   int voodoo;
   voodoo = voodoo + 1;
 }
diff --git a/clang/test/Misc/serialized-diags-no-issue.c b/clang/test/Misc/serialized-diags-no-issue.c
@@ -1,4 +1,4 @@
-void foo();
+void foo(void);
 
 // RUN: %clang -Wall -fsyntax-only %s --serialize-diagnostics %t
 // RUN: c-index-test -read-diagnostics %t 2>&1 | FileCheck %s

diff --git a/clang/test/Misc/serialized-diags-single-issue.c b/clang/test/Misc/serialized-diags-single-issue.c
@@ -1,4 +1,4 @@
-void foo() {
+void foo(void) {
   int voodoo;
   voodoo = voodoo + 1;
 }

diff --git a/clang/test/Misc/serialized-diags-stable.c b/clang/test/Misc/serialized-diags-stable.c
@@ -4,7 +4,7 @@
 
 // RUN: c-index-test -read-diagnostics %S/Inputs/serialized-diags-stable.dia 2>&1 | FileCheck %s
 
-int foo() {
+int foo(void) {
   // CHECK: serialized-diags-stable.c:[[@LINE+2]]:1: warning: non-void function does not return a value [-Wreturn-type] [Semantic Issue]
   // CHECK-NEXT: Number FIXITs = 0
 }
@@ -13,7 +13,7 @@ int foo() {
 // CHECK-NEXT: Number FIXITs = 0
 // CHECK-NEXT: +-{{.*}}serialized-diags-stable.c:[[@LINE+2]]:6: note: previous definition is here [] []
 // CHECK-NEXT: Number FIXITs = 0
-void bar() {}
+void bar(void) {}
 typedef int bar;
 
 

diff --git a/clang/test/Misc/serialized-diags.c b/clang/test/Misc/serialized-diags.c
@@ -1,15 +1,15 @@
-void foo() {
+void foo(void) {
   int voodoo;
   voodoo = voodoo + 1;
 }
 
-void bar() {
+void bar(void) {
   int dragon;
   dragon = dragon + 1
 }
 
 // Test handling of FixIts that only remove text.
-int baz();
+int baz(void);
 void qux(int x) {
   if ((x == baz()))
    return;
@@ -18,15 +18,15 @@ void qux(int x) {
 // Test handling of macros.
 void taz(int x, int y);
 #define false 0
-void testMacro() {
+void testMacro(void) {
   taz(0, 0, false);
 }
 
 // Test handling of issues from #includes.
 #include "serialized-diags.h"
 
 // Test handling of warnings that have empty fixits.
-void rdar11040133() {
+void rdar11040133(void) {
   unsigned x;
 }
 

diff --git a/clang/test/Misc/wrong-encoding.c b/clang/test/Misc/wrong-encoding.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -fsyntax-only -Wno-unused-value %s 2>&1 | FileCheck -strict-whitespace %s
 // REQUIRES: asserts
 
-void foo() {
+void foo(void) {
 
   "§Ã"; // ø
 // CHECK: {{^  "<A7><C3>"; // <F8>}}

diff --git a/clang/test/Misc/wrong-encoding2.c b/clang/test/Misc/wrong-encoding2.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -fsyntax-only -fmessage-length=100 %s 2>&1 | FileCheck -strict-whitespace %s
 // REQUIRES: asserts
 
-int main() {
+int main(void) {
     "É#x#p)6Ò)Ñ½Š$ûž>U êhÑüÃö|Ÿ à¦¥Ï»gŸY|`?ò;;Æ¿VjÇ\\ù€‡ûÝªW9úÐ¢:ÌŠO EøÛy?SKªy¦¹‡Øài&n";
 }