diff --git a/clang/test/OpenMP/taskloop_simd_misc_messages.c b/clang/test/OpenMP/taskloop_simd_misc_messages.c
@@ -17,7 +17,7 @@ void xxx(int argc) {
 // expected-error@+1 {{unexpected OpenMP directive '#pragma omp taskloop simd'}}
 #pragma omp taskloop simd foo
 
-void test_no_clause() {
+void test_no_clause(void) {
   int i;
 #pragma omp taskloop simd
   for (i = 0; i < 16; ++i)
@@ -28,7 +28,7 @@ void test_no_clause() {
   ++i;
 }
 
-void test_branch_protected_scope() {
+void test_branch_protected_scope(void) {
   int i = 0;
 L1:
   ++i;
@@ -56,7 +56,7 @@ void test_branch_protected_scope() {
     goto L1;
 }
 
-void test_invalid_clause() {
+void test_invalid_clause(void) {
   int i;
 #pragma omp parallel
 // expected-warning@+1 {{extra tokens at the end of '#pragma omp taskloop simd' are ignored}}
@@ -69,7 +69,7 @@ void test_invalid_clause() {
     ;
 }
 
-void test_non_identifiers() {
+void test_non_identifiers(void) {
   int i, x;
 
 #pragma omp parallel
@@ -96,9 +96,9 @@ void test_non_identifiers() {
     ;
 }
 
-extern int foo();
+extern int foo(void);
 
-void test_collapse() {
+void test_collapse(void) {
   int i;
 #pragma omp parallel
 // expected-error@+1 {{expected '('}}
@@ -206,7 +206,7 @@ void test_collapse() {
     ;
 }
 
-void test_private() {
+void test_private(void) {
   int i;
 #pragma omp parallel
 // expected-error@+2 {{expected expression}}
@@ -257,7 +257,7 @@ void test_private() {
   }
 }
 
-void test_lastprivate() {
+void test_lastprivate(void) {
   int i;
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
@@ -308,7 +308,7 @@ void test_lastprivate() {
     ;
 }
 
-void test_firstprivate() {
+void test_firstprivate(void) {
   int i;
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
@@ -363,7 +363,7 @@ void test_firstprivate() {
     ;
 }
 
-void test_loop_messages() {
+void test_loop_messages(void) {
   float a[100], b[100], c[100];
 #pragma omp parallel
 // expected-error@+2 {{variable must be of integer or pointer type}}
@@ -385,7 +385,7 @@ void test_loop_messages() {
   }
 }
 
-void test_nontemporal() {
+void test_nontemporal(void) {
   int i;
 // omp45-error@+1 {{unexpected OpenMP clause 'nontemporal' in directive '#pragma omp taskloop simd'}} expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
 #pragma omp taskloop simd nontemporal(

diff --git a/clang/test/OpenMP/vla_crash.c b/clang/test/OpenMP/vla_crash.c
@@ -5,7 +5,7 @@
 
 int a;
 
-void foo() {
+void foo(void) {
   int(*b)[a];
   int *(**c)[a];
 #pragma omp parallel if (0)

diff --git a/clang/test/PCH/Inputs/arc.h b/clang/test/PCH/Inputs/arc.h
@@ -3,16 +3,16 @@
 typedef const void *CFTypeRef;
 typedef const struct __CFString *CFStringRef;
 
-CFTypeRef CFCreateSomething();
-CFStringRef CFCreateString();
-CFTypeRef CFGetSomething();
-CFStringRef CFGetString();
+CFTypeRef CFCreateSomething(void);
+CFStringRef CFCreateString(void);
+CFTypeRef CFGetSomething(void);
+CFStringRef CFGetString(void);
 
 @interface NSString
 @end
 
-id CreateSomething();
-NSString *CreateNSString();
+id CreateSomething(void);
+NSString *CreateNSString(void);
 
 #if __has_feature(objc_arc)
 #define BRIDGE __bridge

diff --git a/clang/test/PCH/Inputs/chain-decls1.h b/clang/test/PCH/Inputs/chain-decls1.h
@@ -1,11 +1,11 @@
-void f();
+void f(void);
 
 struct one {};
-void two();
+void two(void);
 
 void many(int i);
 struct many;
 void many(int j);
 struct many;
 
-void noret();
+void noret(void);
diff --git a/clang/test/PCH/Inputs/chain-decls2.h b/clang/test/PCH/Inputs/chain-decls2.h
@@ -1,12 +1,12 @@
-void g();
+void g(void);
 
 struct two {};
-void one();
+void one(void);
 struct three {}; // for verification
 
 void many(int k);
 struct many;
 void many(int l);
 struct many {};
 
-void noret() __attribute__((noreturn));
+void noret(void) __attribute__((noreturn));
diff --git a/clang/test/PCH/Inputs/chain-macro-override1.h b/clang/test/PCH/Inputs/chain-macro-override1.h
@@ -1,5 +1,5 @@
-void f() __attribute__((unavailable));
-void g();
+void f(void) __attribute__((unavailable));
+void g(void);
 #define g() f()
 #define h() f()
 #define x x

diff --git a/clang/test/PCH/Inputs/chain-macro-override2.h b/clang/test/PCH/Inputs/chain-macro-override2.h
@@ -5,4 +5,4 @@
 int x;
 #undef h2
 
-int h3();
+int h3(void);
diff --git a/clang/test/PCH/Inputs/chain-macro1.h b/clang/test/PCH/Inputs/chain-macro1.h
@@ -1 +1 @@
-#define FOOBAR void f();
+#define FOOBAR void f(void);
diff --git a/clang/test/PCH/Inputs/chain-macro2.h b/clang/test/PCH/Inputs/chain-macro2.h
@@ -1 +1 @@
-#define BARFOO void g();
+#define BARFOO void g(void);
diff --git a/clang/test/PCH/Inputs/chain-selectors1.h b/clang/test/PCH/Inputs/chain-selectors1.h
@@ -5,7 +5,7 @@
   -(void)h:(int)p1 foo:(int)p2;
 @end
 
-void foo1() {
+void foo1(void) {
   // FIXME: Can't verify warnings in headers
   //(void)@selector(x);
   (void)@selector(f);

diff --git a/clang/test/PCH/Inputs/chain-selectors2.h b/clang/test/PCH/Inputs/chain-selectors2.h
@@ -6,7 +6,7 @@
   -(void)e;
 @end
 
-void foo2() {
+void foo2(void) {
   // FIXME: Can't verify warnings in headers
   //(void)@selector(y);
   //(void)@selector(e);

diff --git a/clang/test/PCH/asm.h b/clang/test/PCH/asm.h
@@ -1,6 +1,6 @@
 // Header for the PCH test asm.c
 
-void f() {
+void f(void) {
   int i,cond;
 
   asm ("foo\n" : : "a" (i + 2));
@@ -11,7 +11,7 @@ void f() {
   return;
 }
 
-void clobbers() {
+void clobbers(void) {
   asm ("nop" : : : "ax", "#ax", "%ax");
   asm ("nop" : : : "eax", "rax", "ah", "al");
   asm ("nop" : : : "0", "%0", "#0");

diff --git a/clang/test/PCH/attrs-PR8406.c b/clang/test/PCH/attrs-PR8406.c
@@ -16,7 +16,7 @@ struct Bar
 
 #else
 
-void foo() {
+void foo(void) {
   struct Bar bar;
 }
 

diff --git a/clang/test/PCH/attrs.c b/clang/test/PCH/attrs.c
@@ -16,6 +16,6 @@ int g(int) __attribute__((abi_tag("foo", "bar", "baz"), no_sanitize("address", "
 float f(float);
 double f(double); // expected-error{{overloadable}}
                   // expected-note@-2{{previous unmarked overload}}
-void h() { g(0); }
+void h(void) { g(0); }
 
 #endif
diff --git a/clang/test/PCH/builtins.c b/clang/test/PCH/builtins.c
@@ -7,6 +7,6 @@
 
 // expected-no-diagnostics
 
-void hello() {
+void hello(void) {
   printf("Hello, World!");
 }
diff --git a/clang/test/PCH/chain-decls.c b/clang/test/PCH/chain-decls.c
@@ -12,7 +12,7 @@
 // CHECK: void f();
 // CHECK: void g();
 
-int h() {
+int h(void) {
   f();
   g();
 

diff --git a/clang/test/PCH/chain-macro-override.c b/clang/test/PCH/chain-macro-override.c
@@ -6,7 +6,7 @@
 // RUN: %clang_cc1 -emit-pch -o %t2 %S/Inputs/chain-macro-override2.h -include-pch %t1 -detailed-preprocessing-record 
 // RUN: %clang_cc1 -include-pch %t2 -fsyntax-only -verify %s
 
-int foo() {
+int foo(void) {
   f();
   g();
   h();

diff --git a/clang/test/PCH/chain-selectors.m b/clang/test/PCH/chain-selectors.m
@@ -11,7 +11,7 @@ -(void)g: (int)p {}
 -(void)h: (int)p1 foo: (int)p2 {}
 @end
 
-void bar() {
+void bar(void) {
   id a = 0;
   [a nothing]; // expected-warning {{method '-nothing' not found}}
   [a f];

diff --git a/clang/test/PCH/debug-info-limited-struct.h b/clang/test/PCH/debug-info-limited-struct.h
@@ -2,7 +2,7 @@ struct foo {
   int i;
 };
 
-void func() {
+void func(void) {
   struct foo *f;
   f->i = 3;
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define FOOBAR void f();
		#define FOOBAR void f(void);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define BARFOO void g();
		#define BARFOO void g(void);
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ struct Bar @@
     #else
-    void foo() {
+    void foo(void) {
       struct Bar bar;
     }
@@ Expand Down @@