[clang] 1ea5843 - A significant number of our tests in C accidentally use functions

Aaron Ballman via cfe-commits cfe-commits at lists.llvm.org
Sun Feb 13 05:03:55 PST 2022


Author: Aaron Ballman
Date: 2022-02-13T08:03:40-05:00
New Revision: 1ea584377e7897f7df5302ed9cd378d17be14fbf

URL: https://github.com/llvm/llvm-project/commit/1ea584377e7897f7df5302ed9cd378d17be14fbf
DIFF: https://github.com/llvm/llvm-project/commit/1ea584377e7897f7df5302ed9cd378d17be14fbf.diff

LOG: A significant number of our tests in C accidentally use functions
without prototypes. This patch converts the function signatures to have
a prototype for the situations where the test is not specific to K&R C
declarations. e.g.,

  void func();

becomes

  void func(void);

This is the ninth batch of tests being updated (there are a
significant number of other tests left to be updated).

Added: 
    

Modified: 
    clang/test/Analysis/Inputs/expected-plists/unix-fns.c.plist
    clang/test/Analysis/exploded-graph-rewriter/escapes.c
    clang/test/Analysis/exploded-graph-rewriter/macros.c
    clang/test/Analysis/expr-inspection-printState-diseq-info.c
    clang/test/Analysis/expr-inspection-printState-eq-classes.c
    clang/test/Analysis/expr-inspection.c
    clang/test/Analysis/fields.c
    clang/test/Analysis/flexible-array-members.c
    clang/test/Analysis/flexignore.c
    clang/test/Analysis/free.c
    clang/test/Analysis/fuchsia_lock.c
    clang/test/Analysis/fuchsia_lock_impl.c
    clang/test/Analysis/func.c
    clang/test/Analysis/gcdantipatternchecker_test.m
    clang/test/Analysis/generics.m
    clang/test/Analysis/global-region-invalidation.c
    clang/test/Analysis/gmalloc.c
    clang/test/Analysis/hangs.c
    clang/test/Analysis/html-diag-singlefile.c
    clang/test/Analysis/html-diag-singlefile.h
    clang/test/Analysis/html-diags-analyze-headers.h
    clang/test/Analysis/html-diags-multifile.c
    clang/test/Analysis/html-diags.c
    clang/test/Analysis/html_diagnostics/relevant_lines/notexecutedlines.c
    clang/test/Analysis/html_diagnostics/td-hotfix.c
    clang/test/Analysis/html_diagnostics/variable-popups-macro.c
    clang/test/Analysis/html_diagnostics/variable-popups-multiple.c
    clang/test/Analysis/html_diagnostics/variable-popups-simple.c
    clang/test/Analysis/index-type.c
    clang/test/Analysis/initialization.c
    clang/test/Analysis/inline-not-supported.c
    clang/test/Analysis/inline-plist.c
    clang/test/Analysis/inline-unique-reports.c
    clang/test/Analysis/inline.c
    clang/test/Analysis/inline2.c
    clang/test/Analysis/inline3.c
    clang/test/Analysis/inlining/InlineObjCClassMethod.m
    clang/test/Analysis/inlining/InlineObjCInstanceMethod.m
    clang/test/Analysis/inlining/ObjCDynTypePopagation.m
    clang/test/Analysis/inlining/RetainCountExamples.m
    clang/test/Analysis/inlining/analysis-order.c
    clang/test/Analysis/inlining/eager-reclamation-path-notes.c
    clang/test/Analysis/inlining/false-positive-suppression.c
    clang/test/Analysis/inlining/false-positive-suppression.m
    clang/test/Analysis/inlining/inline-defensive-checks.m
    clang/test/Analysis/inlining/path-notes.c
    clang/test/Analysis/inlining/path-notes.m
    clang/test/Analysis/inlining/test-always-inline-size-option.c
    clang/test/Analysis/invalid-a-na-ly-zer-con-fig-value.c
    clang/test/Analysis/invalid-analyzer-config-value.c
    clang/test/Analysis/invalid-checker-option.c
    clang/test/Analysis/invalid-deref.c
    clang/test/Analysis/ivars.m
    clang/test/Analysis/keychainAPI-diagnostic-visitor.m
    clang/test/Analysis/keychainAPI.m
    clang/test/Analysis/kmalloc-linux.c
    clang/test/Analysis/live-variables.m
    clang/test/Analysis/localization-aggressive.m
    clang/test/Analysis/localization.m
    clang/test/Analysis/logical-ops.c
    clang/test/Analysis/loop-block-counts.c
    clang/test/Analysis/loop-widening.c
    clang/test/Analysis/main.c
    clang/test/Analysis/malloc-annotations.c
    clang/test/Analysis/malloc-custom.c
    clang/test/Analysis/malloc-fnptr-plist.c
    clang/test/Analysis/malloc-interprocedural.c
    clang/test/Analysis/malloc-overflow.c
    clang/test/Analysis/malloc-plist.c
    clang/test/Analysis/malloc-protoype.c
    clang/test/Analysis/malloc-sizeof.c
    clang/test/Analysis/malloc-three-arg.c
    clang/test/Analysis/malloc.c
    clang/test/Analysis/malloc.m
    clang/test/Analysis/max-nodes-suppress-on-sink.c
    clang/test/Analysis/misc-ps-arm.m
    clang/test/Analysis/misc-ps-eager-assume.m
    clang/test/Analysis/misc-ps-region-store-i386.m
    clang/test/Analysis/misc-ps-region-store-x86_64.m
    clang/test/Analysis/misc-ps-region-store.m
    clang/test/Analysis/misc-ps.c
    clang/test/Analysis/misc-ps.m
    clang/test/Analysis/mmap-writeexec.c
    clang/test/Analysis/nil-receiver-undefined-larger-than-voidptr-ret.m
    clang/test/Analysis/no-outofbounds.c
    clang/test/Analysis/non-diagnosable-assumptions.c
    clang/test/Analysis/nonnull.m
    clang/test/Analysis/null-deref-path-notes.c
    clang/test/Analysis/null-deref-path-notes.m
    clang/test/Analysis/null-deref-ps-region.c
    clang/test/Analysis/null-deref-ps.c
    clang/test/Analysis/null-deref-static.m
    clang/test/Analysis/nullability.m
    clang/test/Analysis/objc-arc.m
    clang/test/Analysis/objc-bool.m
    clang/test/Analysis/objc-boxing.m
    clang/test/Analysis/objc-for.m
    clang/test/Analysis/objc-indirect-copy-restore.m
    clang/test/Analysis/objc-message.m
    clang/test/Analysis/objc-method-coverage.m
    clang/test/Analysis/objc-radar17039661.m
    clang/test/Analysis/offsetofexpr-callback.c
    clang/test/Analysis/openmp-unsupported.c
    clang/test/Analysis/out-of-bounds-false-positive.c
    clang/test/Analysis/out-of-bounds.c
    clang/test/Analysis/outofbound.c
    clang/test/Analysis/padding_c.c
    clang/test/Analysis/plist-html-macros.c
    clang/test/Analysis/plist-macros-with-expansion-ctu.c
    clang/test/Analysis/plist-macros-with-expansion.c
    clang/test/Analysis/plist-output-alternate.m
    clang/test/Analysis/plist-output.m
    clang/test/Analysis/plist-stats-output.c
    clang/test/Analysis/pointer-arithmetic.c
    clang/test/Analysis/pointer-escape-on-conservative-calls.c
    clang/test/Analysis/pr22954.c
    clang/test/Analysis/pr_4164.c
    clang/test/Analysis/properties.m
    clang/test/Analysis/pthreadlock_state.c
    clang/test/Analysis/pthreadlock_state_nottracked.c
    clang/test/Analysis/ptr-arith.c
    clang/test/Analysis/range_casts.c
    clang/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m
    clang/test/Analysis/redefined_system.c
    clang/test/Analysis/region-store.c
    clang/test/Analysis/retain-release-arc.m
    clang/test/Analysis/retain-release-cf-audited.m
    clang/test/Analysis/retain-release-compound-literal.m
    clang/test/Analysis/retain-release-inline.m
    clang/test/Analysis/retain-release-path-notes.m
    clang/test/Analysis/retain-release-region-store.m
    clang/test/Analysis/retain-release-safe.c
    clang/test/Analysis/retain-release.m
    clang/test/Analysis/security-syntax-checks-no-emit.c
    clang/test/Analysis/security-syntax-checks.m
    clang/test/Analysis/simple-stream-checks.c
    clang/test/Analysis/solver-sym-simplification-adjustment.c
    clang/test/Analysis/solver-sym-simplification-concreteint.c
    clang/test/Analysis/solver-sym-simplification-no-crash2.c
    clang/test/Analysis/solver-sym-simplification-with-proper-range-type.c
    clang/test/Analysis/stack-addr-ps.c
    clang/test/Analysis/stackaddrleak.c
    clang/test/Analysis/static_local.m
    clang/test/Analysis/stats.c
    clang/test/Analysis/std-c-library-functions-POSIX-lookup.c
    clang/test/Analysis/std-c-library-functions-POSIX.c
    clang/test/Analysis/std-c-library-functions-arg-constraints-tracking-notes.c
    clang/test/Analysis/std-c-library-functions-arg-constraints.c
    clang/test/Analysis/std-c-library-functions-arg-weakdeps.c
    clang/test/Analysis/std-c-library-functions-lookup.c
    clang/test/Analysis/std-c-library-functions-restrict.c
    clang/test/Analysis/std-c-library-functions.c
    clang/test/Analysis/stream-error.c
    clang/test/Analysis/stream-note.c
    clang/test/Analysis/stream.c
    clang/test/Analysis/string-with-signedness.c
    clang/test/Analysis/string.c
    clang/test/Analysis/sval-dump-int128.c
    clang/test/Analysis/svalbuilder-float-cast.c
    clang/test/Analysis/svalbuilder-logic.c
    clang/test/Analysis/svalbuilder-rearrange-comparisons.c
    clang/test/Analysis/switch-case.c
    clang/test/Analysis/symbol-reaper.c
    clang/test/Analysis/taint-diagnostic-visitor.c
    clang/test/Analysis/taint-dumps.c
    clang/test/Analysis/taint-generic.c
    clang/test/Analysis/taint-tester.c
    clang/test/Analysis/test-after-div-zero.c
    clang/test/Analysis/test-include.c
    clang/test/Analysis/track-control-dependency-conditions.m
    clang/test/Analysis/transparent_union_bug.c
    clang/test/Analysis/traversal-begin-end-function.c
    clang/test/Analysis/traversal-path-unification.c
    clang/test/Analysis/trustnonnullchecker_test.m
    clang/test/Analysis/undef-buffers.c
    clang/test/Analysis/undef-call.c
    clang/test/Analysis/uninit-bug-first-iteration-init.c
    clang/test/Analysis/uninit-const.c
    clang/test/Analysis/uninit-exhaustive-switch-bug.c
    clang/test/Analysis/uninit-vals-union.c
    clang/test/Analysis/uninit-vals.c
    clang/test/Analysis/uninit-vals.m
    clang/test/Analysis/unix-fns.c
    clang/test/Analysis/unreachable-code-path.c
    clang/test/Analysis/unused-ivars.m
    clang/test/Analysis/vector.m
    clang/test/Analysis/vfork.c
    clang/test/Analysis/vla-overflow.c
    clang/test/Analysis/vla.c
    clang/test/Analysis/weak-functions.c
    clang/test/Analysis/yaccignore.c
    clang/test/Analysis/z3/apsint.c
    clang/test/CodeGen/2002-01-24-ComplexSpaceInType.c
    clang/test/CodeGen/2002-02-13-TypeVarNameCollision.c
    clang/test/CodeGen/2002-02-13-UnnamedLocal.c
    clang/test/CodeGen/2002-02-17-ArgumentAddress.c
    clang/test/CodeGen/2002-02-18-64bitConstant.c
    clang/test/CodeGen/2002-03-14-BrokenSSA.c
    clang/test/CodeGen/2002-03-14-QuotesInStrConst.c
    clang/test/CodeGen/2002-04-07-SwitchStmt.c
    clang/test/CodeGen/2002-05-23-StaticValues.c
    clang/test/CodeGen/2002-06-25-FWriteInterfaceFailure.c
    clang/test/CodeGen/2002-07-14-MiscListTests.c
    clang/test/CodeGen/2002-07-17-StringConstant.c
    clang/test/CodeGen/2002-07-30-SubregSetAssertion.c
    clang/test/CodeGen/2002-07-30-VarArgsCallFailure.c
    clang/test/CodeGen/2002-07-31-SubregFailure.c
    clang/test/CodeGen/2002-08-02-UnionTest.c
    clang/test/CodeGen/2002-09-19-StarInLabel.c
    clang/test/CodeGen/2002-10-12-TooManyArguments.c
    clang/test/CodeGen/2002-12-15-StructParameters.c
    clang/test/CodeGen/2003-06-26-CFECrash.c
    clang/test/CodeGen/2003-06-29-MultipleFunctionDefinition.c
    clang/test/CodeGen/2003-08-18-SigSetJmp.c
    clang/test/CodeGen/2003-08-20-BadBitfieldRef.c
    clang/test/CodeGen/2003-08-20-PrototypeMismatch.c
    clang/test/CodeGen/2003-08-21-BinOp-Type-Mismatch.c
    clang/test/CodeGen/2003-08-21-StmtExpr.c
    clang/test/CodeGen/2003-08-29-BitFieldStruct.c
    clang/test/CodeGen/2003-08-29-HugeCharConst.c
    clang/test/CodeGen/2003-10-29-AsmRename.c
    clang/test/CodeGen/2003-11-01-EmptyStructCrash.c
    clang/test/CodeGen/2003-11-16-StaticArrayInit.c
    clang/test/CodeGen/2003-11-20-ComplexDivision.c
    clang/test/CodeGen/2003-11-20-UnionBitfield.c
    clang/test/CodeGen/2003-12-14-ExternInlineSupport.c
    clang/test/CodeGen/2004-02-12-LargeAggregateCopy.c
    clang/test/CodeGen/2004-02-13-BuiltinFrameReturnAddress.c
    clang/test/CodeGen/2004-03-07-ExternalConstant.c
    clang/test/CodeGen/2004-03-15-SimpleIndirectGoto.c
    clang/test/CodeGen/2004-03-16-AsmRegisterCrash.c
    clang/test/CodeGen/2004-06-08-OpaqueStructArg.c
    clang/test/CodeGen/2004-11-27-StaticFunctionRedeclare.c
    clang/test/CodeGen/2005-01-02-ConstantInits.c
    clang/test/CodeGen/2005-02-27-MarkGlobalConstant.c
    clang/test/CodeGen/2005-03-06-OffsetOfStructCrash.c
    clang/test/CodeGen/2005-06-15-ExpandGotoInternalProblem.c
    clang/test/CodeGen/2005-07-28-IncorrectWeakGlobal.c
    clang/test/CodeGen/2005-09-24-AsmUserPrefix.c
    clang/test/CodeGen/2005-12-04-AttributeUsed.c
    clang/test/CodeGen/2006-01-13-Includes.c
    clang/test/CodeGen/2006-03-03-MissingInitializer.c
    clang/test/CodeGen/2006-05-19-SingleEltReturn.c
    clang/test/CodeGen/2006-09-28-SimpleAsm.c
    clang/test/CodeGen/2006-10-30-ArrayCrash.c
    clang/test/CodeGen/2007-01-24-InlineAsmCModifier.c
    clang/test/CodeGen/2007-02-07-AddrLabel.c
    clang/test/CodeGen/2007-04-05-PackedBitFields-2.c
    clang/test/CodeGen/2007-04-05-PackedBitFields.c
    clang/test/CodeGen/2007-04-05-PackedStruct.c
    clang/test/CodeGen/2007-04-05-UnPackedStruct.c
    clang/test/CodeGen/2007-04-11-InlineAsmStruct.c
    clang/test/CodeGen/2007-04-11-InlineAsmUnion.c
    clang/test/CodeGen/2007-04-13-InlineAsmStruct2.c
    clang/test/CodeGen/2007-04-13-InlineAsmUnion2.c
    clang/test/CodeGen/2007-05-08-PCH.c
    clang/test/CodeGen/2007-06-15-AnnotateAttribute.c
    clang/test/CodeGen/2007-08-01-LoadStoreAlign.c
    clang/test/CodeGen/2007-08-21-ComplexCst.c
    clang/test/CodeGen/2007-09-05-ConstCtor.c
    clang/test/CodeGen/2007-09-27-ComplexIntCompare.c
    clang/test/CodeGen/2007-09-28-PackedUnionMember.c
    clang/test/CodeGen/2007-10-30-Volatile.c
    clang/test/CodeGen/2007-11-07-AlignedMemcpy.c
    clang/test/CodeGen/2007-11-07-CopyAggregateAlign.c
    clang/test/CodeGen/2007-11-07-ZeroAggregateAlign.c
    clang/test/CodeGen/2007-12-16-AsmNoUnwind.c
    clang/test/CodeGen/2008-01-21-PackedBitFields.c
    clang/test/CodeGen/2008-02-26-inline-asm-bug.c
    clang/test/CodeGen/2008-05-12-TempUsedBeforeDef.c
    clang/test/CodeGen/2008-07-17-no-emit-on-error.c
    clang/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
    clang/test/CodeGen/2008-07-22-packed-bitfield-access.c
    clang/test/CodeGen/2008-07-29-override-alias-decl.c
    clang/test/CodeGen/2008-07-30-implicit-initialization.c
    clang/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
    clang/test/CodeGen/2008-07-31-asm-labels.c
    clang/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
    clang/test/CodeGen/2009-02-13-zerosize-union-field.c
    clang/test/CodeGen/2009-03-13-dbg.c
    clang/test/CodeGen/2009-04-23-dbg.c
    clang/test/CodeGen/2009-05-22-callingconv.c
    clang/test/CodeGen/2009-06-14-HighlyAligned.c
    clang/test/CodeGen/2009-07-15-pad-wchar_t-array.c
    clang/test/CodeGen/2009-07-31-DbgDeclare.c
    clang/test/CodeGen/2009-10-20-GlobalDebug.c
    clang/test/CodeGen/2010-02-10-PointerName.c
    clang/test/CodeGen/2010-02-15-DbgStaticVar.c
    clang/test/CodeGen/2010-02-16-DbgScopes.c
    clang/test/CodeGen/2010-02-18-Dbg-VectorType.c
    clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c
    clang/test/CodeGen/2010-08-10-DbgConstant.c
    clang/test/CodeGen/OpaqueStruct.c
    clang/test/CodeGen/PR2001-bitfield-reload.c
    clang/test/CodeGen/PR2413-void-address-cast-error.c
    clang/test/CodeGen/PR2643-null-store-to-bitfield.c
    clang/test/CodeGen/PR2743-reference-missing-static.c
    clang/test/CodeGen/PR32874.c
    clang/test/CodeGen/PR3589-freestanding-libcalls.c
    clang/test/CodeGen/PR3709-int-to-pointer-sign.c
    clang/test/CodeGen/PowerPC/aix-constructor-attribute.c
    clang/test/CodeGen/PowerPC/aix-destructor-attribute.c
    clang/test/CodeGen/PowerPC/aix_alloca_align.c
    clang/test/CodeGen/PowerPC/altivec.c
    clang/test/CodeGen/PowerPC/builtins-ppc-p9-f128.c
    clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-math.c
    clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-stfiw.c
    clang/test/CodeGen/PowerPC/ppc-sfvarargs.c
    clang/test/CodeGen/PowerPC/ppc32-dwarf.c
    clang/test/CodeGen/PowerPC/ppc64-dwarf.c
    clang/test/CodeGen/PowerPC/ppc64-f128-builtins.c
    clang/test/CodeGen/PowerPC/ppc64le-aggregates.c
    clang/test/CodeGen/PowerPC/vector-bool-pixel-altivec-init-no-parentheses.c
    clang/test/CodeGen/PowerPC/vector-bool-pixel-altivec-init.c
    clang/test/CodeGen/RISCV/riscv-inline-asm.c
    clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c
    clang/test/CodeGen/RISCV/riscv32-ilp32-ilp32f-ilp32d-abi.c
    clang/test/CodeGen/RISCV/riscv32-ilp32d-abi.c
    clang/test/CodeGen/RISCV/riscv32-ilp32f-abi.c
    clang/test/CodeGen/RISCV/riscv32-ilp32f-ilp32d-abi.c
    clang/test/CodeGen/RISCV/riscv64-lp64-abi.c
    clang/test/CodeGen/RISCV/riscv64-lp64-lp64f-lp64d-abi.c
    clang/test/CodeGen/RISCV/riscv64-lp64d-abi.c
    clang/test/CodeGen/RISCV/riscv64-lp64f-lp64d-abi.c
    clang/test/CodeGen/RISCV/rvv_errors.c
    clang/test/CodeGen/SystemZ/s390x-packed-struct-func-arg.c
    clang/test/CodeGen/SystemZ/systemz-inline-asm.c
    clang/test/CodeGen/SystemZ/zos-alignment.c
    clang/test/CodeGen/WebAssembly/wasm-arguments.c
    clang/test/CodeGen/X86/avx-builtins.c
    clang/test/CodeGen/X86/avx-union.c
    clang/test/CodeGen/X86/avx512-inline-asm-kregisters-basics.c
    clang/test/CodeGen/X86/avx512f-builtins.c
    clang/test/CodeGen/X86/avx512fp16-abi.c
    clang/test/CodeGen/X86/avx512fp16-builtins.c
    clang/test/CodeGen/X86/cetintrin.c
    clang/test/CodeGen/X86/fsgsbase-builtins.c
    clang/test/CodeGen/X86/lwp-builtins.c
    clang/test/CodeGen/X86/pause.c
    clang/test/CodeGen/X86/pku.c
    clang/test/CodeGen/X86/rd-builtins.c
    clang/test/CodeGen/X86/sse-builtins.c
    clang/test/CodeGen/X86/sse2-builtins.c
    clang/test/CodeGen/X86/x86-64-inline-asm.c
    clang/test/CodeGen/X86/x86-ssc-mark.c
    clang/test/CodeGen/X86/x86-tsxldtrk-builtins.c
    clang/test/CodeGen/X86/x86-uintr-builtins.c
    clang/test/CodeGen/X86/x86-vector-width.c
    clang/test/CodeGen/X86/x86.c
    clang/test/CodeGen/X86/x86_32-arguments-darwin.c
    clang/test/CodeGen/X86/x86_32-arguments-win32.c
    clang/test/CodeGen/X86/x86_32-inline-asm.c
    clang/test/CodeGen/X86/x86_32-xsave.c
    clang/test/CodeGen/X86/x86_64-PR42672.c
    clang/test/CodeGen/X86/x86_64-arguments-darwin.c
    clang/test/CodeGen/X86/x86_64-arguments-nacl.c
    clang/test/CodeGen/X86/x86_64-arguments-win32.c
    clang/test/CodeGen/X86/x86_64-arguments.c
    clang/test/CodeGen/X86/x86_64-mno-sse2.c
    clang/test/CodeGen/X86/x86_64-xsave.c
    clang/test/CodeGen/X86/x86_inlineasm_curly_bracket_escape.c
    clang/test/CodeGenCXX/debug-info-composite-triviality-fwd-decl.cpp
    clang/test/CodeGenCoroutines/coro-builtins-err.c
    clang/test/CodeGenOpenCL/func-call-dbg-loc.cl
    clang/test/CodeGenOpenCL/null_queue.cl

Removed: 
    


################################################################################
diff  --git a/clang/test/Analysis/Inputs/expected-plists/unix-fns.c.plist b/clang/test/Analysis/Inputs/expected-plists/unix-fns.c.plist
index 3063969432b39..2594f3b6d097d 100644
--- a/clang/test/Analysis/Inputs/expected-plists/unix-fns.c.plist
+++ b/clang/test/Analysis/Inputs/expected-plists/unix-fns.c.plist
@@ -561,7 +561,7 @@
    <key>type</key><string>Improper use of 'dispatch_once'</string>
    <key>check_name</key><string>osx.API</string>
    <!-- This hash is experimental and going to change! -->
-   <key>issue_hash_content_of_line_in_context</key><string>173fbcac3fc64dbaec32768d4cfda250</string>
+   <key>issue_hash_content_of_line_in_context</key><string>3c7c4524233ba46b615e7c4c2ce7c20d</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>test_dispatch_once</string>
   <key>issue_hash_function_offset</key><string>2</string>
@@ -1473,7 +1473,7 @@
    <key>type</key><string>Improper use of 'dispatch_once'</string>
    <key>check_name</key><string>osx.API</string>
    <!-- This hash is experimental and going to change! -->
-   <key>issue_hash_content_of_line_in_context</key><string>8ded1f2025c1e4a4bcd5302dc97006d9</string>
+   <key>issue_hash_content_of_line_in_context</key><string>6fec229f3dde6d311481c6a64eeffefa</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>test_dispatch_once_in_macro</string>
   <key>issue_hash_function_offset</key><string>2</string>

diff  --git a/clang/test/Analysis/exploded-graph-rewriter/escapes.c b/clang/test/Analysis/exploded-graph-rewriter/escapes.c
index 563f1223a3dc1..5fdf9c3e12691 100644
--- a/clang/test/Analysis/exploded-graph-rewriter/escapes.c
+++ b/clang/test/Analysis/exploded-graph-rewriter/escapes.c
@@ -5,7 +5,7 @@
 // RUN: %exploded_graph_rewriter %t.dot | FileCheck %s
 // REQUIRES: asserts
 
-void escapes() {
+void escapes(void) {
   // CHECK: <td align="left"><b>Store: </b> <font color="gray">(0x{{[0-9a-f]*}})</font></td>
   // CHECK-SAME: <td align="left">foo</td><td align="left">0</td>
   // CHECK-SAME: <td align="left">&Element\{"foo",0 S64b,char\}</td>

diff  --git a/clang/test/Analysis/exploded-graph-rewriter/macros.c b/clang/test/Analysis/exploded-graph-rewriter/macros.c
index 39a6dc70ac2f9..5ae53471561b0 100644
--- a/clang/test/Analysis/exploded-graph-rewriter/macros.c
+++ b/clang/test/Analysis/exploded-graph-rewriter/macros.c
@@ -1,5 +1,5 @@
 #define NULL 0
-void *foo() {
+void *foo(void) {
   return NULL;
 }
 

diff  --git a/clang/test/Analysis/expr-inspection-printState-diseq-info.c b/clang/test/Analysis/expr-inspection-printState-diseq-info.c
index 8db3722a8f263..c5c31785a600e 100644
--- a/clang/test/Analysis/expr-inspection-printState-diseq-info.c
+++ b/clang/test/Analysis/expr-inspection-printState-diseq-info.c
@@ -1,7 +1,7 @@
 // RUN: %clang_analyze_cc1 \
 // RUN:  -analyzer-checker=debug.ExprInspection %s 2>&1 | FileCheck %s
 
-void clang_analyzer_printState();
+void clang_analyzer_printState(void);
 
 void test_disequality_info(int e0, int b0, int b1, int c0) {
   int e1 = e0 - b0;

diff  --git a/clang/test/Analysis/expr-inspection-printState-eq-classes.c b/clang/test/Analysis/expr-inspection-printState-eq-classes.c
index 08a1c6cbd60b4..38e23d6e83826 100644
--- a/clang/test/Analysis/expr-inspection-printState-eq-classes.c
+++ b/clang/test/Analysis/expr-inspection-printState-eq-classes.c
@@ -1,7 +1,7 @@
 // RUN: %clang_analyze_cc1 \
 // RUN:  -analyzer-checker=debug.ExprInspection %s 2>&1 | FileCheck %s
 
-void clang_analyzer_printState();
+void clang_analyzer_printState(void);
 
 void test_equivalence_classes(int a, int b, int c, int d) {
   if (a + b != c)

diff  --git a/clang/test/Analysis/expr-inspection.c b/clang/test/Analysis/expr-inspection.c
index d94d1d0788662..bd05b2b3c3251 100644
--- a/clang/test/Analysis/expr-inspection.c
+++ b/clang/test/Analysis/expr-inspection.c
@@ -6,8 +6,8 @@
 
 void clang_analyzer_dump(int x);
 void clang_analyzer_dump_pointer(int *p);
-void clang_analyzer_printState();
-void clang_analyzer_numTimesReached();
+void clang_analyzer_printState(void);
+void clang_analyzer_numTimesReached(void);
 
 void foo(int x) {
   clang_analyzer_dump(x); // expected-warning{{reg_$0<int x>}}

diff  --git a/clang/test/Analysis/fields.c b/clang/test/Analysis/fields.c
index 1aa4840742088..8d2e7ac9b47ce 100644
--- a/clang/test/Analysis/fields.c
+++ b/clang/test/Analysis/fields.c
@@ -2,9 +2,9 @@
 
 void clang_analyzer_eval(int);
 
-unsigned foo();
+unsigned foo(void);
 typedef struct bf { unsigned x:2; } bf;
-void bar() {
+void bar(void) {
   bf y;
   *(unsigned*)&y = foo();
   y.x = 1;
@@ -14,7 +14,7 @@ struct s {
   int n;
 };
 
-void f() {
+void f(void) {
   struct s a;
   int *p = &(a.n) + 1; // expected-warning{{Pointer arithmetic on}}
 }
@@ -24,7 +24,7 @@ typedef struct {
 } Point;
 
 Point getit(void);
-void test() {
+void test(void) {
   Point p;
   (void)(p = getit()).x;
 }
@@ -34,7 +34,7 @@ void test() {
 typedef _Bool bool;
 
 
-void testLazyCompoundVal() {
+void testLazyCompoundVal(void) {
   Point p = {42, 0};
   Point q;
   clang_analyzer_eval((q = p).x == 42); // expected-warning{{TRUE}}
@@ -58,7 +58,7 @@ struct Bits {
   } inner;
 };
 
-void testBitfields() {
+void testBitfields(void) {
   struct Bits bits;
 
   if (foo() && bits.b) // expected-warning {{garbage}}
@@ -89,7 +89,7 @@ void testBitfields() {
   if (foo() && bits.inner.f) // expected-warning {{garbage}}
     return;
 
-  extern struct InnerBits getInner();
+  extern struct InnerBits getInner(void);
   bits.inner = getInner();
   
   if (foo() && bits.inner.e) // no-warning
@@ -117,7 +117,7 @@ void testBitfields() {
 // Incorrect behavior
 //-----------------------------------------------------------------------------
 
-void testTruncation() {
+void testTruncation(void) {
   struct Bits bits;
   bits.c = 0x11; // expected-warning{{implicit truncation}}
   // FIXME: We don't model truncation of bitfields.

diff  --git a/clang/test/Analysis/flexible-array-members.c b/clang/test/Analysis/flexible-array-members.c
index 2c11910fa876e..e69bf0d9c0054 100644
--- a/clang/test/Analysis/flexible-array-members.c
+++ b/clang/test/Analysis/flexible-array-members.c
@@ -22,7 +22,7 @@ void *alloca(size_t size);
 void *malloc(size_t size);
 void free(void *ptr);
 
-void test_incomplete_array_fam() {
+void test_incomplete_array_fam(void) {
   typedef struct FAM {
     char c;
     int data[];
@@ -48,7 +48,7 @@ void test_incomplete_array_fam() {
   free(q);
 }
 
-void test_zero_length_array_fam() {
+void test_zero_length_array_fam(void) {
   typedef struct FAM {
     char c;
     int data[0];
@@ -74,7 +74,7 @@ void test_zero_length_array_fam() {
   free(q);
 }
 
-void test_single_element_array_possible_fam() {
+void test_single_element_array_possible_fam(void) {
   typedef struct FAM {
     char c;
     int data[1];

diff  --git a/clang/test/Analysis/flexignore.c b/clang/test/Analysis/flexignore.c
index 8f2ad6da9b326..ae2b00d169496 100644
--- a/clang/test/Analysis/flexignore.c
+++ b/clang/test/Analysis/flexignore.c
@@ -8,7 +8,7 @@
 
 /* A lexical scanner generated by flex */
 
-void clang_analyzer_warnIfReached();
-void foo() {
+void clang_analyzer_warnIfReached(void);
+void foo(void) {
   clang_analyzer_warnIfReached(); // conditional-warning {{REACHABLE}}
 }

diff  --git a/clang/test/Analysis/free.c b/clang/test/Analysis/free.c
index 59767b5917d79..d74f28ab9b9b5 100644
--- a/clang/test/Analysis/free.c
+++ b/clang/test/Analysis/free.c
@@ -10,21 +10,21 @@ typedef __typeof(sizeof(int)) size_t;
 void free(void *);
 void *alloca(size_t);
 
-void t1 () {
+void t1 (void) {
   int a[] = { 1 };
   free(a);
   // expected-warning at -1{{Argument to free() is the address of the local variable 'a', which is not memory allocated by malloc()}}
   // expected-warning at -2{{attempt to call free on non-heap object 'a'}}
 }
 
-void t2 () {
+void t2 (void) {
   int a = 1;
   free(&a);
   // expected-warning at -1{{Argument to free() is the address of the local variable 'a', which is not memory allocated by malloc()}}
   // expected-warning at -2{{attempt to call free on non-heap object 'a'}}
 }
 
-void t3 () {
+void t3 (void) {
   static int a[] = { 1 };
   free(a);
   // expected-warning at -1{{Argument to free() is the address of the static variable 'a', which is not memory allocated by malloc()}}
@@ -35,12 +35,12 @@ void t4 (char *x) {
   free(x); // no-warning
 }
 
-void t5 () {
-  extern char *ptr();
+void t5 (void) {
+  extern char *ptr(void);
   free(ptr()); // no-warning
 }
 
-void t6 () {
+void t6 (void) {
   free((void*)1000);
   // expected-warning at -1{{Argument to free() is a constant address (1000), which is not memory allocated by malloc()}}
   // expected-warning at -2{{attempt to call free on non-heap object '(void *)1000'}}
@@ -55,30 +55,30 @@ void t8 (char **x) {
   free((*x)+8); // no-warning
 }
 
-void t9 () {
+void t9 (void) {
 label:
   free(&&label);
   // expected-warning at -1{{Argument to free() is the address of the label 'label', which is not memory allocated by malloc()}}
   // expected-warning at -2{{attempt to call free on non-heap object 'label'}}
 }
 
-void t10 () {
+void t10 (void) {
   free((void*)&t10);
   // expected-warning at -1{{Argument to free() is the address of the function 't10', which is not memory allocated by malloc()}}
   // expected-warning at -2{{attempt to call free on non-heap object 't10'}}
 }
 
-void t11 () {
+void t11 (void) {
   char *p = (char*)alloca(2);
   free(p); // expected-warning {{Memory allocated by alloca() should not be deallocated}}
 }
 
-void t12 () {
+void t12 (void) {
   char *p = (char*)__builtin_alloca(2);
   free(p); // expected-warning {{Memory allocated by alloca() should not be deallocated}}
 }
 
-void t13 () {
+void t13 (void) {
   free(^{return;});
   // expected-warning at -1{{Argument to free() is a block, which is not memory allocated by malloc()}}
   // expected-warning at -2{{attempt to call free on non-heap object: block expression}}
@@ -91,7 +91,7 @@ void t14 (char a) {
 }
 
 static int someGlobal[2];
-void t15 () {
+void t15 (void) {
   free(someGlobal);
   // expected-warning at -1{{Argument to free() is the address of the global variable 'someGlobal', which is not memory allocated by malloc()}}
   // expected-warning at -2{{attempt to call free on non-heap object 'someGlobal'}}

diff  --git a/clang/test/Analysis/fuchsia_lock.c b/clang/test/Analysis/fuchsia_lock.c
index 944220f89f2b1..2067b606f7517 100644
--- a/clang/test/Analysis/fuchsia_lock.c
+++ b/clang/test/Analysis/fuchsia_lock.c
@@ -29,7 +29,7 @@ void bad2(void) {
   spin_unlock(&mtx1); // expected-warning {{This lock has already been unlocked}}
 }
 
-void bad3() {
+void bad3(void) {
   spin_lock_init(&mtx1);
   if (spin_trylock(&mtx1) != 0)
     spin_unlock(&mtx1); // expected-warning {{This lock has already been unlocked}}
@@ -42,14 +42,14 @@ void bad4(void) {
   spin_unlock(&mtx2);
 }
 
-void good() {
+void good(void) {
   spin_lock_t mtx;
   spin_lock_init(&mtx);
   spin_lock_save(&mtx, 0, 0);
   spin_unlock_restore(&mtx, 0, 0);
 }
 
-void good2() {
+void good2(void) {
   spin_lock_t mtx;
   spin_lock_init(&mtx);
   if (spin_trylock(&mtx) == 0)
@@ -78,7 +78,7 @@ void bad12(void) {
   sync_mutex_unlock(&smtx1); // expected-warning {{This lock has already been unlocked}}
 }
 
-void bad13() {
+void bad13(void) {
   sync_mutex_unlock(&smtx1);
   if (sync_mutex_trylock(&smtx1) != 0)
     sync_mutex_unlock(&smtx1); // expected-warning {{This lock has already been unlocked}}
@@ -91,13 +91,13 @@ void bad14(void) {
   sync_mutex_unlock(&smtx2);
 }
 
-void good11() {
+void good11(void) {
   sync_mutex_t mtx;
   if (sync_mutex_trylock(&mtx) == 0)
     sync_mutex_unlock(&mtx);
 }
 
-void good12() {
+void good12(void) {
   sync_mutex_t mtx;
   if (sync_mutex_timedlock(&mtx, 0) == 0)
     sync_mutex_unlock(&mtx);

diff  --git a/clang/test/Analysis/fuchsia_lock_impl.c b/clang/test/Analysis/fuchsia_lock_impl.c
index 03b4a6390a695..c7fb7ade7610c 100644
--- a/clang/test/Analysis/fuchsia_lock_impl.c
+++ b/clang/test/Analysis/fuchsia_lock_impl.c
@@ -3,7 +3,7 @@
 typedef int spin_lock_t;
 
 void spin_lock(spin_lock_t *lock);
-int getCond();
+int getCond(void);
 int spin_trylock(spin_lock_t *lock) {
     if (getCond())
         return 0;
@@ -12,7 +12,7 @@ int spin_trylock(spin_lock_t *lock) {
 void spin_unlock(spin_lock_t *lock);
 
 spin_lock_t mtx;
-void no_crash() {
+void no_crash(void) {
   if (spin_trylock(&mtx) == 0)
     spin_unlock(&mtx);
 }

diff  --git a/clang/test/Analysis/func.c b/clang/test/Analysis/func.c
index 44d09f4989921..7fea41d1f0652 100644
--- a/clang/test/Analysis/func.c
+++ b/clang/test/Analysis/func.c
@@ -1,7 +1,7 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.core,debug.ExprInspection -analyzer-store=region -verify -analyzer-config eagerly-assume=false %s
 
 void clang_analyzer_eval(int);
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 
 void f(void) {
   void (*p)(void);
@@ -13,7 +13,7 @@ void f(void) {
 
 void g(void (*fp)(void));
 
-void f2() {
+void f2(void) {
   g(f);
 }
 
@@ -27,7 +27,7 @@ void f3(void (*f)(void), void (*g)(void)) {
   clang_analyzer_eval(!g); // expected-warning{{FALSE}}
 }
 
-void nullFunctionPointerConstant() {
+void nullFunctionPointerConstant(void) {
   void (*f)(void) = 0;
   f(); // expected-warning{{Called function pointer is null}}
   clang_analyzer_warnIfReached(); // no-warning

diff  --git a/clang/test/Analysis/gcdantipatternchecker_test.m b/clang/test/Analysis/gcdantipatternchecker_test.m
index 24ffe8975dd9e..1d7ecfc1aca93 100644
--- a/clang/test/Analysis/gcdantipatternchecker_test.m
+++ b/clang/test/Analysis/gcdantipatternchecker_test.m
@@ -11,10 +11,10 @@ -(id)retain;
 
 typedef int dispatch_semaphore_t;
 typedef int dispatch_group_t;
-typedef void (^block_t)();
+typedef void (^block_t)(void);
 
 dispatch_semaphore_t dispatch_semaphore_create(int);
-dispatch_group_t dispatch_group_create();
+dispatch_group_t dispatch_group_create(void);
 void dispatch_group_enter(dispatch_group_t);
 void dispatch_group_leave(dispatch_group_t);
 void dispatch_group_wait(dispatch_group_t, int);
@@ -26,9 +26,9 @@ -(id)retain;
 void func(void (^)(void));
 void func_w_typedef(block_t);
 
-int coin();
+int coin(void);
 
-void use_semaphor_antipattern() {
+void use_semaphor_antipattern(void) {
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
 
   func(^{
@@ -39,7 +39,7 @@ void use_semaphor_antipattern() {
 
 // It's OK to use pattern in tests.
 // We simply match the containing function name against ^test.
-void test_no_warning() {
+void test_no_warning(void) {
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
 
   func(^{
@@ -48,7 +48,7 @@ void test_no_warning() {
   dispatch_semaphore_wait(sema, 100);
 }
 
-void use_semaphor_antipattern_multiple_times() {
+void use_semaphor_antipattern_multiple_times(void) {
   dispatch_semaphore_t sema1 = dispatch_semaphore_create(0);
 
   func(^{
@@ -64,7 +64,7 @@ void use_semaphor_antipattern_multiple_times() {
   dispatch_semaphore_wait(sema2, 100); // expected-warning{{Waiting on a callback using a semaphore}}
 }
 
-void use_semaphor_antipattern_multiple_wait() {
+void use_semaphor_antipattern_multiple_wait(void) {
   dispatch_semaphore_t sema1 = dispatch_semaphore_create(0);
 
   func(^{
@@ -75,7 +75,7 @@ void use_semaphor_antipattern_multiple_wait() {
   dispatch_semaphore_wait(sema1, 100); // expected-warning{{Waiting on a callback using a semaphore}}
 }
 
-void warn_incorrect_order() {
+void warn_incorrect_order(void) {
   // FIXME: ASTMatchers do not allow ordered matching, so would match even
   // if out of order.
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
@@ -86,7 +86,7 @@ void warn_incorrect_order() {
   });
 }
 
-void warn_w_typedef() {
+void warn_w_typedef(void) {
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
 
   func_w_typedef(^{
@@ -95,7 +95,7 @@ void warn_w_typedef() {
   dispatch_semaphore_wait(sema, 100); // expected-warning{{Waiting on a callback using a semaphore}}
 }
 
-void warn_nested_ast() {
+void warn_nested_ast(void) {
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
 
   if (coin()) {
@@ -110,7 +110,7 @@ void warn_nested_ast() {
   dispatch_semaphore_wait(sema, 100); // expected-warning{{Waiting on a callback using a semaphore}}
 }
 
-void use_semaphore_assignment() {
+void use_semaphore_assignment(void) {
   dispatch_semaphore_t sema;
   sema = dispatch_semaphore_create(0);
 
@@ -120,7 +120,7 @@ void use_semaphore_assignment() {
   dispatch_semaphore_wait(sema, 100); // expected-warning{{Waiting on a callback using a semaphore}}
 }
 
-void use_semaphore_assignment_init() {
+void use_semaphore_assignment_init(void) {
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
   sema = dispatch_semaphore_create(1);
 
@@ -130,7 +130,7 @@ void use_semaphore_assignment_init() {
   dispatch_semaphore_wait(sema, 100); // expected-warning{{Waiting on a callback using a semaphore}}
 }
 
-void 
diff erentsemaphoreok() {
+void 
diff erentsemaphoreok(void) {
   dispatch_semaphore_t sema1 = dispatch_semaphore_create(0);
   dispatch_semaphore_t sema2 = dispatch_semaphore_create(0);
 
@@ -140,25 +140,25 @@ void 
diff erentsemaphoreok() {
   dispatch_semaphore_wait(sema2, 100); // no-warning
 }
 
-void nosignalok() {
+void nosignalok(void) {
   dispatch_semaphore_t sema1 = dispatch_semaphore_create(0);
   dispatch_semaphore_wait(sema1, 100);
 }
 
-void nowaitok() {
+void nowaitok(void) {
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
   func(^{
       dispatch_semaphore_signal(sema);
   });
 }
 
-void noblockok() {
+void noblockok(void) {
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
   dispatch_semaphore_signal(sema);
   dispatch_semaphore_wait(sema, 100);
 }
 
-void storedblockok() {
+void storedblockok(void) {
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
   block_t b = ^{
       dispatch_semaphore_signal(sema);
@@ -173,7 +173,7 @@ void passed_semaphore_ok(dispatch_semaphore_t sema) {
   dispatch_semaphore_wait(sema, 100);
 }
 
-void warn_with_cast() {
+void warn_with_cast(void) {
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
 
   func(^{

diff  --git a/clang/test/Analysis/generics.m b/clang/test/Analysis/generics.m
index 7616a5d57dcce..21fa29d6ece21 100644
--- a/clang/test/Analysis/generics.m
+++ b/clang/test/Analysis/generics.m
@@ -81,9 +81,9 @@ - (ExceptionType) getException;
 @interface UnrelatedType : NSObject<NSCopying>
 @end
 
-int getUnknown();
-NSArray *getStuff();
-NSArray *getTypedStuff() {
+int getUnknown(void);
+NSArray *getStuff(void);
+NSArray *getTypedStuff(void) {
   NSArray<NSNumber *> *c = getStuff();
   return c;
 }
@@ -107,7 +107,7 @@ void incompatibleTypesErased(NSArray *a, NSMutableArray<NSString *> *b,
   [d addObject: [[NSNumber alloc] init]]; // expected-warning {{Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'}}
 }
 
-void crossProceduralErasedTypes() {
+void crossProceduralErasedTypes(void) {
   NSArray<NSString *> *a = getTypedStuff(); // expected-warning {{Conversion}}
 }
 
@@ -263,7 +263,7 @@ void InferenceFromAPIWithBuggyTypes4(__kindof NSArray<NSString *> *a) {
   withMutArrMutableString(b); // expected-warning {{Conversion}}
 }
 
-NSArray<NSString *> *getStrings();
+NSArray<NSString *> *getStrings(void);
 void enforceDynamicRulesInsteadOfStatic(NSArray<NSNumber *> *a) {
   NSArray *b = a;
   // Valid uses of NSArray of NSNumbers.
@@ -305,13 +305,13 @@ void findMethodDeclInTrackedType2(__kindof NSArray<NSString *> *a,
   }
 }
 
-void testUnannotatedLiterals() {
+void testUnannotatedLiterals(void) {
   // ObjCArrayLiterals are not specialized in the AST. 
   NSArray *arr = @[@"A", @"B"];
   [arr contains: [[NSNumber alloc] init]];
 }
 
-void testAnnotatedLiterals() {
+void testAnnotatedLiterals(void) {
   NSArray<NSString *> *arr = @[@"A", @"B"];
   NSArray *arr2 = arr;
   [arr2 contains: [[NSNumber alloc] init]];
@@ -322,7 +322,7 @@ void nonExistentMethodDoesNotCrash(id a, MutableArray<NSMutableString *> *b) {
   [a nonExistentMethod];
 }
 
-void trackedClassVariables() {
+void trackedClassVariables(void) {
   Class c = [NSArray<NSString *> class];
   NSArray<NSNumber *> *a = [c getEmpty]; // expected-warning {{Conversion}}
   a = [c getEmpty2]; // expected-warning {{Conversion}}

diff  --git a/clang/test/Analysis/global-region-invalidation.c b/clang/test/Analysis/global-region-invalidation.c
index a40ab392b6979..74ff72cfae00d 100644
--- a/clang/test/Analysis/global-region-invalidation.c
+++ b/clang/test/Analysis/global-region-invalidation.c
@@ -7,7 +7,7 @@ void clang_analyzer_eval(int);
 
 // Test that system header does not invalidate the internal global.
 int size_rdar9373039 = 1;
-int rdar9373039() {
+int rdar9373039(void) {
   int x;
   int j = 0;
 
@@ -24,8 +24,8 @@ int rdar9373039() {
 }
 
 // Test stdin does not get invalidated by a system call nor by an internal call.
-void foo();
-int stdinTest() {
+void foo(void);
+int stdinTest(void) {
   int i = 0;
   fscanf(stdin, "%d", &i);
   foo();
@@ -36,7 +36,7 @@ int stdinTest() {
 }
 
 // Test errno gets invalidated by a system call.
-int testErrnoSystem() {
+int testErrnoSystem(void) {
   int i;
   int *p = 0;
   fscanf(stdin, "%d", &i);
@@ -51,7 +51,7 @@ int testErrnoSystem() {
 }
 
 // Test that errno gets invalidated by internal calls.
-int testErrnoInternal() {
+int testErrnoInternal(void) {
   int i;
   int *p = 0;
   fscanf(stdin, "%d", &i);
@@ -64,14 +64,14 @@ int testErrnoInternal() {
 
 // Test that const integer does not get invalidated.
 const int x = 0;
-int constIntGlob() {
+int constIntGlob(void) {
   const int *m = &x;
     foo();
   return 3 / *m; // expected-warning {{Division by zero}}
 }
 
 extern const int y;
-int constIntGlobExtern() {
+int constIntGlobExtern(void) {
   if (y == 0) {
     foo();
     return 5 / y; // expected-warning {{Division by zero}}
@@ -80,20 +80,20 @@ int constIntGlobExtern() {
 }
 
 static void * const ptr = 0;
-void constPtrGlob() {
+void constPtrGlob(void) {
   clang_analyzer_eval(ptr == 0); // expected-warning{{TRUE}}
   foo();
   clang_analyzer_eval(ptr == 0); // expected-warning{{TRUE}}
 }
 
 static const int x2 = x;
-void constIntGlob2() {
+void constIntGlob2(void) {
   clang_analyzer_eval(x2 == 0); // expected-warning{{TRUE}}
   foo();
   clang_analyzer_eval(x2 == 0); // expected-warning{{TRUE}}
 }
 
-void testAnalyzerEvalIsPure() {
+void testAnalyzerEvalIsPure(void) {
   extern int someGlobal;
   if (someGlobal == 0) {
     clang_analyzer_eval(someGlobal == 0); // expected-warning{{TRUE}}
@@ -104,7 +104,7 @@ void testAnalyzerEvalIsPure() {
 // Test that static variables with initializers do not get reinitialized on
 // recursive calls.
 void Function2(void);
-int *getPtr();
+int *getPtr(void);
 void Function1(void) {
   static unsigned flag;
   static int *p = 0;

diff  --git a/clang/test/Analysis/gmalloc.c b/clang/test/Analysis/gmalloc.c
index 50413e2e9b13c..51f972856b1bb 100644
--- a/clang/test/Analysis/gmalloc.c
+++ b/clang/test/Analysis/gmalloc.c
@@ -24,7 +24,7 @@ gpointer g_memdup(gconstpointer mem, guint byte_size);
 
 static const gsize n_bytes = 1024;
 
-void f1() {
+void f1(void) {
   gpointer g1 = g_malloc(n_bytes);
   gpointer g2 = g_malloc0(n_bytes);
   g1 = g_realloc(g1, n_bytes * 2);
@@ -43,7 +43,7 @@ void f1() {
   g_free(g2); // expected-warning{{Attempt to free released memory}}
 }
 
-void f2() {
+void f2(void) {
   gpointer g1 = g_malloc(n_bytes);
   gpointer g2 = g_malloc0(n_bytes);
   g1 = g_realloc(g1, n_bytes * 2);
@@ -63,7 +63,7 @@ void f2() {
   g3 = g_memdup(g3, n_bytes); // expected-warning{{Use of memory after it is freed}}
 }
 
-void f3() {
+void f3(void) {
   gpointer g1 = g_malloc(n_bytes);
   gpointer g2 = g_malloc0(n_bytes);
   g1 = g_realloc(g1, n_bytes * 2);
@@ -82,7 +82,7 @@ void f3() {
   g_free(g3);
 }
 
-void f4() {
+void f4(void) {
   gpointer g1 = g_malloc(n_bytes);
   gpointer g2 = g_malloc0(n_bytes);
   g1 = g_realloc(g1, n_bytes * 2);
@@ -102,7 +102,7 @@ void f4() {
   g_free(g4);
 }
 
-void f5() {
+void f5(void) {
   gpointer g1 = g_malloc(n_bytes);
   gpointer g2 = g_malloc0(n_bytes);
   g1 = g_realloc(g1, n_bytes * 2);
@@ -123,7 +123,7 @@ void f5() {
   g_free(g5);
 }
 
-void f6() {
+void f6(void) {
   gpointer g1 = g_malloc(n_bytes);
   gpointer g2 = g_malloc0(n_bytes);
   g1 = g_realloc(g1, n_bytes * 2);
@@ -145,7 +145,7 @@ void f6() {
   g_free(g6);
 }
 
-void f7() {
+void f7(void) {
   gpointer g1 = g_malloc(n_bytes);
   gpointer g2 = g_malloc0(n_bytes);
   g1 = g_realloc(g1, n_bytes * 2);

diff  --git a/clang/test/Analysis/hangs.c b/clang/test/Analysis/hangs.c
index ce719a16d6c45..455ee418a1aad 100644
--- a/clang/test/Analysis/hangs.c
+++ b/clang/test/Analysis/hangs.c
@@ -11,7 +11,7 @@ extern void __assert_fail(__const char *__assertion, __const char *__file,
 
 void clang_analyzer_eval(int);
 
-int g();
+int g(void);
 
 int f(int y) {
   return y + g();

diff  --git a/clang/test/Analysis/html-diag-singlefile.c b/clang/test/Analysis/html-diag-singlefile.c
index fc0dcc7a42339..1dbc492ed2486 100644
--- a/clang/test/Analysis/html-diag-singlefile.c
+++ b/clang/test/Analysis/html-diag-singlefile.c
@@ -6,7 +6,7 @@
 
 #include "html-diag-singlefile.h"
 
-int main(){
+int main(void){
   f();
   return 0;
 }

diff  --git a/clang/test/Analysis/html-diag-singlefile.h b/clang/test/Analysis/html-diag-singlefile.h
index 1af7d1f1fbb4b..e238480ad68e0 100644
--- a/clang/test/Analysis/html-diag-singlefile.h
+++ b/clang/test/Analysis/html-diag-singlefile.h
@@ -1,4 +1,4 @@
-static void f() {
+static void f(void) {
   int *p = 0;
   *p = 1;       // expected-warning{{Dereference of null pointer}}
 }

diff  --git a/clang/test/Analysis/html-diags-analyze-headers.h b/clang/test/Analysis/html-diags-analyze-headers.h
index 3641ca9c04009..542596666b4f5 100644
--- a/clang/test/Analysis/html-diags-analyze-headers.h
+++ b/clang/test/Analysis/html-diags-analyze-headers.h
@@ -1,5 +1,5 @@
 #include "html-diags-multifile.h"
 
-void test_call_macro() {
+void test_call_macro(void) {
   has_bug(0);
 }

diff  --git a/clang/test/Analysis/html-diags-multifile.c b/clang/test/Analysis/html-diags-multifile.c
index ff7b625ad083f..ace217a4db980 100644
--- a/clang/test/Analysis/html-diags-multifile.c
+++ b/clang/test/Analysis/html-diags-multifile.c
@@ -9,7 +9,7 @@
 
 #define CALL_HAS_BUG(q) has_bug(q)
 
-void test_call_macro() {
+void test_call_macro(void) {
   CALL_HAS_BUG(0);
 }
 

diff  --git a/clang/test/Analysis/html-diags.c b/clang/test/Analysis/html-diags.c
index 89f1e8ba79308..ea460478f4e68 100644
--- a/clang/test/Analysis/html-diags.c
+++ b/clang/test/Analysis/html-diags.c
@@ -27,6 +27,6 @@ void has_bug(int *p) {
 
 #define CALL_HAS_BUG(q) has_bug(q)
 
-void test_call_macro() {
+void test_call_macro(void) {
   CALL_HAS_BUG(0);
 }

diff  --git a/clang/test/Analysis/html_diagnostics/relevant_lines/notexecutedlines.c b/clang/test/Analysis/html_diagnostics/relevant_lines/notexecutedlines.c
index 3c723aa93349e..5b5f298091665 100644
--- a/clang/test/Analysis/html_diagnostics/relevant_lines/notexecutedlines.c
+++ b/clang/test/Analysis/html_diagnostics/relevant_lines/notexecutedlines.c
@@ -1,4 +1,4 @@
-int f() {
+int f(void) {
   int zzz = 200;
   zzz += 100;
   return 0;

diff  --git a/clang/test/Analysis/html_diagnostics/td-hotfix.c b/clang/test/Analysis/html_diagnostics/td-hotfix.c
index 8595642ad0f58..9daed00800b77 100644
--- a/clang/test/Analysis/html_diagnostics/td-hotfix.c
+++ b/clang/test/Analysis/html_diagnostics/td-hotfix.c
@@ -6,7 +6,7 @@
 
 void bar(int);
 
-void foo() {
+void foo(void) {
   int a;
   bar(a); // expected-warning{{1st function call argument is an uninitialized value}}
 }

diff  --git a/clang/test/Analysis/html_diagnostics/variable-popups-macro.c b/clang/test/Analysis/html_diagnostics/variable-popups-macro.c
index 83bda14d4f2f7..15da6e5944b0a 100644
--- a/clang/test/Analysis/html_diagnostics/variable-popups-macro.c
+++ b/clang/test/Analysis/html_diagnostics/variable-popups-macro.c
@@ -8,7 +8,7 @@ void bar(int);
 
 #define MACRO if (b)
 
-void foo2() {
+void foo2(void) {
   int a;
   int b = 1;
   MACRO

diff  --git a/clang/test/Analysis/html_diagnostics/variable-popups-multiple.c b/clang/test/Analysis/html_diagnostics/variable-popups-multiple.c
index d7a05b53e4f53..9c9fdd96cbccf 100644
--- a/clang/test/Analysis/html_diagnostics/variable-popups-multiple.c
+++ b/clang/test/Analysis/html_diagnostics/variable-popups-multiple.c
@@ -6,7 +6,7 @@
 
 void bar(int);
 
-void foo() {
+void foo(void) {
   int a;
   for (unsigned i = 0; i < 3; ++i)
     if (i)

diff  --git a/clang/test/Analysis/html_diagnostics/variable-popups-simple.c b/clang/test/Analysis/html_diagnostics/variable-popups-simple.c
index cb2f3bf3226d5..57ef63c216fa9 100644
--- a/clang/test/Analysis/html_diagnostics/variable-popups-simple.c
+++ b/clang/test/Analysis/html_diagnostics/variable-popups-simple.c
@@ -6,7 +6,7 @@
 
 void bar(int);
 
-void foo2() {
+void foo2(void) {
   int a;
   int b = 1;
   if (b)

diff  --git a/clang/test/Analysis/index-type.c b/clang/test/Analysis/index-type.c
index 123dcd65bd7ca..997d45c1e5aba 100644
--- a/clang/test/Analysis/index-type.c
+++ b/clang/test/Analysis/index-type.c
@@ -8,7 +8,7 @@
 
 #define X86_ARRAY_SIZE (UINT_MAX/2 + 4)
 
-void testIndexTooBig() {
+void testIndexTooBig(void) {
   char arr[X86_ARRAY_SIZE];
   char *ptr = arr + UINT_MAX/2;
   ptr += 2;  // index shouldn't overflow
@@ -19,7 +19,7 @@ void testIndexTooBig() {
 
 #define ARRAY_SIZE 0x100000000
 
-void testIndexOverflow64() {
+void testIndexOverflow64(void) {
   char arr[ARRAY_SIZE];
   char *ptr = arr + UINT_MAX/2;
   ptr += 2;  // don't overflow 64-bit index
@@ -29,7 +29,7 @@ void testIndexOverflow64() {
 #define ULONG_MAX (~0ul)
 #define BIG_INDEX (ULONG_MAX/16)
 
-void testIndexTooBig64() {
+void testIndexTooBig64(void) {
   char arr[ULONG_MAX/8-1];
   char *ptr = arr + BIG_INDEX;
   ptr += 2;  // don't overflow 64-bit index
@@ -42,16 +42,16 @@ static unsigned size;
 static void * addr;
 static unsigned buf[SIZE];
 
-void testOutOfBounds() {
+void testOutOfBounds(void) {
   // Not out of bounds.
   buf[SIZE-1] = 1; // no-warning
 }
 
-void testOutOfBoundsCopy1() {
+void testOutOfBoundsCopy1(void) {
   memcpy(buf, addr, size); // no-warning
 }
 
-void testOutOfBoundsCopy2() {
+void testOutOfBoundsCopy2(void) {
   memcpy(addr, buf, size); // no-warning
 }
 

diff  --git a/clang/test/Analysis/initialization.c b/clang/test/Analysis/initialization.c
index 5900388b55de2..d394a902ffeb7 100644
--- a/clang/test/Analysis/initialization.c
+++ b/clang/test/Analysis/initialization.c
@@ -2,13 +2,13 @@
 
 void clang_analyzer_eval(int);
 
-void initbug() {
+void initbug(void) {
   const union { float a; } u = {};
   (void)u.a; // no-crash
 }
 
 int const parr[2] = {1};
-void constarr() {
+void constarr(void) {
   int i = 2;
   clang_analyzer_eval(parr[i]); // expected-warning{{UNDEFINED}}
   i = 1;
@@ -22,13 +22,13 @@ struct SM {
   int b;
 };
 const struct SM sm = {.a = 1};
-void multinit() {
+void multinit(void) {
   clang_analyzer_eval(sm.a == 1); // expected-warning{{TRUE}}
   clang_analyzer_eval(sm.b == 0); // expected-warning{{TRUE}}
 }
 
 const int glob_arr1[6] = {[2] = 3, [0] = 1, [1] = 2, [3] = 4};
-void glob_array_index1() {
+void glob_array_index1(void) {
   clang_analyzer_eval(glob_arr1[0] == 1); // expected-warning{{TRUE}}
   clang_analyzer_eval(glob_arr1[1] == 2); // expected-warning{{TRUE}}
   clang_analyzer_eval(glob_arr1[2] == 3); // expected-warning{{TRUE}}
@@ -37,7 +37,7 @@ void glob_array_index1() {
   clang_analyzer_eval(glob_arr1[5] == 0); // expected-warning{{TRUE}}
 }
 
-void glob_array_index2() {
+void glob_array_index2(void) {
   const int *ptr = glob_arr1;
   clang_analyzer_eval(ptr[0] == 1); // expected-warning{{TRUE}}
   clang_analyzer_eval(ptr[1] == 2); // expected-warning{{TRUE}}
@@ -47,19 +47,19 @@ void glob_array_index2() {
   clang_analyzer_eval(ptr[5] == 0); // expected-warning{{TRUE}}
 }
 
-void glob_invalid_index1() {
+void glob_invalid_index1(void) {
   int x = -42;
   int res = glob_arr1[x]; // expected-warning{{garbage or undefined}}
 }
 
-void glob_invalid_index2() {
+void glob_invalid_index2(void) {
   const int *ptr = glob_arr1;
   int x = 42;
   int res = ptr[x]; // expected-warning{{garbage or undefined}}
 }
 
 const int glob_arr2[3][3] = {[0][0] = 1, [1][1] = 5, [2][0] = 7};
-void glob_arr_index3() {
+void glob_arr_index3(void) {
   clang_analyzer_eval(glob_arr2[0][0] == 1); // expected-warning{{TRUE}}
   clang_analyzer_eval(glob_arr2[0][1] == 0); // expected-warning{{TRUE}}
   clang_analyzer_eval(glob_arr2[0][2] == 0); // expected-warning{{TRUE}}
@@ -71,7 +71,7 @@ void glob_arr_index3() {
   clang_analyzer_eval(glob_arr2[2][2] == 0); // expected-warning{{TRUE}}
 }
 
-void negative_index() {
+void negative_index(void) {
   int x = 2, y = -2;
   clang_analyzer_eval(glob_arr2[x][y] == 5); // expected-warning{{UNDEFINED}}
   x = 3;
@@ -79,37 +79,37 @@ void negative_index() {
   clang_analyzer_eval(glob_arr2[x][y] == 7); // expected-warning{{UNDEFINED}}
 }
 
-void glob_invalid_index3() {
+void glob_invalid_index3(void) {
   int x = -1, y = -1;
   int res = glob_arr2[x][y]; // expected-warning{{garbage or undefined}}
 }
 
-void glob_invalid_index4() {
+void glob_invalid_index4(void) {
   int x = 3, y = 2;
   int res = glob_arr2[x][y]; // expected-warning{{garbage or undefined}}
 }
 
 const int glob_arr_no_init[10];
-void glob_arr_index4() {
+void glob_arr_index4(void) {
   // FIXME: Should warn {{FALSE}}, since the array has a static storage.
   clang_analyzer_eval(glob_arr_no_init[2]); // expected-warning{{UNKNOWN}}
 }
 
 const int glob_arr3[];              // IncompleteArrayType
 const int glob_arr3[4] = {1, 2, 3}; // ConstantArrayType
-void glob_arr_index5() {
+void glob_arr_index5(void) {
   clang_analyzer_eval(glob_arr3[0] == 1); // expected-warning{{TRUE}}
   clang_analyzer_eval(glob_arr3[1] == 2); // expected-warning{{TRUE}}
   clang_analyzer_eval(glob_arr3[2] == 3); // expected-warning{{TRUE}}
   clang_analyzer_eval(glob_arr3[3] == 0); // expected-warning{{TRUE}}
 }
 
-void glob_invalid_index5() {
+void glob_invalid_index5(void) {
   int x = 42;
   int res = glob_arr3[x]; // expected-warning{{garbage or undefined}}
 }
 
-void glob_invalid_index6() {
+void glob_invalid_index6(void) {
   int x = -42;
   int res = glob_arr3[x]; // expected-warning{{garbage or undefined}}
 }
@@ -117,19 +117,19 @@ void glob_invalid_index6() {
 const int glob_arr4[];              // IncompleteArrayType
 const int glob_arr4[4] = {1, 2, 3}; // ConstantArrayType
 const int glob_arr4[];              // ConstantArrayType (according to AST)
-void glob_arr_index6() {
+void glob_arr_index6(void) {
   clang_analyzer_eval(glob_arr4[0] == 1); // expected-warning{{TRUE}}
   clang_analyzer_eval(glob_arr4[1] == 2); // expected-warning{{TRUE}}
   clang_analyzer_eval(glob_arr4[2] == 3); // expected-warning{{TRUE}}
   clang_analyzer_eval(glob_arr4[3] == 0); // expected-warning{{TRUE}}
 }
 
-void glob_invalid_index7() {
+void glob_invalid_index7(void) {
   int x = 42;
   int res = glob_arr4[x]; // expected-warning{{garbage or undefined}}
 }
 
-void glob_invalid_index8() {
+void glob_invalid_index8(void) {
   int x = -42;
   int res = glob_arr4[x]; // expected-warning{{garbage or undefined}}
 }

diff  --git a/clang/test/Analysis/inline-not-supported.c b/clang/test/Analysis/inline-not-supported.c
index c5f4c74952cc0..b0382dc35ef47 100644
--- a/clang/test/Analysis/inline-not-supported.c
+++ b/clang/test/Analysis/inline-not-supported.c
@@ -5,25 +5,25 @@ void foo(int *x, ...) {
   *x = 1;
 }
 
-void bar() {
+void bar(void) {
   foo(0, 2); // no-warning
 }
 
 // For now, don't inline vararg blocks.
 void (^baz)(int *x, ...) = ^(int *x, ...) { *x = 1; };
 
-void taz() {
+void taz(void) {
   baz(0, 2); // no-warning
 }
 
 // For now, don't inline global blocks.
 void (^qux)(int *p) = ^(int *p) { *p = 1; };
-void test_qux() {
+void test_qux(void) {
   qux(0); // no-warning
 }
 
 
-void test_analyzer_is_running() {
+void test_analyzer_is_running(void) {
   int *p = 0;
   *p = 0xDEADBEEF; // expected-warning {{null}}
 }

diff  --git a/clang/test/Analysis/inline-plist.c b/clang/test/Analysis/inline-plist.c
index b6221073e4fe6..c501cb58c63ae 100644
--- a/clang/test/Analysis/inline-plist.c
+++ b/clang/test/Analysis/inline-plist.c
@@ -23,7 +23,7 @@ void has_bug(int *p) {
   *p = 0xDEADBEEF; // expected-warning{{Dereference of null pointer (loaded from variable 'p')}} expected-note{{Dereference of null pointer (loaded from variable 'p')}}
 }
 
-void test_has_bug() {
+void test_has_bug(void) {
   has_bug(0);
   // expected-note at -1 {{Passing null pointer value via 1st parameter 'p'}}
   // expected-note at -2 {{Calling 'has_bug'}}
@@ -55,31 +55,31 @@ void bar(int *p) {
 // Test inlining of blocks.
 // ========================================================================== //
 
-void test_block__capture_null() {
+void test_block__capture_null(void) {
   int *p = 0; // expected-note{{'p' initialized to a null pointer value}}
-  ^(){ // expected-note {{Calling anonymous block}}
+  ^(void){ // expected-note {{Calling anonymous block}}
     *p = 1; // expected-warning{{Dereference of null pointer (loaded from variable 'p')}} expected-note{{Dereference of null pointer (loaded from variable 'p')}}
   }();
 
 }
 
-void test_block_ret() {
-  int *p = ^int*(){ // expected-note {{Calling anonymous block}} expected-note{{Returning to caller}} expected-note {{'p' initialized to a null pointer value}}
+void test_block_ret(void) {
+  int *p = ^int*(void){ // expected-note {{Calling anonymous block}} expected-note{{Returning to caller}} expected-note {{'p' initialized to a null pointer value}}
     int *q = 0; // expected-note {{'q' initialized to a null pointer value}}
     return q; // expected-note {{Returning null pointer (loaded from 'q')}}
   }();
   *p = 1; // expected-warning{{Dereference of null pointer (loaded from variable 'p')}} expected-note{{Dereference of null pointer (loaded from variable 'p')}}
 }
 
-void test_block_blockvar() {
+void test_block_blockvar(void) {
   __block int *p;
-  ^(){ // expected-note{{Calling anonymous block}} expected-note{{Returning to caller}}
+  ^(void){ // expected-note{{Calling anonymous block}} expected-note{{Returning to caller}}
     p = 0; // expected-note{{Null pointer value stored to 'p'}}
   }();
   *p = 1; // expected-warning{{Dereference of null pointer (loaded from variable 'p')}} expected-note{{Dereference of null pointer (loaded from variable 'p')}}
 }
 
-void test_block_arg() {
+void test_block_arg(void) {
   int *p;
   ^(int **q){ // expected-note{{Calling anonymous block}} expected-note{{Returning to caller}}
     *q = 0; // expected-note{{Null pointer value stored to 'p'}}

diff  --git a/clang/test/Analysis/inline-unique-reports.c b/clang/test/Analysis/inline-unique-reports.c
index a20975a9afc70..9c1553b26d2b2 100644
--- a/clang/test/Analysis/inline-unique-reports.c
+++ b/clang/test/Analysis/inline-unique-reports.c
@@ -5,12 +5,12 @@ static inline bug(int *p) {
   *p = 0xDEADBEEF;
 }
 
-void test_bug_1() {
+void test_bug_1(void) {
   int *p = 0;
   bug(p);
 }
 
-void test_bug_2() {
+void test_bug_2(void) {
   int *p = 0;
   bug(p);
 }

diff  --git a/clang/test/Analysis/inline.c b/clang/test/Analysis/inline.c
index 8fce0fb176ea4..d0b154c05d917 100644
--- a/clang/test/Analysis/inline.c
+++ b/clang/test/Analysis/inline.c
@@ -3,14 +3,14 @@
 void clang_analyzer_eval(int);
 void clang_analyzer_checkInlined(int);
 
-int test1_f1() {
+int test1_f1(void) {
   int y = 1;
   y++;
   clang_analyzer_checkInlined(1); // expected-warning{{TRUE}}
   return y;
 }
 
-void test1_f2() {
+void test1_f2(void) {
   int x = 1;
   x = test1_f1();
   if (x == 1) {
@@ -26,9 +26,9 @@ void test1_f2() {
 // Test that inlining works when the declared function has less arguments
 // than the actual number in the declaration.
 void test2_f1() {}
-int test2_f2();
+int test2_f2(void);
 
-void test2_f3() { 
+void test2_f3(void) { 
   test2_f1(test2_f2()); // expected-warning{{too many arguments in call to 'test2_f1'}}
 }
 
@@ -40,7 +40,7 @@ unsigned factorial(unsigned x) {
   return x * factorial(x - 1);
 }
 
-void test_factorial() {
+void test_factorial(void) {
   if (factorial(3) == 6) {
     int *p = 0;
     *p = 0xDEADBEEF;  // expected-warning {{null}}
@@ -51,7 +51,7 @@ void test_factorial() {
   }
 }
 
-void test_factorial_2() {
+void test_factorial_2(void) {
   unsigned x = factorial(3);
   if (x == factorial(3)) {
     int *p = 0;
@@ -69,13 +69,13 @@ static char *return_buf(char *buf) {
   return buf + 10;
 }
 
-void test_return_stack_memory_ok() {
+void test_return_stack_memory_ok(void) {
   char stack_buf[100];
   char *pos = return_buf(stack_buf);
   (void) pos;
 }
 
-char *test_return_stack_memory_bad() {
+char *test_return_stack_memory_bad(void) {
   char stack_buf[100];
   char *x = stack_buf;
   return x; // expected-warning {{stack memory associated}}
@@ -86,7 +86,7 @@ char *test_return_stack_memory_bad() {
 struct rdar10977037 { int x, y; };
 int test_rdar10977037_aux(struct rdar10977037 v) { return v.y; }
 int test_rdar10977037_aux_2(struct rdar10977037 v);
-int test_rdar10977037() {
+int test_rdar10977037(void) {
   struct rdar10977037 v;
   v.y = 1;
   v. y += test_rdar10977037_aux(v); // no-warning
@@ -97,7 +97,7 @@ int test_rdar10977037() {
 // Test inlining a forward-declared function.
 // This regressed when CallEvent was first introduced.
 int plus1(int x);
-void test() {
+void test(void) {
   clang_analyzer_eval(plus1(2) == 3); // expected-warning{{TRUE}}
 }
 
@@ -106,13 +106,13 @@ int plus1(int x) {
 }
 
 
-void never_called_by_anyone() {
+void never_called_by_anyone(void) {
   clang_analyzer_checkInlined(0); // no-warning
 }
 
 
 void knr_one_argument(a) int a; { }
 
-void call_with_less_arguments() {
+void call_with_less_arguments(void) {
   knr_one_argument(); // expected-warning{{too few arguments}} expected-warning{{Function taking 1 argument is called with fewer (0)}}
 }

diff  --git a/clang/test/Analysis/inline2.c b/clang/test/Analysis/inline2.c
index 39e6d16cc4fdc..e604d40552541 100644
--- a/clang/test/Analysis/inline2.c
+++ b/clang/test/Analysis/inline2.c
@@ -9,7 +9,7 @@ int f1(int a) {
   return 1;
 }
 
-void f2() {
+void f2(void) {
   int x;
   x = f1(1);
 }

diff  --git a/clang/test/Analysis/inline3.c b/clang/test/Analysis/inline3.c
index 2c70fb21aa2b6..930a65ffec1e6 100644
--- a/clang/test/Analysis/inline3.c
+++ b/clang/test/Analysis/inline3.c
@@ -5,11 +5,11 @@
 // Otherwise, block-level expr '1 && a' would not be block-level.
 int a;
 
-void f1() {
+void f1(void) {
   if (1 && a)
     return;
 }
 
-void f2() {
+void f2(void) {
   f1();
 }

diff  --git a/clang/test/Analysis/inlining/InlineObjCClassMethod.m b/clang/test/Analysis/inlining/InlineObjCClassMethod.m
index 48f5ac211657c..7ce8ea8f5687b 100644
--- a/clang/test/Analysis/inlining/InlineObjCClassMethod.m
+++ b/clang/test/Analysis/inlining/InlineObjCClassMethod.m
@@ -68,7 +68,7 @@ @interface AAA : NSObject
 @interface AAA (MyCat)
 + (int)getInt;
 @end
-int foo() {
+int foo(void) {
     int y = [AAA getInt];
     return 5/y; // expected-warning {{Division by zero}}
 }
@@ -88,7 +88,7 @@ + (int)getInt;
 @end
 @interface CCC : PPP
 @end
-int foo4() {
+int foo4(void) {
     int y = [CCC getInt];
     return 5/y; // expected-warning {{Division by zero}}
 }
@@ -182,7 +182,7 @@ + (int)testClassMethodByKnownVarDecl {
   return 5/y; // expected-warning{{Division by zero}}
 }
 @end
-int foo2() {
+int foo2(void) {
   int y = [MyParentSelf testSelf];
   return 5/y; // expected-warning{{Division by zero}}
 }
@@ -214,7 +214,7 @@ + (int)fooA {
   return [super foo];
 }
 @end
-int checkSelfUsedInparentClassMethod() {
+int checkSelfUsedInparentClassMethod(void) {
     return 5/[SelfUsedInParentChild fooA];
 }
 
@@ -222,7 +222,7 @@ int checkSelfUsedInparentClassMethod() {
 @interface Rdar15037033 : NSObject
 @end
 
-void rdar15037033() {
+void rdar15037033(void) {
   [Rdar15037033 forwardDeclaredMethod]; // expected-warning {{class method '+forwardDeclaredMethod' not found}}
   [Rdar15037033 forwardDeclaredVariadicMethod:1, 2, 3, 0]; // expected-warning {{class method '+forwardDeclaredVariadicMethod:' not found}}
 }

diff  --git a/clang/test/Analysis/inlining/InlineObjCInstanceMethod.m b/clang/test/Analysis/inlining/InlineObjCInstanceMethod.m
index 4578a55c7a079..ef3af72fa93b5 100644
--- a/clang/test/Analysis/inlining/InlineObjCInstanceMethod.m
+++ b/clang/test/Analysis/inlining/InlineObjCInstanceMethod.m
@@ -123,7 +123,7 @@ - (CFStringRef) testCovariantReturnType __attribute__((cf_returns_retained)) {
 
 @end
 
-int testNonCovariantReturnType() {
+int testNonCovariantReturnType(void) {
   MyParent *obj = [[EvilChild alloc] init];
 
   // Devirtualization allows us to directly call -[EvilChild getInt], but
@@ -137,7 +137,7 @@ int testNonCovariantReturnType() {
   return 5/(x-1); // no-warning
 }
 
-int testCovariantReturnTypeNoErrorSinceTypesMatch() {
+int testCovariantReturnTypeNoErrorSinceTypesMatch(void) {
   MyParent *obj = [[EvilChild alloc] init];
 
   CFStringRef S = ((void*)0);

diff  --git a/clang/test/Analysis/inlining/ObjCDynTypePopagation.m b/clang/test/Analysis/inlining/ObjCDynTypePopagation.m
index b5e70229c7c89..f98f2adbd0c83 100644
--- a/clang/test/Analysis/inlining/ObjCDynTypePopagation.m
+++ b/clang/test/Analysis/inlining/ObjCDynTypePopagation.m
@@ -4,7 +4,7 @@
 
 void clang_analyzer_eval(int);
 
-PublicSubClass2 *getObj();
+PublicSubClass2 *getObj(void);
 
 @implementation PublicParent
 - (int)getZeroOverridden {

diff  --git a/clang/test/Analysis/inlining/RetainCountExamples.m b/clang/test/Analysis/inlining/RetainCountExamples.m
index 938d3e2bfb621..37702a4dc0de5 100644
--- a/clang/test/Analysis/inlining/RetainCountExamples.m
+++ b/clang/test/Analysis/inlining/RetainCountExamples.m
@@ -28,7 +28,7 @@ - (id)init {
 }
 @end
 
-void selfStaysLive() {
+void selfStaysLive(void) {
     SelfStaysLive *foo = [[SelfStaysLive alloc] init]; 
     [foo release];
 }

diff  --git a/clang/test/Analysis/inlining/analysis-order.c b/clang/test/Analysis/inlining/analysis-order.c
index 620732c68542a..f0cc6f113f9b3 100644
--- a/clang/test/Analysis/inlining/analysis-order.c
+++ b/clang/test/Analysis/inlining/analysis-order.c
@@ -1,13 +1,13 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core.builtin.NoReturnFunctions -analyzer-display-progress %s 2>&1 | FileCheck %s
 
 // Do not analyze test1() again because it was inlined
-void test1();
+void test1(void);
 
-void test2() {
+void test2(void) {
   test1();
 }
 
-void test1() {
+void test1(void) {
 }
 
 // CHECK: analysis-order.c test2

diff  --git a/clang/test/Analysis/inlining/eager-reclamation-path-notes.c b/clang/test/Analysis/inlining/eager-reclamation-path-notes.c
index d4ac66da36743..2416813cd246e 100644
--- a/clang/test/Analysis/inlining/eager-reclamation-path-notes.c
+++ b/clang/test/Analysis/inlining/eager-reclamation-path-notes.c
@@ -7,7 +7,7 @@ void use(int *ptr, int val) {
   // expected-note at -1 {{Dereference of null pointer (loaded from variable 'ptr')}}
 }
 
-int compute() {
+int compute(void) {
   // Do something that will take enough processing to trigger trimming.
   // FIXME: This is actually really sensitive. If the interval timing is just
   // wrong, the node for the actual dereference may also be collected, and all
@@ -15,7 +15,7 @@ int compute() {
   return 2 + 3 + 4 + 5 + 6;
 }
 
-void testSimple() {
+void testSimple(void) {
   int *p = 0;
   // expected-note at -1 {{'p' initialized to a null pointer value}}
   use(p, compute());
@@ -35,7 +35,7 @@ void passThrough(int *p) {
   // expected-note at -2 {{Calling 'use2'}}
 }
 
-void testChainedCalls() {
+void testChainedCalls(void) {
   int *ptr = 0;
   // expected-note at -1 {{'ptr' initialized to a null pointer value}}
   passThrough(ptr);

diff  --git a/clang/test/Analysis/inlining/false-positive-suppression.c b/clang/test/Analysis/inlining/false-positive-suppression.c
index e060eb1d1e88b..34b84bfd0f405 100644
--- a/clang/test/Analysis/inlining/false-positive-suppression.c
+++ b/clang/test/Analysis/inlining/false-positive-suppression.c
@@ -3,13 +3,13 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-config avoid-suppressing-null-argument-paths=true -DSUPPRESSED=1 -DNULL_ARGS=1 -verify %s
 
 int opaquePropertyCheck(void *object);
-int coin();
+int coin(void);
 
-int *getNull() {
+int *getNull(void) {
   return 0;
 }
 
-int* getPtr();
+int* getPtr(void);
 
 int *dynCastToInt(void *ptr) {
   if (opaquePropertyCheck(ptr))
@@ -85,10 +85,10 @@ void testMultipleStore(void *p) {
 }
 
 // Test that div by zero does not get suppressed. This is a policy choice.
-int retZero() {
+int retZero(void) {
   return 0;
 }
-int triggerDivZero () {
+int triggerDivZero (void) {
   int y = retZero();
   return 5/y; // expected-warning {{Division by zero}}
 }
@@ -183,7 +183,7 @@ int testDifferentMacro(int *p) {
 // "Suppression suppression"
 // --------------------------
 
-void testDynCastOrNullOfNull() {
+void testDynCastOrNullOfNull(void) {
   // Don't suppress when one of the arguments is NULL.
   int *casted = dynCastOrNull(0);
   *casted = 1;
@@ -192,7 +192,7 @@ void testDynCastOrNullOfNull() {
 #endif
 }
 
-void testDynCastOfNull() {
+void testDynCastOfNull(void) {
   // Don't suppress when one of the arguments is NULL.
   int *casted = dynCastToInt(0);
   *casted = 1;
@@ -208,7 +208,7 @@ int *lookUpInt(int unused) {
   return &x;
 }
 
-void testZeroIsNotNull() {
+void testZeroIsNotNull(void) {
   // /Do/ suppress when the argument is 0 (an integer).
   int *casted = lookUpInt(0);
   *casted = 1;
@@ -217,7 +217,7 @@ void testZeroIsNotNull() {
 #endif
 }
 
-void testTrackNull() {
+void testTrackNull(void) {
   // /Do/ suppress if the null argument came from another call returning null.
   int *casted = dynCastOrNull(getNull());
   *casted = 1;
@@ -226,7 +226,7 @@ void testTrackNull() {
 #endif
 }
 
-void testTrackNullVariable() {
+void testTrackNullVariable(void) {
   // /Do/ suppress if the null argument came from another call returning null.
   int *ptr;
   ptr = getNull();
@@ -253,7 +253,7 @@ void inlinedIsDifferent(int inlined) {
 #endif
 }
 
-void testInlinedIsDifferent() {
+void testInlinedIsDifferent(void) {
   // <rdar://problem/13787723>
   inlinedIsDifferent(0);
 }
@@ -263,7 +263,7 @@ void testInlinedIsDifferent() {
 // FALSE NEGATIVES (over-suppression)
 // ---------------------------------------
 
-void testNoArguments() {
+void testNoArguments(void) {
   // In this case the function has no branches, and MUST return null.
   int *casted = getNull();
   *casted = 1;

diff  --git a/clang/test/Analysis/inlining/false-positive-suppression.m b/clang/test/Analysis/inlining/false-positive-suppression.m
index 25fe40fc85556..08a12dd09ac53 100644
--- a/clang/test/Analysis/inlining/false-positive-suppression.m
+++ b/clang/test/Analysis/inlining/false-positive-suppression.m
@@ -14,7 +14,7 @@ - (int *)getPtr;
 - (id)getObject;
 @end
 
-id getNil() {
+id getNil(void) {
   return 0;
 }
 
@@ -106,7 +106,7 @@ -(void)testSuperPropertyReturningNull {
 }
 @end
 
-void testClassPropertyReturningNull() {
+void testClassPropertyReturningNull(void) {
   int *result = SomeClass.classPropertyReturningNull;
   *result = 1;
 #ifndef SUPPRESSED

diff  --git a/clang/test/Analysis/inlining/inline-defensive-checks.m b/clang/test/Analysis/inlining/inline-defensive-checks.m
index 38e5446ecd398..a71203fabc93e 100644
--- a/clang/test/Analysis/inlining/inline-defensive-checks.m
+++ b/clang/test/Analysis/inlining/inline-defensive-checks.m
@@ -53,7 +53,7 @@ @interface Foo {
 - (Foo *)getFooPtr;
 @end
 
-Foo *retNil() {
+Foo *retNil(void) {
   return 0;
 }
 

diff  --git a/clang/test/Analysis/inlining/path-notes.c b/clang/test/Analysis/inlining/path-notes.c
index 25b5e5b557e45..eb4eeacad8b38 100644
--- a/clang/test/Analysis/inlining/path-notes.c
+++ b/clang/test/Analysis/inlining/path-notes.c
@@ -26,9 +26,9 @@ void testCheck(int *a) {
 }
 
 
-int *getPointer();
+int *getPointer(void);
 
-void testInitCheck() {
+void testInitCheck(void) {
   int *a = getPointer();
   // expected-note at -1 {{'a' initialized here}}
   if (a) {
@@ -53,7 +53,7 @@ void testStoreCheck(int *a) {
 }
 
 
-int *getZero() {
+int *getZero(void) {
   int *p = 0;
   // expected-note at -1 + {{'p' initialized to a null pointer value}}
   // ^ This note checks that we add a second visitor for the return value.
@@ -61,21 +61,21 @@ int *getZero() {
   // expected-note at -1 + {{Returning null pointer (loaded from 'p')}}
 }
 
-void testReturnZero() {
+void testReturnZero(void) {
   *getZero() = 1; // expected-warning{{Dereference of null pointer}}
   // expected-note at -1 {{Calling 'getZero'}}
   // expected-note at -2 {{Returning from 'getZero'}}
   // expected-note at -3 {{Dereference of null pointer}}
 }
 
-int testReturnZero2() {
+int testReturnZero2(void) {
   return *getZero(); // expected-warning{{Dereference of null pointer}}
   // expected-note at -1 {{Calling 'getZero'}}
   // expected-note at -2 {{Returning from 'getZero'}}
   // expected-note at -3 {{Dereference of null pointer}}
 }
 
-void testInitZero() {
+void testInitZero(void) {
   int *a = getZero();
   // expected-note at -1 {{Calling 'getZero'}}
   // expected-note at -2 {{Returning from 'getZero'}}
@@ -98,7 +98,7 @@ void usePointer(int *p) {
   // expected-note at -1 {{Dereference of null pointer}}
 }
 
-void testUseOfNullPointer() {
+void testUseOfNullPointer(void) {
   // Test the case where an argument expression is itself a call.
   usePointer(getZero());
   // expected-note at -1 {{Calling 'getZero'}}
@@ -140,7 +140,7 @@ void test4(int **p) {
            // expected-note at -1 {{Dereference of null pointer}}
 }
 
-void boringCallee() {
+void boringCallee(void) {
 }
 
 void interestingCallee(int *x) {
@@ -148,7 +148,7 @@ void interestingCallee(int *x) {
   boringCallee(); // no-note
 }
 
-int testBoringCalleeOfInterestingCallee() {
+int testBoringCalleeOfInterestingCallee(void) {
   int x;
   interestingCallee(&x); // expected-note{{Calling 'interestingCallee'}}
                          // expected-note at -1{{Returning from 'interestingCallee'}}

diff  --git a/clang/test/Analysis/inlining/path-notes.m b/clang/test/Analysis/inlining/path-notes.m
index 33e4357da24e8..0784be67ca68c 100644
--- a/clang/test/Analysis/inlining/path-notes.m
+++ b/clang/test/Analysis/inlining/path-notes.m
@@ -75,7 +75,7 @@ - (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject;
   // expected-note at -2 {{Returning null pointer}}
 }
 
-void testReturnZeroIfNil() {
+void testReturnZeroIfNil(void) {
   *getZeroIfNil(0) = 1; // expected-warning{{Dereference of null pointer}}
   // expected-note at -1 {{Calling 'getZeroIfNil'}}
   // expected-note at -2 {{Passing nil object reference via 1st parameter 'x'}}
@@ -84,7 +84,7 @@ void testReturnZeroIfNil() {
 }
 
 
-int testDispatchSyncInlining() {
+int testDispatchSyncInlining(void) {
   extern dispatch_queue_t globalQueue;
 
   __block int x;
@@ -127,7 +127,7 @@ @interface PointerWrapper
 - (int *)getPtr;
 @end
 
-id getNil() {
+id getNil(void) {
   return 0;
 }
 
@@ -163,7 +163,7 @@ id testCreateArrayLiteral(id myNil) {
 }
 
 // <rdar://problem/14611722>
-id testAutoreleaseTakesEffectInDispatch() {
+id testAutoreleaseTakesEffectInDispatch(void) {
   static dispatch_once_t token = 0;
   dispatch_once(&token, ^{});
 
@@ -178,7 +178,7 @@ id testAutoreleaseTakesEffectInDispatch() {
   // expected-note at -1 {{Object was autoreleased 2 times but the object has a +0 retain count}}
 }
 
-void testNullDereferenceInDispatch() {
+void testNullDereferenceInDispatch(void) {
   dispatch_once(0, ^{}); // no-warning, don't crash
 }
 

diff  --git a/clang/test/Analysis/inlining/test-always-inline-size-option.c b/clang/test/Analysis/inlining/test-always-inline-size-option.c
index 85fc8a16cc75d..308dcc65ca804 100644
--- a/clang/test/Analysis/inlining/test-always-inline-size-option.c
+++ b/clang/test/Analysis/inlining/test-always-inline-size-option.c
@@ -1,7 +1,7 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,debug.ExprInspection -analyzer-inline-max-stack-depth=3 -analyzer-config ipa-always-inline-size=3 -verify %s
 
 void clang_analyzer_eval(int);
-int nested5() {
+int nested5(void) {
   if (5 < 3)
     return 0;
   else
@@ -9,40 +9,40 @@ int nested5() {
       return 0;
   return 0;
 }
-int nested4() {
+int nested4(void) {
   return nested5();
 }
-int nested3() {
+int nested3(void) {
   return nested4();
 }
-int nested2() {
+int nested2(void) {
   return nested3();
 }
-int nested1() {
+int nested1(void) {
   return nested2();
 }
 
-void testNested() {
+void testNested(void) {
   clang_analyzer_eval(nested1() == 0); // expected-warning{{TRUE}}
 }
 
 // Make sure we terminate a recursive path.
-int recursive() {
+int recursive(void) {
   return recursive();
 }
-int callRecursive() {
+int callRecursive(void) {
   return recursive();
 }
 
-int mutuallyRecursive1();
+int mutuallyRecursive1(void);
 
-int mutuallyRecursive2() {
+int mutuallyRecursive2(void) {
   return mutuallyRecursive1();
 }
 
-int mutuallyRecursive1() {
+int mutuallyRecursive1(void) {
   return mutuallyRecursive2();
 }
-int callMutuallyRecursive() {
+int callMutuallyRecursive(void) {
   return mutuallyRecursive1();
 }

diff  --git a/clang/test/Analysis/invalid-a-na-ly-zer-con-fig-value.c b/clang/test/Analysis/invalid-a-na-ly-zer-con-fig-value.c
index ec967d3c47c29..3f2cff523a87f 100644
--- a/clang/test/Analysis/invalid-a-na-ly-zer-con-fig-value.c
+++ b/clang/test/Analysis/invalid-a-na-ly-zer-con-fig-value.c
@@ -81,4 +81,4 @@
 
 // expected-no-diagnostics
 
-int main() {}
+int main(void) {}

diff  --git a/clang/test/Analysis/invalid-analyzer-config-value.c b/clang/test/Analysis/invalid-analyzer-config-value.c
index f942dd3e62266..a2fe203eff65a 100644
--- a/clang/test/Analysis/invalid-analyzer-config-value.c
+++ b/clang/test/Analysis/invalid-analyzer-config-value.c
@@ -77,4 +77,4 @@
 
 // expected-no-diagnostics
 
-int main() {}
+int main(void) {}

diff  --git a/clang/test/Analysis/invalid-checker-option.c b/clang/test/Analysis/invalid-checker-option.c
index 5fb38cd3b145f..96bf7b347d1eb 100644
--- a/clang/test/Analysis/invalid-checker-option.c
+++ b/clang/test/Analysis/invalid-checker-option.c
@@ -94,4 +94,4 @@
 
 // expected-no-diagnostics
 
-int main() {}
+int main(void) {}

diff  --git a/clang/test/Analysis/invalid-deref.c b/clang/test/Analysis/invalid-deref.c
index 39e4feff42314..05cb2ed2cdcb3 100644
--- a/clang/test/Analysis/invalid-deref.c
+++ b/clang/test/Analysis/invalid-deref.c
@@ -2,7 +2,7 @@
 
 typedef unsigned uintptr_t;
 
-void f1() {
+void f1(void) {
   int *p;
   *p = 0; // expected-warning{{Dereference of undefined pointer value}}
 }
@@ -11,20 +11,20 @@ struct foo_struct {
   int x;
 };
 
-int f2() {
+int f2(void) {
   struct foo_struct *p;
 
   return p->x++; // expected-warning{{Access to field 'x' results in a dereference of an undefined pointer value (loaded from variable 'p')}}
 }
 
-int f3() {
+int f3(void) {
   char *x;
   int i = 2;
 
   return x[i + 1]; // expected-warning{{Array access (from variable 'x') results in an undefined pointer dereference}}
 }
 
-int f3_b() {
+int f3_b(void) {
   char *x;
   int i = 2;
 

diff  --git a/clang/test/Analysis/ivars.m b/clang/test/Analysis/ivars.m
index c0bb4bc1749a1..d17e6d6a083da 100644
--- a/clang/test/Analysis/ivars.m
+++ b/clang/test/Analysis/ivars.m
@@ -40,7 +40,7 @@ @interface ManyIvars {
 }
 @end
 
-struct S makeS();
+struct S makeS(void);
 
 @implementation ManyIvars
 

diff  --git a/clang/test/Analysis/keychainAPI-diagnostic-visitor.m b/clang/test/Analysis/keychainAPI-diagnostic-visitor.m
index d8da697a41e82..ccc1ea1edf3e7 100644
--- a/clang/test/Analysis/keychainAPI-diagnostic-visitor.m
+++ b/clang/test/Analysis/keychainAPI-diagnostic-visitor.m
@@ -19,7 +19,7 @@ OSStatus SecKeychainItemCopyContent (
                                      void **outData
                                      );
 
-void DellocWithCFStringCreate4() {
+void DellocWithCFStringCreate4(void) {
     unsigned int *ptr = 0;
     OSStatus st = 0;
     UInt32 length;

diff  --git a/clang/test/Analysis/keychainAPI.m b/clang/test/Analysis/keychainAPI.m
index 15a3b66b1a384..f72bc786b0200 100644
--- a/clang/test/Analysis/keychainAPI.m
+++ b/clang/test/Analysis/keychainAPI.m
@@ -70,7 +70,7 @@ OSStatus SecKeychainItemFreeAttributesAndData (
    void *data
 );
 
-void errRetVal() {
+void errRetVal(void) {
   unsigned int *ptr = 0;
   OSStatus st = 0;
   UInt32 length;
@@ -81,7 +81,7 @@ void errRetVal() {
 } // expected-warning{{Allocated data is not released: missing a call to 'SecKeychainItemFreeContent'}}
 
 // If null is passed in, the data is not allocated, so no need for the matching free.
-void fooDoNotReportNull() {
+void fooDoNotReportNull(void) {
     unsigned int *ptr = 0;
     OSStatus st = 0;
     UInt32 *length = 0;
@@ -90,7 +90,7 @@ void fooDoNotReportNull() {
     SecKeychainItemCopyContent(2, ptr, ptr, length, outData);
 }// no-warning
 
-void doubleAlloc() {
+void doubleAlloc(void) {
     unsigned int *ptr = 0;
     OSStatus st = 0;
     UInt32 length;
@@ -102,7 +102,7 @@ void doubleAlloc() {
 }
 
 // Do not warn if undefined value is passed to a function.
-void fooOnlyFreeUndef() {
+void fooOnlyFreeUndef(void) {
   unsigned int *ptr = 0;
   OSStatus st = 0;
   UInt32 length;
@@ -116,7 +116,7 @@ void fooOnlyFreeParam(void *attrList, void* X) {
 }// no-warning
 
 // If we are returning the value, do not report.
-void* returnContent() {
+void* returnContent(void) {
   unsigned int *ptr = 0;
   OSStatus st = 0;
   UInt32 length;
@@ -235,7 +235,7 @@ int testErrorCodeAsLHS(CFTypeRef keychainOrArray, SecProtocolType protocol,
 }
 
 void free(void *ptr);
-void deallocateWithFree() {
+void deallocateWithFree(void) {
     unsigned int *ptr = 0;
     OSStatus st = 0;
     UInt32 length;
@@ -314,7 +314,7 @@ void DellocWithCFStringCreate4(CFAllocatorRef alloc) {
 
 static CFAllocatorRef gKeychainDeallocator = 0;
 
-static CFAllocatorRef GetKeychainDeallocator() {  
+static CFAllocatorRef GetKeychainDeallocator(void) {  
   return gKeychainDeallocator;
 }
 
@@ -331,7 +331,7 @@ CFStringRef DellocWithCFStringCreate5(CFAllocatorRef alloc) {
   return 0;
 }
 
-void radar10508828() {
+void radar10508828(void) {
   UInt32 pwdLen = 0;
   void*  pwdBytes = 0;
   OSStatus rc = SecKeychainFindGenericPassword(0, 3, "foo", 3, "bar", &pwdLen, &pwdBytes, 0);
@@ -340,7 +340,7 @@ void radar10508828() {
     SecKeychainItemFreeContent(0, pwdBytes);
 }
 
-void radar10508828_20092614() {
+void radar10508828_20092614(void) {
   UInt32 pwdLen = 0;
   void*  pwdBytes = 0;
   OSStatus rc = SecKeychainFindGenericPassword(0, 3, "foo", 3, "bar", &pwdLen, &pwdBytes, 0);
@@ -386,7 +386,7 @@ OSStatus my_Allocate_Param(void** password, UInt32* passwordLength) {
   return err;
 }
 
-void allocAndFree1() {
+void allocAndFree1(void) {
     unsigned int *ptr = 0;
     OSStatus st = 0;
     UInt32 length;
@@ -417,7 +417,7 @@ void allocAndFree2(void *attrList) {
       my_FreeParam(attrList, outData);
 }
 
-void allocNoFree3() {
+void allocNoFree3(void) {
     UInt32 length = 32;
     void *outData;    
     void *outData2;
@@ -441,7 +441,7 @@ void allocAndFree3(void *attrList) {
     OSStatus (*SetContextVal)(AuthorizationValue *inValue);
 } AuthorizationCallback;
 static AuthorizationCallback cb;
-int radar_19196494() {
+int radar_19196494(void) {
   @autoreleasepool {
     AuthorizationValue login_password = {};
     UInt32 passwordLength;
@@ -454,7 +454,7 @@ int radar_19196494() {
   }
   return 0;
 }
-int radar_19196494_v2() {
+int radar_19196494_v2(void) {
   @autoreleasepool {
     AuthorizationValue login_password = {};
     OSStatus err = SecKeychainFindGenericPassword(0, 0, "", 0, "", (UInt32 *)&login_password.length, (void**)&login_password.data, 0);

diff  --git a/clang/test/Analysis/kmalloc-linux.c b/clang/test/Analysis/kmalloc-linux.c
index 4cca5712b0967..af1af24126b6a 100644
--- a/clang/test/Analysis/kmalloc-linux.c
+++ b/clang/test/Analysis/kmalloc-linux.c
@@ -16,7 +16,7 @@ struct test {
 
 void foo(struct test *);
 
-void test_zeroed() {
+void test_zeroed(void) {
   struct test **list, *t;
   int i;
 
@@ -31,7 +31,7 @@ void test_zeroed() {
   kfree(list); // no-warning
 }
 
-void test_nonzero() {
+void test_nonzero(void) {
   struct test **list, *t;
   int i;
 
@@ -126,12 +126,12 @@ void test_3arg_malloc_leak(struct malloc_type *mtp, int flags) {
 // if a block of size 0 is requested
 #define ZERO_SIZE_PTR ((void *)16)
 
-void test_kfree_ZERO_SIZE_PTR() {
+void test_kfree_ZERO_SIZE_PTR(void) {
   void *ptr = ZERO_SIZE_PTR;
   kfree(ptr); // no warning about freeing this value
 }
 
-void test_kfree_other_constant_value() {
+void test_kfree_other_constant_value(void) {
   void *ptr = (void *)1;
   kfree(ptr); // expected-warning{{Argument to kfree() is a constant address (1)}}
 }

diff  --git a/clang/test/Analysis/live-variables.m b/clang/test/Analysis/live-variables.m
index d2390f3f8787a..0d345e82c02a7 100644
--- a/clang/test/Analysis/live-variables.m
+++ b/clang/test/Analysis/live-variables.m
@@ -5,9 +5,9 @@ @interface NSObject
 @interface NSString : NSObject
 - (id)lastPathComponent;
 @end
-int getBool();
-int *getPtr();
-int foo() {
+int getBool(void);
+int *getPtr(void);
+int foo(void) {
   int r = 0;
   NSString *filename = @"filename";
   for (int x = 0; x< 10; x++) {

diff  --git a/clang/test/Analysis/localization-aggressive.m b/clang/test/Analysis/localization-aggressive.m
index 145d5e1a53199..d2c79e01b1b86 100644
--- a/clang/test/Analysis/localization-aggressive.m
+++ b/clang/test/Analysis/localization-aggressive.m
@@ -60,7 +60,7 @@ @interface LocalizationTestSuite : NSObject
 NSString *ForceLocalized(NSString *str)
     __attribute__((annotate("returns_localized_nsstring")));
 CGPoint CGPointMake(CGFloat x, CGFloat y);
-int random();
+int random(void);
 // This next one is a made up API
 NSString *CFNumberFormatterCreateStringWithNumber(float x);
 + (NSString *)forceLocalized:(NSString *)str

diff  --git a/clang/test/Analysis/localization.m b/clang/test/Analysis/localization.m
index a9fd2445eb15c..3d65119be6018 100644
--- a/clang/test/Analysis/localization.m
+++ b/clang/test/Analysis/localization.m
@@ -37,7 +37,7 @@ @interface TestObject : NSObject
 @end
 
 @interface LocalizationTestSuite : NSObject
-int random();
+int random(void);
 @property (assign) int unreadArticlesCount;
 @end
 #define MCLocalizedString(s) NSLocalizedString(s,nil);

diff  --git a/clang/test/Analysis/logical-ops.c b/clang/test/Analysis/logical-ops.c
index c9ab7fcbe0214..be68569fcd8e5 100644
--- a/clang/test/Analysis/logical-ops.c
+++ b/clang/test/Analysis/logical-ops.c
@@ -40,7 +40,7 @@ void useUndef(void) { 0 || undef(); }
 void testPointer(void) { (void) (1 && testPointer && 0); }
 
 char *global_ap, *global_bp, *global_cp;
-void ambiguous_backtrack_1() {
+void ambiguous_backtrack_1(void) {
   for (;;) {
     (global_bp - global_ap ? global_cp[global_bp - global_ap] : 0) || 1;
     global_bp++;

diff  --git a/clang/test/Analysis/loop-block-counts.c b/clang/test/Analysis/loop-block-counts.c
index ab26864d2d959..9af67b1b632f5 100644
--- a/clang/test/Analysis/loop-block-counts.c
+++ b/clang/test/Analysis/loop-block-counts.c
@@ -10,7 +10,7 @@ variable 'x' is still referred to by the stack variable 'arr' upon \
 returning to the caller}}
 }
 
-void loop() {
+void loop(void) {
   void *arr[2];
   for (int i = 0; i < 2; ++i)
     callee(&arr[i]);
@@ -18,7 +18,7 @@ void loop() {
   clang_analyzer_eval(arr[0] == arr[1]); // expected-warning{{FALSE}}
 }
 
-void loopWithCall() {
+void loopWithCall(void) {
   void *arr[2];
   for (int i = 0; i < 2; ++i) {
     int x;

diff  --git a/clang/test/Analysis/loop-widening.c b/clang/test/Analysis/loop-widening.c
index edaabfb28e97b..ed1a750b373ff 100644
--- a/clang/test/Analysis/loop-widening.c
+++ b/clang/test/Analysis/loop-widening.c
@@ -2,13 +2,13 @@
 // RUN: %clang_analyze_cc1 -DTEST_NULL_TERM -analyzer-checker=core,unix.Malloc,debug.ExprInspection,alpha.cplusplus.IteratorRange -analyzer-max-loop 4 -analyzer-config widen-loops=true -verify -analyzer-config eagerly-assume=false %s
 
 void clang_analyzer_eval(int);
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 
 typedef __typeof(sizeof(int)) size_t;
 void *malloc(size_t);
 void free(void *);
 
-void loop_which_iterates_limit_times_not_widened() {
+void loop_which_iterates_limit_times_not_widened(void) {
   int i;
   int x = 1;
   // Check loop isn't widened by checking x isn't invalidated
@@ -24,7 +24,7 @@ void loop_which_iterates_limit_times_not_widened() {
 
 int a_global;
 
-void loop_evaluated_before_widening() {
+void loop_evaluated_before_widening(void) {
   int i;
   a_global = 1;
   for (i = 0; i < 10; ++i) {
@@ -36,31 +36,31 @@ void loop_evaluated_before_widening() {
   clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }
 
-void warnings_after_loop() {
+void warnings_after_loop(void) {
   int i;
   for (i = 0; i < 10; ++i) {}
   char *m = (char*)malloc(12);
 } // expected-warning {{Potential leak of memory pointed to by 'm'}}
 
-void for_loop_exits() {
+void for_loop_exits(void) {
   int i;
   for (i = 0; i < 10; ++i) {}
   clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }
 
-void while_loop_exits() {
+void while_loop_exits(void) {
   int i = 0;
   while (i < 10) {++i;}
   clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }
 
-void do_while_loop_exits() {
+void do_while_loop_exits(void) {
   int i = 0;
   do {++i;} while (i < 10);
   clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }
 
-void loop_body_is_widened() {
+void loop_body_is_widened(void) {
   int i = 0;
   while (i < 100) {
     if (i > 10) {
@@ -71,13 +71,13 @@ void loop_body_is_widened() {
   clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }
 
-void invariably_infinite_loop() {
+void invariably_infinite_loop(void) {
   int i = 0;
   while (1) { ++i; }
   clang_analyzer_warnIfReached(); // no-warning
 }
 
-void invariably_infinite_break_loop() {
+void invariably_infinite_break_loop(void) {
   int i = 0;
   while (1) {
     ++i;
@@ -87,7 +87,7 @@ void invariably_infinite_break_loop() {
   clang_analyzer_warnIfReached(); // no-warning
 }
 
-void reachable_break_loop() {
+void reachable_break_loop(void) {
   int i = 0;
   while (1) {
     ++i;
@@ -96,7 +96,7 @@ void reachable_break_loop() {
   clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }
 
-void condition_constrained_true_in_loop() {
+void condition_constrained_true_in_loop(void) {
   int i = 0;
   while (i < 50) {
     clang_analyzer_eval(i < 50); // expected-warning {{TRUE}}
@@ -105,7 +105,7 @@ void condition_constrained_true_in_loop() {
   clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }
 
-void condition_constrained_false_after_loop() {
+void condition_constrained_false_after_loop(void) {
   int i = 0;
   while (i < 50) {
     ++i;
@@ -114,7 +114,7 @@ void condition_constrained_false_after_loop() {
   clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }
 
-void multiple_exit_test() {
+void multiple_exit_test(void) {
   int x = 0;
   int i = 0;
   while (i < 50) {
@@ -133,7 +133,7 @@ void multiple_exit_test() {
   if (i > 10 && i < 50) clang_analyzer_warnIfReached(); // no-warning
 }
 
-void pointer_doesnt_leak_from_loop() {
+void pointer_doesnt_leak_from_loop(void) {
   int *h_ptr = (int *) malloc(sizeof(int));
   for (int i = 0; i < 2; ++i) {}
   for (int i = 0; i < 10; ++i) {} // no-warning
@@ -166,7 +166,7 @@ void variable_bound_exiting_loops_widened(int x) {
   clang_analyzer_eval(t == 1); // expected-warning {{TRUE}} // expected-warning {{UNKNOWN}}
 }
 
-void nested_loop_outer_widen() {
+void nested_loop_outer_widen(void) {
   int i = 0, j = 0;
   for (i = 0; i < 10; i++) {
     clang_analyzer_eval(i < 10); // expected-warning {{TRUE}}
@@ -178,7 +178,7 @@ void nested_loop_outer_widen() {
   clang_analyzer_eval(i >= 10); // expected-warning {{TRUE}}
 }
 
-void nested_loop_inner_widen() {
+void nested_loop_inner_widen(void) {
   int i = 0, j = 0;
   for (i = 0; i < 2; i++) {
     clang_analyzer_eval(i < 2); // expected-warning {{TRUE}}

diff  --git a/clang/test/Analysis/main.c b/clang/test/Analysis/main.c
index aa4c506096002..a3b4a958e0b59 100644
--- a/clang/test/Analysis/main.c
+++ b/clang/test/Analysis/main.c
@@ -10,7 +10,7 @@ int arr[] = {4, 5, 6};
 
 void clang_analyzer_eval(int);
 
-int main() {
+int main(void) {
   // In main() we know that the initial values are still valid.
   clang_analyzer_eval(x == 1); // expected-warning{{TRUE}}
   clang_analyzer_eval(s.a == 2); // expected-warning{{TRUE}}
@@ -21,7 +21,7 @@ int main() {
   return 0;
 }
 
-void foo() {
+void foo(void) {
   // In other functions these values may already be overwritten.
   clang_analyzer_eval(x == 1); // expected-warning{{TRUE}} // expected-warning{{FALSE}}
   clang_analyzer_eval(s.a == 2); // expected-warning{{TRUE}} // expected-warning{{FALSE}}

diff  --git a/clang/test/Analysis/malloc-annotations.c b/clang/test/Analysis/malloc-annotations.c
index f7904ef0925fa..39381c5d841f2 100644
--- a/clang/test/Analysis/malloc-annotations.c
+++ b/clang/test/Analysis/malloc-annotations.c
@@ -30,53 +30,53 @@ struct stuff {
 };
 struct stuff myglobalstuff;
 
-void f1() {
+void f1(void) {
   int *p = malloc(12);
   return; // expected-warning{{Potential leak of memory pointed to by}}
 }
 
-void f2() {
+void f2(void) {
   int *p = malloc(12);
   free(p);
   free(p); // expected-warning{{Attempt to free released memory}}
 }
 
-void f2_realloc_0() {
+void f2_realloc_0(void) {
   int *p = malloc(12);
   realloc(p,0);
   realloc(p,0); // expected-warning{{Attempt to free released memory}}
 }
 
-void f2_realloc_1() {
+void f2_realloc_1(void) {
   int *p = malloc(12);
   int *q = realloc(p,0); // no-warning
 }
 
 // ownership attributes tests
-void naf1() {
+void naf1(void) {
   int *p = my_malloc3(12);
   return; // no-warning
 }
 
-void n2af1() {
+void n2af1(void) {
   int *p = my_malloc2(12);
   return; // expected-warning{{Potential leak of memory pointed to by}}
 }
 
-void af1() {
+void af1(void) {
   int *p = my_malloc(12);
   return; // expected-warning{{Potential leak of memory pointed to by}}
 }
 
-void af1_b() {
+void af1_b(void) {
   int *p = my_malloc(12);
 } // expected-warning{{Potential leak of memory pointed to by}}
 
-void af1_c() {
+void af1_c(void) {
   myglobalpointer = my_malloc(12); // no-warning
 }
 
-void af1_d() {
+void af1_d(void) {
   struct stuff mystuff;
   mystuff.somefield = my_malloc(12);
 } // expected-warning{{Potential leak of memory pointed to by}}
@@ -96,32 +96,32 @@ void af1_g(struct stuff **pps) {
   (*pps)->somefield = my_malloc(42); // no-warning
 }
 
-void af2() {
+void af2(void) {
   int *p = my_malloc(12);
   my_free(p);
   free(p); // expected-warning{{Attempt to free released memory}}
 }
 
-void af2b() {
+void af2b(void) {
   int *p = my_malloc(12);
   free(p);
   my_free(p); // expected-warning{{Attempt to free released memory}}
 }
 
-void af2c() {
+void af2c(void) {
   int *p = my_malloc(12);
   free(p);
   my_hold(p); // expected-warning{{Attempt to free released memory}}
 }
 
-void af2d() {
+void af2d(void) {
   int *p = my_malloc(12);
   free(p);
   my_hold2(0, 0, p); // expected-warning{{Attempt to free released memory}}
 }
 
 // No leak if malloc returns null.
-void af2e() {
+void af2e(void) {
   int *p = my_malloc(12);
   if (!p)
     return; // no-warning
@@ -129,20 +129,20 @@ void af2e() {
 }
 
 // This case inflicts a possible double-free.
-void af3() {
+void af3(void) {
   int *p = my_malloc(12);
   my_hold(p);
   free(p); // expected-warning{{Attempt to free non-owned memory}}
 }
 
-int * af4() {
+int * af4(void) {
   int *p = my_malloc(12);
   my_free(p);
   return p; // expected-warning{{Use of memory after it is freed}}
 }
 
 // This case is (possibly) ok, be conservative
-int * af5() {
+int * af5(void) {
   int *p = my_malloc(12);
   my_hold(p);
   return p; // no-warning
@@ -153,7 +153,7 @@ int * af5() {
 // This case tests that storing malloc'ed memory to a static variable which is
 // then returned is not leaked.  In the absence of known contracts for functions
 // or inter-procedural analysis, this is a conservative answer.
-int *f3() {
+int *f3(void) {
   static int *p = 0;
   p = malloc(12);
   return p; // no-warning
@@ -163,18 +163,18 @@ int *f3() {
 // which is then returned is not leaked.  In the absence of known contracts for
 // functions or inter-procedural analysis, this is a conservative answer.
 static int *p_f4 = 0;
-int *f4() {
+int *f4(void) {
   p_f4 = malloc(12);
   return p_f4; // no-warning
 }
 
-int *f5() {
+int *f5(void) {
   int *q = malloc(12);
   q = realloc(q, 20);
   return q; // no-warning
 }
 
-void f6() {
+void f6(void) {
   int *p = malloc(12);
   if (!p)
     return; // no-warning
@@ -182,7 +182,7 @@ void f6() {
     free(p);
 }
 
-void f6_realloc() {
+void f6_realloc(void) {
   int *p = malloc(12);
   if (!p)
     return; // no-warning
@@ -191,51 +191,51 @@ void f6_realloc() {
 }
 
 
-char *doit2();
-void pr6069() {
+char *doit2(void);
+void pr6069(void) {
   char *buf = doit2();
   free(buf);
 }
 
-void pr6293() {
+void pr6293(void) {
   free(0);
 }
 
-void f7() {
+void f7(void) {
   char *x = (char*) malloc(4);
   free(x);
   x[0] = 'a'; // expected-warning{{Use of memory after it is freed}}
 }
 
-void f7_realloc() {
+void f7_realloc(void) {
   char *x = (char*) malloc(4);
   realloc(x,0);
   x[0] = 'a'; // expected-warning{{Use of memory after it is freed}}
 }
 
-void PR6123() {
+void PR6123(void) {
   int *x = malloc(11); // expected-warning{{Cast a region whose size is not a multiple of the destination type size}}
 }
 
-void PR7217() {
+void PR7217(void) {
   int *buf = malloc(2); // expected-warning{{Cast a region whose size is not a multiple of the destination type size}}
   buf[1] = 'c'; // not crash
 }
 
-void mallocCastToVoid() {
+void mallocCastToVoid(void) {
   void *p = malloc(2);
   const void *cp = p; // not crash
   free(p);
 }
 
-void mallocCastToFP() {
+void mallocCastToFP(void) {
   void *p = malloc(2);
-  void (*fp)() = p; // not crash
+  void (*fp)(void) = p; // not crash
   free(p);
 }
 
 // This tests that malloc() buffers are undefined by default
-char mallocGarbage () {
+char mallocGarbage (void) {
   char *buf = malloc(2);
   char result = buf[1]; // expected-warning{{undefined}}
   free(buf);
@@ -243,13 +243,13 @@ char mallocGarbage () {
 }
 
 // This tests that calloc() buffers need to be freed
-void callocNoFree () {
+void callocNoFree (void) {
   char *buf = calloc(2,2);
   return; // expected-warning{{Potential leak of memory pointed to by}}
 }
 
 // These test that calloc() buffers are zeroed by default
-char callocZeroesGood () {
+char callocZeroesGood (void) {
   char *buf = calloc(2,2);
   char result = buf[3]; // no-warning
   if (buf[1] == 0) {
@@ -258,7 +258,7 @@ char callocZeroesGood () {
   return result; // no-warning
 }
 
-char callocZeroesBad () {
+char callocZeroesBad (void) {
   char *buf = calloc(2,2);
   char result = buf[3]; // no-warning
   if (buf[1] != 0) {
@@ -267,7 +267,7 @@ char callocZeroesBad () {
   return result; // expected-warning{{Potential leak of memory pointed to by}}
 }
 
-void testMultipleFreeAnnotations() {
+void testMultipleFreeAnnotations(void) {
   int *p = malloc(12);
   int *q = malloc(12);
   my_freeBoth(p, q);

diff  --git a/clang/test/Analysis/malloc-custom.c b/clang/test/Analysis/malloc-custom.c
index 053d0ee31ca89..5cbbf9f39c040 100644
--- a/clang/test/Analysis/malloc-custom.c
+++ b/clang/test/Analysis/malloc-custom.c
@@ -8,17 +8,17 @@
 
 // expected-no-diagnostics
 
-char alloca();
-char malloc();
-char realloc();
-char kmalloc();
-char valloc();
-char calloc();
+char alloca(void);
+char malloc(void);
+char realloc(void);
+char kmalloc(void);
+char valloc(void);
+char calloc(void);
 
-char free();
-char kfree();
+char free(void);
+char kfree(void);
 
-void testCustomArgumentlessAllocation() {
+void testCustomArgumentlessAllocation(void) {
   alloca(); // no-crash
   malloc(); // no-crash
   realloc(); // no-crash

diff  --git a/clang/test/Analysis/malloc-fnptr-plist.c b/clang/test/Analysis/malloc-fnptr-plist.c
index 432c1ddd7f9bf..e3482980dfbf6 100644
--- a/clang/test/Analysis/malloc-fnptr-plist.c
+++ b/clang/test/Analysis/malloc-fnptr-plist.c
@@ -3,7 +3,7 @@
 
 void free(void *);
 void (*fnptr)(int);
-void foo() {
+void foo(void) {
   free((void *)fnptr);
   // expected-warning at -1{{Argument to free() is a function pointer}}
   // expected-warning at -2{{attempt to call free on non-heap object '(void *)fnptr'}}

diff  --git a/clang/test/Analysis/malloc-interprocedural.c b/clang/test/Analysis/malloc-interprocedural.c
index 4f7daec1b5bce..da1f1c3169348 100644
--- a/clang/test/Analysis/malloc-interprocedural.c
+++ b/clang/test/Analysis/malloc-interprocedural.c
@@ -29,32 +29,32 @@ static void my_free1(void *p) {
   free(p);
 }
 
-static void test1() {
+static void test1(void) {
   void *data = 0;
   my_malloc1(&data, 4);
 } // expected-warning {{Potential leak of memory pointed to by 'data'}}
 
-static void test11() {
+static void test11(void) {
   void *data = 0;
   my_malloc1(&data, 4);
   my_free1(data);
 }
 
-static void testUniqueingByallocationSiteInTopLevelFunction() {
+static void testUniqueingByallocationSiteInTopLevelFunction(void) {
   void *data = my_malloc2(1, 4);
   data = 0;
   int x = 5;// expected-warning {{Potential leak of memory pointed to by 'data'}}
   data = my_malloc2(1, 4);
 } // expected-warning {{Potential leak of memory pointed to by 'data'}}
 
-static void test3() {
+static void test3(void) {
   void *data = my_malloc2(1, 4);
   free(data);
   data = my_malloc2(1, 4);
   free(data);
 }
 
-int test4() {
+int test4(void) {
   int *data = (int*)my_malloc2(1, 4);
   my_free1(data);
   data = (int *)my_malloc2(1, 4);
@@ -62,14 +62,14 @@ int test4() {
   return *data; // expected-warning {{Use of memory after it is freed}}
 }
 
-void test6() {
+void test6(void) {
   int *data = (int *)my_malloc2(1, 4);
   my_free1((int*)data);
   my_free1((int*)data); // expected-warning{{Use of memory after it is freed}}
 }
 
 // TODO: We should warn here.
-void test5() {
+void test5(void) {
   int *data;
   my_free1((int*)data);
 }
@@ -78,7 +78,7 @@ static char *reshape(char *in) {
     return 0;
 }
 
-void testThatRemoveDeadBindingsRunBeforeEachCall() {
+void testThatRemoveDeadBindingsRunBeforeEachCall(void) {
     char *v = malloc(12);
     v = reshape(v);
     v = reshape(v);// expected-warning {{Potential leak of memory pointed to by 'v'}}
@@ -92,7 +92,7 @@ void fooWithEmptyReturn(int x) {
   return;
 }
 
-int uafAndCallsFooWithEmptyReturn() {
+int uafAndCallsFooWithEmptyReturn(void) {
   int *x = (int*)malloc(12);
   free(x);
   fooWithEmptyReturn(12);

diff  --git a/clang/test/Analysis/malloc-overflow.c b/clang/test/Analysis/malloc-overflow.c
index dada27bccbfd6..03fe15bccb62e 100644
--- a/clang/test/Analysis/malloc-overflow.c
+++ b/clang/test/Analysis/malloc-overflow.c
@@ -14,7 +14,7 @@ void * f2(int n)
   return malloc(sizeof(int) * n); // // expected-warning {{the computation of the size of the memory allocation may overflow}}
 }
 
-void * f3()
+void * f3(void)
 {
   return malloc(4 * sizeof(int));  // no-warning
 }

diff  --git a/clang/test/Analysis/malloc-plist.c b/clang/test/Analysis/malloc-plist.c
index 1beecc9076a17..9c03c0b3a05af 100644
--- a/clang/test/Analysis/malloc-plist.c
+++ b/clang/test/Analysis/malloc-plist.c
@@ -16,13 +16,13 @@ void diagnosticTest(int in) {
     in++; // expected-warning {{leak}}
 }
 
-void myArrayAllocation() {
+void myArrayAllocation(void) {
     int **A;
     A = malloc(2*sizeof(int*));
     A[0] = 0;
 }//expected-warning{{Potential leak}}
 
-void reallocDiagnostics() {
+void reallocDiagnostics(void) {
     char * buf = malloc(100);
     char * tmp;
     tmp = (char*)realloc(buf, 0x1000000);
@@ -33,7 +33,7 @@ void reallocDiagnostics() {
     free(buf);
 }
 
-void *wrapper() {
+void *wrapper(void) {
   void *x = malloc(100);
   // This is intentionally done to test diagnostic emission.
   if (x)
@@ -41,7 +41,7 @@ void *wrapper() {
   return 0;
 }
 
-void test_wrapper() {
+void test_wrapper(void) {
   void *buf = wrapper();
   (void) buf;
 }//expected-warning{{Potential leak}}
@@ -57,7 +57,7 @@ void my_malloc_and_free(void **x) {
       my_free(*x);
     return;
 }
-void *test_double_action_call() {
+void *test_double_action_call(void) {
     void *buf;
     my_malloc_and_free(&buf);
     return buf; //expected-warning{{Use of memory after it is freed}}
@@ -72,17 +72,17 @@ char *my_realloc(char *buf) {
     }
     return tmp;
 }
-void reallocIntra() {
+void reallocIntra(void) {
     char *buf = (char *)malloc(100);
     buf = my_realloc(buf);
     free(buf);//expected-warning{{Potential leak}}
 }
 
 // Test stack hint when returning a result.
-static char *malloc_wrapper_ret() {
+static char *malloc_wrapper_ret(void) {
     return (char*)malloc(12);
 }
-void use_ret() {
+void use_ret(void) {
     char *v;
     v = malloc_wrapper_ret();
 }//expected-warning{{Potential leak}}
@@ -94,7 +94,7 @@ void myfree_takingblock(void (^ignored)(void), int *p) {
   free(p);
 }
 
-void call_myfree_takingblock() {
+void call_myfree_takingblock(void) {
   void (^some_block)(void) = ^void(void) { };
 
   int *p = malloc(sizeof(int));
@@ -116,19 +116,19 @@ void LeakedSymbol(int in) {
 }
 
 // Tests that exercise running remove dead bindings at Call exit.
-static void function_with_leak1() {
+static void function_with_leak1(void) {
     char *x = (char*)malloc(12);
 } //expected-warning{{Potential leak}}
-void use_function_with_leak1() {
+void use_function_with_leak1(void) {
     function_with_leak1();
     int y = 0;
 }
 
-static void function_with_leak2() {
+static void function_with_leak2(void) {
     char *x = (char*)malloc(12);
     int m = 0; //expected-warning{{Potential leak}}
 }
-void use_function_with_leak2() {
+void use_function_with_leak2(void) {
     function_with_leak2();
 }
 
@@ -152,58 +152,58 @@ void use_function_with_leak4(int y) {
     function_with_leak4(y);
 }
 
-int anotherFunction5() {
+int anotherFunction5(void) {
     return 5;
 }
-static int function_with_leak5() {
+static int function_with_leak5(void) {
     char *x = (char*)malloc(12);
     return anotherFunction5();//expected-warning{{Potential leak}}
 }
-void use_function_with_leak5() {
+void use_function_with_leak5(void) {
     function_with_leak5();
 }
 
 void anotherFunction6(int m) {
     m++;
 }
-static void function_with_leak6() {
+static void function_with_leak6(void) {
     char *x = (char*)malloc(12);
     anotherFunction6(3);//expected-warning{{Potential leak}}
 }
-void use_function_with_leak6() {
+void use_function_with_leak6(void) {
     function_with_leak6();
 }
 
-static void empty_function(){
+static void empty_function(void){
 }
-void use_empty_function() {
+void use_empty_function(void) {
     empty_function();
 }
-static char *function_with_leak7() {
+static char *function_with_leak7(void) {
     return (char*)malloc(12);
 }
-void use_function_with_leak7() {
+void use_function_with_leak7(void) {
     function_with_leak7();
 }//expected-warning{{Potential memory leak}}
 
 // Test that we do not print the name of a variable not visible from where
 // the issue is reported.
-int *my_malloc() {
+int *my_malloc(void) {
   int *p = malloc(12);
   return p;
 }
-void testOnlyRefferToVisibleVariables() {
+void testOnlyRefferToVisibleVariables(void) {
   my_malloc();
 } // expected-warning{{Potential memory leak}}
 
 struct PointerWrapper{
   int*p;
 };
-int *my_malloc_into_struct() {
+int *my_malloc_into_struct(void) {
   struct PointerWrapper w;
   w.p = malloc(12);
   return w.p;
 }
-void testMyMalloc() {
+void testMyMalloc(void) {
   my_malloc_into_struct();
 } // expected-warning{{Potential memory leak}}

diff  --git a/clang/test/Analysis/malloc-protoype.c b/clang/test/Analysis/malloc-protoype.c
index 0b8c0f9f28df7..5f6d9fcb1c82e 100644
--- a/clang/test/Analysis/malloc-protoype.c
+++ b/clang/test/Analysis/malloc-protoype.c
@@ -6,12 +6,12 @@
 void malloc(int i);
 void valloc(int i);
 
-void test1()
+void test1(void)
 {
   malloc(1);
 }
 
-void test2()
+void test2(void)
 {
   valloc(1);
 }

diff  --git a/clang/test/Analysis/malloc-sizeof.c b/clang/test/Analysis/malloc-sizeof.c
index 9d2ada4af1e25..4573c193881e3 100644
--- a/clang/test/Analysis/malloc-sizeof.c
+++ b/clang/test/Analysis/malloc-sizeof.c
@@ -31,13 +31,13 @@ void foo(unsigned int unsignedInt, unsigned int readSize) {
 }
 
 // Don't warn when the types 
diff er only by constness.
-void ignore_const() {
+void ignore_const(void) {
   const char **x = (const char **)malloc(1 * sizeof(char *)); // no-warning
   const char ***y = (const char ***)malloc(1 * sizeof(char *)); // expected-warning {{Result of 'malloc' is converted to a pointer of type 'const char **', which is incompatible with sizeof operand type 'char *'}}
   free(x);
 }
 
-int *mallocArraySize() {
+int *mallocArraySize(void) {
   static const int sTable[10];
   static const int nestedTable[10][2];
   int *table = malloc(sizeof sTable);
@@ -47,7 +47,7 @@ int *mallocArraySize() {
   return table;
 }
 
-int *mallocWrongArraySize() {
+int *mallocWrongArraySize(void) {
   static const double sTable[10];
   int *table = malloc(sizeof sTable); // expected-warning {{Result of 'malloc' is converted to a pointer of type 'int', which is incompatible with sizeof operand type 'const double[10]'}}
   return table;

diff  --git a/clang/test/Analysis/malloc-three-arg.c b/clang/test/Analysis/malloc-three-arg.c
index a2103376e348a..005b8940a1a99 100644
--- a/clang/test/Analysis/malloc-three-arg.c
+++ b/clang/test/Analysis/malloc-three-arg.c
@@ -12,7 +12,7 @@ struct test {
 
 void foo(struct test *);
 
-void test_zeroed() {
+void test_zeroed(void) {
   struct test **list, *t;
   int i;
 
@@ -27,7 +27,7 @@ void test_zeroed() {
   free(list); // no-warning
 }
 
-void test_nonzero() {
+void test_nonzero(void) {
   struct test **list, *t;
   int i;
 

diff  --git a/clang/test/Analysis/malloc.c b/clang/test/Analysis/malloc.c
index ef275ae5028b6..63aed2fe98a43 100644
--- a/clang/test/Analysis/malloc.c
+++ b/clang/test/Analysis/malloc.c
@@ -46,26 +46,26 @@ void *_alloca(size_t size);
 
 void myfoo(int *p);
 void myfooint(int p);
-char *fooRetPtr();
+char *fooRetPtr(void);
 
-void f1() {
+void f1(void) {
   int *p = malloc(12);
   return; // expected-warning{{Potential leak of memory pointed to by 'p'}}
 }
 
-void f2() {
+void f2(void) {
   int *p = malloc(12);
   free(p);
   free(p); // expected-warning{{Attempt to free released memory}}
 }
 
-void f2_realloc_0() {
+void f2_realloc_0(void) {
   int *p = malloc(12);
   realloc(p,0);
   realloc(p,0); // expected-warning{{Attempt to free released memory}}
 }
 
-void f2_realloc_1() {
+void f2_realloc_1(void) {
   int *p = malloc(12);
   int *q = realloc(p,0); // no-warning
 }
@@ -79,26 +79,26 @@ void reallocNotNullPtr(unsigned sizeIn) {
   }
 }
 
-void allocaTest() {
+void allocaTest(void) {
   int *p = alloca(sizeof(int));
 } // no warn
 
-void winAllocaTest() {
+void winAllocaTest(void) {
   int *p = _alloca(sizeof(int));
 } // no warn
 
-void allocaBuiltinTest() {
+void allocaBuiltinTest(void) {
   int *p = __builtin_alloca(sizeof(int));
 } // no warn
 
-int *realloctest1() {
+int *realloctest1(void) {
   int *q = malloc(12);
   q = realloc(q, 20);
   return q; // no warning - returning the allocated value
 }
 
 // p should be freed if realloc fails.
-void reallocFails() {
+void reallocFails(void) {
   char *p = malloc(12);
   char *r = realloc(p, 12+1);
   if (!r) {
@@ -108,7 +108,7 @@ void reallocFails() {
   }
 }
 
-void reallocSizeZero1() {
+void reallocSizeZero1(void) {
   char *p = malloc(12);
   char *r = realloc(p, 0);
   if (!r) {
@@ -118,7 +118,7 @@ void reallocSizeZero1() {
   }
 }
 
-void reallocSizeZero2() {
+void reallocSizeZero2(void) {
   char *p = malloc(12);
   char *r = realloc(p, 0);
   if (!r) {
@@ -129,37 +129,37 @@ void reallocSizeZero2() {
   free(p); // expected-warning {{Attempt to free released memory}}
 }
 
-void reallocSizeZero3() {
+void reallocSizeZero3(void) {
   char *p = malloc(12);
   char *r = realloc(p, 0);
   free(r);
 }
 
-void reallocSizeZero4() {
+void reallocSizeZero4(void) {
   char *r = realloc(0, 0);
   free(r);
 }
 
-void reallocSizeZero5() {
+void reallocSizeZero5(void) {
   char *r = realloc(0, 0);
 }
 
-void reallocPtrZero1() {
+void reallocPtrZero1(void) {
   char *r = realloc(0, 12);
 } // expected-warning {{Potential leak of memory pointed to by 'r'}}
 
-void reallocPtrZero2() {
+void reallocPtrZero2(void) {
   char *r = realloc(0, 12);
   if (r)
     free(r);
 }
 
-void reallocPtrZero3() {
+void reallocPtrZero3(void) {
   char *r = realloc(0, 12);
   free(r);
 }
 
-void reallocRadar6337483_1() {
+void reallocRadar6337483_1(void) {
     char *buf = malloc(100);
     buf = (char*)realloc(buf, 0x1000000);
     if (!buf) {
@@ -168,7 +168,7 @@ void reallocRadar6337483_1() {
     free(buf);
 }
 
-void reallocRadar6337483_2() {
+void reallocRadar6337483_2(void) {
     char *buf = malloc(100);
     char *buf2 = (char*)realloc(buf, 0x1000000);
     if (!buf2) {
@@ -178,7 +178,7 @@ void reallocRadar6337483_2() {
     }
 } // expected-warning {{Potential leak of memory pointed to by}}
 
-void reallocRadar6337483_3() {
+void reallocRadar6337483_3(void) {
     char * buf = malloc(100);
     char * tmp;
     tmp = (char*)realloc(buf, 0x1000000);
@@ -190,7 +190,7 @@ void reallocRadar6337483_3() {
     free(buf);
 }
 
-void reallocRadar6337483_4() {
+void reallocRadar6337483_4(void) {
     char *buf = malloc(100);
     char *buf2 = (char*)realloc(buf, 0x1000000);
     if (!buf2) {
@@ -200,13 +200,13 @@ void reallocRadar6337483_4() {
     }
 }
 
-int *reallocfTest1() {
+int *reallocfTest1(void) {
   int *q = malloc(12);
   q = reallocf(q, 20);
   return q; // no warning - returning the allocated value
 }
 
-void reallocfRadar6337483_4() {
+void reallocfRadar6337483_4(void) {
     char *buf = malloc(100);
     char *buf2 = (char*)reallocf(buf, 0x1000000);
     if (!buf2) {
@@ -216,7 +216,7 @@ void reallocfRadar6337483_4() {
     }
 }
 
-void reallocfRadar6337483_3() {
+void reallocfRadar6337483_3(void) {
     char * buf = malloc(100);
     char * tmp;
     tmp = (char*)reallocf(buf, 0x1000000);
@@ -228,49 +228,49 @@ void reallocfRadar6337483_3() {
     free(buf);
 }
 
-void reallocfPtrZero1() {
+void reallocfPtrZero1(void) {
   char *r = reallocf(0, 12);
 } // expected-warning {{Potential leak of memory pointed to by}}
 
 //------------------- Check usage of zero-allocated memory ---------------------
-void CheckUseZeroAllocatedNoWarn1() {
+void CheckUseZeroAllocatedNoWarn1(void) {
   int *p = malloc(0);
   free(p); // no warning
 }
 
-void CheckUseZeroAllocatedNoWarn2() {
+void CheckUseZeroAllocatedNoWarn2(void) {
   int *p = alloca(0); // no warning
 }
 
-void CheckUseZeroWinAllocatedNoWarn2() {
+void CheckUseZeroWinAllocatedNoWarn2(void) {
   int *p = _alloca(0); // no warning
 }
 
 
-void CheckUseZeroAllocatedNoWarn3() {
+void CheckUseZeroAllocatedNoWarn3(void) {
   int *p = malloc(0);
   int *q = realloc(p, 8); // no warning
   free(q);
 }
 
-void CheckUseZeroAllocatedNoWarn4() {
+void CheckUseZeroAllocatedNoWarn4(void) {
   int *p = realloc(0, 8);
   *p = 1; // no warning
   free(p);
 }
 
-void CheckUseZeroAllocated1() {
+void CheckUseZeroAllocated1(void) {
   int *p = malloc(0);
   *p = 1; // expected-warning {{Use of memory allocated with size zero}}
   free(p);
 }
 
-char CheckUseZeroAllocated2() {
+char CheckUseZeroAllocated2(void) {
   char *p = alloca(0);
   return *p; // expected-warning {{Use of memory allocated with size zero}}
 }
 
-char CheckUseZeroWinAllocated2() {
+char CheckUseZeroWinAllocated2(void) {
   char *p = _alloca(0);
   return *p; // expected-warning {{Use of memory allocated with size zero}}
 }
@@ -279,44 +279,44 @@ void UseZeroAllocated(int *p) {
   if (p)
     *p = 7; // expected-warning {{Use of memory allocated with size zero}}
 }
-void CheckUseZeroAllocated3() {
+void CheckUseZeroAllocated3(void) {
   int *p = malloc(0);
   UseZeroAllocated(p);
 }
 
 void f(char);
-void CheckUseZeroAllocated4() {
+void CheckUseZeroAllocated4(void) {
   char *p = valloc(0);
   f(*p); // expected-warning {{Use of memory allocated with size zero}}
   free(p);
 }
 
-void CheckUseZeroAllocated5() {
+void CheckUseZeroAllocated5(void) {
   int *p = calloc(0, 2);
   *p = 1; // expected-warning {{Use of memory allocated with size zero}}
   free(p);
 }
 
-void CheckUseZeroAllocated6() {
+void CheckUseZeroAllocated6(void) {
   int *p = calloc(2, 0);
   *p = 1; // expected-warning {{Use of memory allocated with size zero}}
   free(p);
 }
 
-void CheckUseZeroAllocated7() {
+void CheckUseZeroAllocated7(void) {
   int *p = realloc(0, 0);
   *p = 1; // expected-warning {{Use of memory allocated with size zero}}
   free(p);
 }
 
-void CheckUseZeroAllocated8() {
+void CheckUseZeroAllocated8(void) {
   int *p = malloc(8);
   int *q = realloc(p, 0);
   *q = 1; // expected-warning {{Use of memory allocated with size zero}}
   free(q);
 }
 
-void CheckUseZeroAllocated9() {
+void CheckUseZeroAllocated9(void) {
   int *p = realloc(0, 0);
   int *q = realloc(p, 0);
   *q = 1; // expected-warning {{Use of memory allocated with size zero}}
@@ -380,7 +380,7 @@ void CheckUseZeroReallocatedPathWarn(_Bool b) {
 // This case tests that storing malloc'ed memory to a static variable which is
 // then returned is not leaked.  In the absence of known contracts for functions
 // or inter-procedural analysis, this is a conservative answer.
-int *f3() {
+int *f3(void) {
   static int *p = 0;
   p = malloc(12);
   return p; // no-warning
@@ -390,18 +390,18 @@ int *f3() {
 // which is then returned is not leaked.  In the absence of known contracts for
 // functions or inter-procedural analysis, this is a conservative answer.
 static int *p_f4 = 0;
-int *f4() {
+int *f4(void) {
   p_f4 = malloc(12);
   return p_f4; // no-warning
 }
 
-int *f5() {
+int *f5(void) {
   int *q = malloc(12);
   q = realloc(q, 20);
   return q; // no-warning
 }
 
-void f6() {
+void f6(void) {
   int *p = malloc(12);
   if (!p)
     return; // no-warning
@@ -409,7 +409,7 @@ void f6() {
     free(p);
 }
 
-void f6_realloc() {
+void f6_realloc(void) {
   int *p = malloc(12);
   if (!p)
     return; // no-warning
@@ -418,44 +418,44 @@ void f6_realloc() {
 }
 
 
-char *doit2();
-void pr6069() {
+char *doit2(void);
+void pr6069(void) {
   char *buf = doit2();
   free(buf);
 }
 
-void pr6293() {
+void pr6293(void) {
   free(0);
 }
 
-void f7() {
+void f7(void) {
   char *x = (char*) malloc(4);
   free(x);
   x[0] = 'a'; // expected-warning{{Use of memory after it is freed}}
 }
 
-void f8() {
+void f8(void) {
   char *x = (char*) malloc(4);
   free(x);
   char *y = strndup(x, 4); // expected-warning{{Use of memory after it is freed}}
 }
 
-void f7_realloc() {
+void f7_realloc(void) {
   char *x = (char*) malloc(4);
   realloc(x,0);
   x[0] = 'a'; // expected-warning{{Use of memory after it is freed}}
 }
 
-void PR6123() {
+void PR6123(void) {
   int *x = malloc(11); // expected-warning{{Cast a region whose size is not a multiple of the destination type size}}
 }
 
-void PR7217() {
+void PR7217(void) {
   int *buf = malloc(2); // expected-warning{{Cast a region whose size is not a multiple of the destination type size}}
   buf[1] = 'c'; // not crash
 }
 
-void cast_emtpy_struct() {
+void cast_emtpy_struct(void) {
   struct st {
   };
 
@@ -463,7 +463,7 @@ void cast_emtpy_struct() {
   free(s);
 }
 
-void cast_struct_1() {
+void cast_struct_1(void) {
   struct st {
     int i[100];
     char j[];
@@ -473,7 +473,7 @@ void cast_struct_1() {
   free(s);
 }
 
-void cast_struct_2() {
+void cast_struct_2(void) {
   struct st {
     int i[100];
     char j[0];
@@ -483,7 +483,7 @@ void cast_struct_2() {
   free(s);
 }
 
-void cast_struct_3() {
+void cast_struct_3(void) {
   struct st {
     int i[100];
     char j[1];
@@ -493,7 +493,7 @@ void cast_struct_3() {
   free(s);
 }
 
-void cast_struct_4() {
+void cast_struct_4(void) {
   struct st {
     int i[100];
     char j[2];
@@ -503,7 +503,7 @@ void cast_struct_4() {
   free(s);
 }
 
-void cast_struct_5() {
+void cast_struct_5(void) {
   struct st {
     char i[200];
     char j[1];
@@ -513,7 +513,7 @@ void cast_struct_5() {
   free(s);
 }
 
-void cast_struct_warn_1() {
+void cast_struct_warn_1(void) {
   struct st {
     int i[100];
     char j[2];
@@ -523,7 +523,7 @@ void cast_struct_warn_1() {
   free(s);
 }
 
-void cast_struct_warn_2() {
+void cast_struct_warn_2(void) {
   struct st {
     int i[100];
     char j[2];
@@ -533,7 +533,7 @@ void cast_struct_warn_2() {
   free(s);
 }
 
-void cast_struct_flex_array_1() {
+void cast_struct_flex_array_1(void) {
   struct st {
     int i[100];
     char j[];
@@ -543,7 +543,7 @@ void cast_struct_flex_array_1() {
   free(s);
 }
 
-void cast_struct_flex_array_2() {
+void cast_struct_flex_array_2(void) {
   struct st {
     int i[100];
     char j[0];
@@ -553,7 +553,7 @@ void cast_struct_flex_array_2() {
   free(s);
 }
 
-void cast_struct_flex_array_3() {
+void cast_struct_flex_array_3(void) {
   struct st {
     int i[100];
     char j[1];
@@ -563,7 +563,7 @@ void cast_struct_flex_array_3() {
   free(s);
 }
 
-void cast_struct_flex_array_4() {
+void cast_struct_flex_array_4(void) {
   struct foo {
     char f[32];
   };
@@ -576,7 +576,7 @@ void cast_struct_flex_array_4() {
   free(s);
 }
 
-void cast_struct_flex_array_5() {
+void cast_struct_flex_array_5(void) {
   struct foo {
     char f[32];
   };
@@ -589,7 +589,7 @@ void cast_struct_flex_array_5() {
   free(s);
 }
 
-void cast_struct_flex_array_6() {
+void cast_struct_flex_array_6(void) {
   struct foo {
     char f[32];
   };
@@ -602,7 +602,7 @@ void cast_struct_flex_array_6() {
   free(s);
 }
 
-void cast_struct_flex_array_warn_1() {
+void cast_struct_flex_array_warn_1(void) {
   struct foo {
     char f[32];
   };
@@ -615,7 +615,7 @@ void cast_struct_flex_array_warn_1() {
   free(s);
 }
 
-void cast_struct_flex_array_warn_2() {
+void cast_struct_flex_array_warn_2(void) {
   struct foo {
     char f[32];
   };
@@ -628,7 +628,7 @@ void cast_struct_flex_array_warn_2() {
   free(s);
 }
 
-void cast_struct_flex_array_warn_3() {
+void cast_struct_flex_array_warn_3(void) {
   struct foo {
     char f[32];
   };
@@ -641,7 +641,7 @@ void cast_struct_flex_array_warn_3() {
   free(s);
 }
 
-void cast_struct_flex_array_warn_4() {
+void cast_struct_flex_array_warn_4(void) {
   struct st {
     int i[100];
     int j[];
@@ -651,7 +651,7 @@ void cast_struct_flex_array_warn_4() {
   free(s);
 }
 
-void cast_struct_flex_array_warn_5() {
+void cast_struct_flex_array_warn_5(void) {
   struct st {
     int i[100];
     int j[0];
@@ -661,7 +661,7 @@ void cast_struct_flex_array_warn_5() {
   free(s);
 }
 
-void cast_struct_flex_array_warn_6() {
+void cast_struct_flex_array_warn_6(void) {
   struct st {
     int i[100];
     int j[1];
@@ -671,20 +671,20 @@ void cast_struct_flex_array_warn_6() {
   free(s);
 }
 
-void mallocCastToVoid() {
+void mallocCastToVoid(void) {
   void *p = malloc(2);
   const void *cp = p; // not crash
   free(p);
 }
 
-void mallocCastToFP() {
+void mallocCastToFP(void) {
   void *p = malloc(2);
-  void (*fp)() = p; // not crash
+  void (*fp)(void) = p; // not crash
   free(p);
 }
 
 // This tests that malloc() buffers are undefined by default
-char mallocGarbage () {
+char mallocGarbage (void) {
 	char *buf = malloc(2);
 	char result = buf[1]; // expected-warning{{undefined}}
 	free(buf);
@@ -692,13 +692,13 @@ char mallocGarbage () {
 }
 
 // This tests that calloc() buffers need to be freed
-void callocNoFree () {
+void callocNoFree (void) {
   char *buf = calloc(2,2);
   return; // expected-warning{{Potential leak of memory pointed to by 'buf'}}
 }
 
 // These test that calloc() buffers are zeroed by default
-char callocZeroesGood () {
+char callocZeroesGood (void) {
 	char *buf = calloc(2,2);
 	char result = buf[3]; // no-warning
 	if (buf[1] == 0) {
@@ -707,7 +707,7 @@ char callocZeroesGood () {
 	return result; // no-warning
 }
 
-char callocZeroesBad () {
+char callocZeroesBad (void) {
 	char *buf = calloc(2,2);
 	char result = buf[3]; // no-warning
 	if (buf[1] != 0) {
@@ -716,7 +716,7 @@ char callocZeroesBad () {
 	return result; // expected-warning{{Potential leak of memory pointed to by 'buf'}}
 }
 
-void nullFree() {
+void nullFree(void) {
   int *p = 0;
   free(p); // no warning - a nop
 }
@@ -727,41 +727,41 @@ void paramFree(int *p) {
   myfoo(p); // expected-warning {{Use of memory after it is freed}}
 }
 
-int* mallocEscapeRet() {
+int* mallocEscapeRet(void) {
   int *p = malloc(12);
   return p; // no warning
 }
 
-void mallocEscapeFoo() {
+void mallocEscapeFoo(void) {
   int *p = malloc(12);
   myfoo(p);
   return; // no warning
 }
 
-void mallocEscapeFree() {
+void mallocEscapeFree(void) {
   int *p = malloc(12);
   myfoo(p);
   free(p);
 }
 
-void mallocEscapeFreeFree() {
+void mallocEscapeFreeFree(void) {
   int *p = malloc(12);
   myfoo(p);
   free(p);
   free(p); // expected-warning{{Attempt to free released memory}}
 }
 
-void mallocEscapeFreeUse() {
+void mallocEscapeFreeUse(void) {
   int *p = malloc(12);
   myfoo(p);
   free(p);
   myfoo(p); // expected-warning{{Use of memory after it is freed}}
 }
 
-int *myalloc();
+int *myalloc(void);
 void myalloc2(int **p);
 
-void mallocEscapeFreeCustomAlloc() {
+void mallocEscapeFreeCustomAlloc(void) {
   int *p = malloc(12);
   myfoo(p);
   free(p);
@@ -769,7 +769,7 @@ void mallocEscapeFreeCustomAlloc() {
   free(p); // no warning
 }
 
-void mallocEscapeFreeCustomAlloc2() {
+void mallocEscapeFreeCustomAlloc2(void) {
   int *p = malloc(12);
   myfoo(p);
   free(p);
@@ -777,45 +777,45 @@ void mallocEscapeFreeCustomAlloc2() {
   free(p); // no warning
 }
 
-void mallocBindFreeUse() {
+void mallocBindFreeUse(void) {
   int *x = malloc(12);
   int *y = x;
   free(y);
   myfoo(x); // expected-warning{{Use of memory after it is freed}}
 }
 
-void mallocEscapeMalloc() {
+void mallocEscapeMalloc(void) {
   int *p = malloc(12);
   myfoo(p);
   p = malloc(12);
 } // expected-warning{{Potential leak of memory pointed to by}}
 
-void mallocMalloc() {
+void mallocMalloc(void) {
   int *p = malloc(12);
   p = malloc(12);
 } // expected-warning {{Potential leak of memory pointed to by}}\
   // expected-warning {{Potential leak of memory pointed to by}}
 
-void mallocFreeMalloc() {
+void mallocFreeMalloc(void) {
   int *p = malloc(12);
   free(p);
   p = malloc(12);
   free(p);
 }
 
-void mallocFreeUse_params() {
+void mallocFreeUse_params(void) {
   int *p = malloc(12);
   free(p);
   myfoo(p); //expected-warning{{Use of memory after it is freed}}
 }
 
-void mallocFreeUse_params2() {
+void mallocFreeUse_params2(void) {
   int *p = malloc(12);
   free(p);
   myfooint(*p); //expected-warning{{Use of memory after it is freed}}
 }
 
-void mallocFailedOrNot() {
+void mallocFailedOrNot(void) {
   int *p = malloc(12);
   if (!p)
     free(p);
@@ -827,13 +827,13 @@ struct StructWithInt {
   int g;
 };
 
-int *mallocReturnFreed() {
+int *mallocReturnFreed(void) {
   int *p = malloc(12);
   free(p);
   return p; // expected-warning {{Use of memory after it is freed}}
 }
 
-int useAfterFreeStruct() {
+int useAfterFreeStruct(void) {
   struct StructWithInt *px= malloc(sizeof(struct StructWithInt));
   px->g = 5;
   free(px);
@@ -842,13 +842,13 @@ int useAfterFreeStruct() {
 
 void nonSymbolAsFirstArg(int *pp, struct StructWithInt *p);
 
-void mallocEscapeFooNonSymbolArg() {
+void mallocEscapeFooNonSymbolArg(void) {
   struct StructWithInt *p = malloc(sizeof(struct StructWithInt));
   nonSymbolAsFirstArg(&p->g, p);
   return; // no warning
 }
 
-void mallocFailedOrNotLeak() {
+void mallocFailedOrNotLeak(void) {
   int *p = malloc(12);
   if (p == 0)
     return; // no warning
@@ -856,17 +856,17 @@ void mallocFailedOrNotLeak() {
     return; // expected-warning {{Potential leak of memory pointed to by}}
 }
 
-void mallocAssignment() {
+void mallocAssignment(void) {
   char *p = malloc(12);
   p = fooRetPtr();
 } // expected-warning {{leak}}
 
-int vallocTest() {
+int vallocTest(void) {
   char *mem = valloc(12);
   return 0; // expected-warning {{Potential leak of memory pointed to by}}
 }
 
-void vallocEscapeFreeUse() {
+void vallocEscapeFreeUse(void) {
   int *p = valloc(12);
   myfoo(p);
   free(p);
@@ -880,20 +880,20 @@ struct GlStTy {
 
 struct GlStTy GlS = {0};
 
-void GlobalFree() {
+void GlobalFree(void) {
   free(Gl);
 }
 
-void GlobalMalloc() {
+void GlobalMalloc(void) {
   Gl = malloc(12);
 }
 
-void GlobalStructMalloc() {
+void GlobalStructMalloc(void) {
   int *a = malloc(12);
   GlS.x = a;
 }
 
-void GlobalStructMallocFree() {
+void GlobalStructMallocFree(void) {
   int *a = malloc(12);
   GlS.x = a;
   free(GlS.x);
@@ -901,7 +901,7 @@ void GlobalStructMallocFree() {
 
 char *ArrayG[12];
 
-void globalArrayTest() {
+void globalArrayTest(void) {
   char *p = (char*)malloc(12);
   ArrayG[0] = p;
 }
@@ -913,33 +913,33 @@ typedef struct _StructWithPtr {
 
 static StructWithPtr arrOfStructs[10];
 
-void testMalloc() {
+void testMalloc(void) {
   int *x = malloc(12);
   StructWithPtr St;
   St.memP = x;
   arrOfStructs[0] = St; // no-warning
 }
 
-StructWithPtr testMalloc2() {
+StructWithPtr testMalloc2(void) {
   int *x = malloc(12);
   StructWithPtr St;
   St.memP = x;
   return St; // no-warning
 }
 
-int *testMalloc3() {
+int *testMalloc3(void) {
   int *x = malloc(12);
   int *y = x;
   return y; // no-warning
 }
 
-void testStructLeak() {
+void testStructLeak(void) {
   StructWithPtr St;
   St.memP = malloc(12);
   return; // expected-warning {{Potential leak of memory pointed to by 'St.memP'}}
 }
 
-void testElemRegion1() {
+void testElemRegion1(void) {
   char *x = (void*)malloc(2);
   int *ix = (int*)x;
   free(&(x[0]));
@@ -989,7 +989,7 @@ struct X* RegInvalidationDetect1(struct X *s2) {
   return px; // expected-warning {{Potential leak of memory pointed to by}}
 }
 
-struct X* RegInvalidationGiveUp1() {
+struct X* RegInvalidationGiveUp1(void) {
   int *p = malloc(12);
   struct X *px= malloc(sizeof(struct X));
   px->p = p;
@@ -1054,7 +1054,7 @@ void escapeSourceContents(char *s) {
   // 'memcpy' (regions metadata is not copied).
 }
 
-void invalidateDestinationContents() {
+void invalidateDestinationContents(void) {
   int *null = 0;
   int *p = (int *)malloc(4);
   memcpy(&p, &null, sizeof(int *));
@@ -1108,7 +1108,7 @@ static void *specialMalloc(int n){
 
 // Potentially, the user could free the struct by performing pointer arithmetic on the return value.
 // This is a variation of the specialMalloc issue, though probably would be more rare in correct code.
-int *specialMallocWithStruct() {
+int *specialMallocWithStruct(void) {
   struct StructWithInt *px= malloc(sizeof(struct StructWithInt));
   return &(px->g);
 }
@@ -1184,7 +1184,7 @@ static int releasePtr(void *_ctx) {
     free(_ctx);
     return 0;
 }
-FILE *useFunOpen() {
+FILE *useFunOpen(void) {
     void *ctx = malloc(sizeof(int));
     FILE *f = funopen(ctx, 0, 0, 0, releasePtr); // no warning
     if (f == 0) {
@@ -1192,7 +1192,7 @@ FILE *useFunOpen() {
     }
     return f;
 }
-FILE *useFunOpenNoReleaseFunction() {
+FILE *useFunOpenNoReleaseFunction(void) {
     void *ctx = malloc(sizeof(int));
     FILE *f = funopen(ctx, 0, 0, 0, 0);
     if (f == 0) {
@@ -1204,7 +1204,7 @@ FILE *useFunOpenNoReleaseFunction() {
 static int readNothing(void *_ctx, char *buf, int size) {
   return 0;
 }
-FILE *useFunOpenReadNoRelease() {
+FILE *useFunOpenReadNoRelease(void) {
   void *ctx = malloc(sizeof(int));
   FILE *f = funopen(ctx, readNothing, 0, 0, 0);
   if (f == 0) {
@@ -1214,12 +1214,12 @@ FILE *useFunOpenReadNoRelease() {
 }
 
 // Test setbuf, setvbuf.
-int my_main_no_warning() {
+int my_main_no_warning(void) {
     char *p = malloc(100);
     setvbuf(stdout, p, 0, 100);
     return 0;
 }
-int my_main_no_warning2() {
+int my_main_no_warning2(void) {
     char *p = malloc(100);
     setbuf(__stdoutp, p);
     return 0;
@@ -1295,7 +1295,7 @@ void radar11270219(void) {
   strcmp(x, y); // no warning
 }
 
-void radar_11358224_test_double_assign_ints_positive_2()
+void radar_11358224_test_double_assign_ints_positive_2(void)
 {
   void *ptr = malloc(16);
   ptr = ptr;
@@ -1305,19 +1305,19 @@ void radar_11358224_test_double_assign_ints_positive_2()
 // they are defined in system headers and take the const pointer to the
 // allocated memory. (radar://11160612)
 int const_ptr_and_callback(int, const char*, int n, void(*)(void*));
-void r11160612_1() {
+void r11160612_1(void) {
   char *x = malloc(12);
   const_ptr_and_callback(0, x, 12, free); // no - warning
 }
 
 // Null is passed as callback.
-void r11160612_2() {
+void r11160612_2(void) {
   char *x = malloc(12);
   const_ptr_and_callback(0, x, 12, 0);
 } // expected-warning {{leak}}
 
 // Callback is passed to a function defined in a system header.
-void r11160612_4() {
+void r11160612_4(void) {
   char *x = malloc(12);
   sqlite3_bind_text_my(0, x, 12, free); // no - warning
 }
@@ -1356,7 +1356,7 @@ void dependsOnValueOfPtr(int *g, unsigned f) {
   return;
 }
 
-int CMPRegionHeapToStack() {
+int CMPRegionHeapToStack(void) {
   int x = 0;
   int *x1 = malloc(8);
   int *x2 = &x;
@@ -1365,7 +1365,7 @@ int CMPRegionHeapToStack() {
   return x;
 }
 
-int CMPRegionHeapToHeap2() {
+int CMPRegionHeapToHeap2(void) {
   int x = 0;
   int *x1 = malloc(8);
   int *x2 = malloc(8);
@@ -1377,7 +1377,7 @@ int CMPRegionHeapToHeap2() {
   return x;
 }
 
-int CMPRegionHeapToHeap() {
+int CMPRegionHeapToHeap(void) {
   int x = 0;
   int *x1 = malloc(8);
   int *x4 = x1;
@@ -1388,7 +1388,7 @@ int CMPRegionHeapToHeap() {
   return x;// expected-warning{{This statement is never executed}}
 }
 
-int HeapAssignment() {
+int HeapAssignment(void) {
   int m = 0;
   int *x = malloc(4);
   int *y = x;
@@ -1398,9 +1398,9 @@ int HeapAssignment() {
   return 0;
 }
 
-int *retPtr();
+int *retPtr(void);
 int *retPtrMightAlias(int *x);
-int cmpHeapAllocationToUnknown() {
+int cmpHeapAllocationToUnknown(void) {
   int zero = 0;
   int *yBefore = retPtr();
   int *m = malloc(8);
@@ -1411,13 +1411,13 @@ int cmpHeapAllocationToUnknown() {
   return 0;
 }
 
-void localArrayTest() {
+void localArrayTest(void) {
   char *p = (char*)malloc(12);
   char *ArrayL[12];
   ArrayL[0] = p;
 } // expected-warning {{leak}}
 
-void localStructTest() {
+void localStructTest(void) {
   StructWithPtr St;
   StructWithPtr *pSt = &St;
   pSt->memP = malloc(12);
@@ -1429,20 +1429,20 @@ typedef __INTPTR_TYPE__ intptr_t;
 typedef unsigned __INTPTR_TYPE__ uintptr_t;
 
 static intptr_t glob;
-void test_double_assign_ints()
+void test_double_assign_ints(void)
 {
   void *ptr = malloc (16);  // no-warning
   glob = (intptr_t)(uintptr_t)ptr;
 }
 
-void test_double_assign_ints_positive()
+void test_double_assign_ints_positive(void)
 {
   void *ptr = malloc(16);
   (void*)(intptr_t)(uintptr_t)ptr; // expected-warning {{unused}}
 } // expected-warning {{leak}}
 #endif
 
-void testCGContextNoLeak()
+void testCGContextNoLeak(void)
 {
   void *ptr = malloc(16);
   CGContextRef context = CGBitmapContextCreate(ptr);
@@ -1452,7 +1452,7 @@ void testCGContextNoLeak()
   free(CGBitmapContextGetData(context));
 }
 
-void testCGContextLeak()
+void testCGContextLeak(void)
 {
   void *ptr = malloc(16);
   CGContextRef context = CGBitmapContextCreate(ptr);
@@ -1530,27 +1530,27 @@ wchar_t *testWinWideLeakWithinReturn(wchar_t *str) {
 
 void passConstPtr(const char * ptr);
 
-void testPassConstPointer() {
+void testPassConstPointer(void) {
   char * string = malloc(sizeof(char)*10);
   passConstPtr(string);
   return; // expected-warning {{leak}}
 }
 
-void testPassConstPointerIndirectly() {
+void testPassConstPointerIndirectly(void) {
   char *p = malloc(1);
   p++;
   memcmp(p, p, sizeof(&p));
   return; // expected-warning {{leak}}
 }
 
-void testPassConstPointerIndirectlyStruct() {
+void testPassConstPointerIndirectlyStruct(void) {
   struct HasPtr hp;
   hp.p = malloc(10);
   memcmp(&hp, &hp, sizeof(hp));
   return; // expected-warning {{Potential leak of memory pointed to by 'hp.p'}}
 }
 
-void testPassToSystemHeaderFunctionIndirectlyStruct() {
+void testPassToSystemHeaderFunctionIndirectlyStruct(void) {
   SomeStruct ss;
   ss.p = malloc(1);
   fakeSystemHeaderCall(&ss); // invalidates ss, making ss.p unreachable
@@ -1558,14 +1558,14 @@ void testPassToSystemHeaderFunctionIndirectlyStruct() {
   // ss.p, but nothing else will either!
 } // no-warning
 
-void testPassToSystemHeaderFunctionIndirectlyStructFree() {
+void testPassToSystemHeaderFunctionIndirectlyStructFree(void) {
   SomeStruct ss;
   ss.p = malloc(1);
   fakeSystemHeaderCall(&ss); // invalidates ss, making ss.p unreachable
   free(ss.p);
 } // no-warning
 
-void testPassToSystemHeaderFunctionIndirectlyArray() {
+void testPassToSystemHeaderFunctionIndirectlyArray(void) {
   int *p[1];
   p[0] = malloc(sizeof(int));
   fakeSystemHeaderCallIntPtr(p); // invalidates p, making p[0] unreachable
@@ -1573,7 +1573,7 @@ void testPassToSystemHeaderFunctionIndirectlyArray() {
   // p[0], but nothing else will either!
 } // no-warning
 
-void testPassToSystemHeaderFunctionIndirectlyArrayFree() {
+void testPassToSystemHeaderFunctionIndirectlyArrayFree(void) {
   int *p[1];
   p[0] = malloc(sizeof(int));
   fakeSystemHeaderCallIntPtr(p); // invalidates p, making p[0] unreachable
@@ -1589,44 +1589,44 @@ void testOffsetDeallocate(int *memoryBlock) {
   free(&memoryBlock[-1]);  // no-warning
 }
 
-void testOffsetOfRegionFreed() {
+void testOffsetOfRegionFreed(void) {
   __int64_t * array = malloc(sizeof(__int64_t)*2);
   array += 1;
   free(&array[0]); // expected-warning{{Argument to free() is offset by 8 bytes from the start of memory allocated by malloc()}}
 }
 
-void testOffsetOfRegionFreed2() {
+void testOffsetOfRegionFreed2(void) {
   __int64_t *p = malloc(sizeof(__int64_t)*2);
   p += 1;
   free(p); // expected-warning{{Argument to free() is offset by 8 bytes from the start of memory allocated by malloc()}}
 }
 
-void testOffsetOfRegionFreed3() {
+void testOffsetOfRegionFreed3(void) {
   char *r = malloc(sizeof(char));
   r = r - 10;
   free(r); // expected-warning {{Argument to free() is offset by -10 bytes from the start of memory allocated by malloc()}}
 }
 
-void testOffsetOfRegionFreedAfterFunctionCall() {
+void testOffsetOfRegionFreedAfterFunctionCall(void) {
   int *p = malloc(sizeof(int)*2);
   p += 1;
   myfoo(p);
   free(p); // expected-warning{{Argument to free() is offset by 4 bytes from the start of memory allocated by malloc()}}
 }
 
-void testFixManipulatedPointerBeforeFree() {
+void testFixManipulatedPointerBeforeFree(void) {
   int * array = malloc(sizeof(int)*2);
   array += 1;
   free(&array[-1]); // no-warning
 }
 
-void testFixManipulatedPointerBeforeFree2() {
+void testFixManipulatedPointerBeforeFree2(void) {
   char *r = malloc(sizeof(char));
   r = r + 10;
   free(r-10); // no-warning
 }
 
-void freeOffsetPointerPassedToFunction() {
+void freeOffsetPointerPassedToFunction(void) {
   __int64_t *p = malloc(sizeof(__int64_t)*2);
   p[1] = 0;
   p += 1;
@@ -1634,47 +1634,47 @@ void freeOffsetPointerPassedToFunction() {
   free(p); // expected-warning {{Argument to free() is offset by 8 bytes from the start of memory allocated by malloc()}}
 }
 
-int arbitraryInt();
-void freeUnknownOffsetPointer() {
+int arbitraryInt(void);
+void freeUnknownOffsetPointer(void) {
   char *r = malloc(sizeof(char));
   r = r + arbitraryInt(); // unable to reason about what the offset might be
   free(r); // no-warning
 }
 
-void testFreeNonMallocPointerWithNoOffset() {
+void testFreeNonMallocPointerWithNoOffset(void) {
   char c;
   char *r = &c;
   r = r + 10;
   free(r-10); // expected-warning {{Argument to free() is the address of the local variable 'c', which is not memory allocated by malloc()}}
 }
 
-void testFreeNonMallocPointerWithOffset() {
+void testFreeNonMallocPointerWithOffset(void) {
   char c;
   char *r = &c;
   free(r+1); // expected-warning {{Argument to free() is the address of the local variable 'c', which is not memory allocated by malloc()}}
 }
 
-void testOffsetZeroDoubleFree() {
+void testOffsetZeroDoubleFree(void) {
   int *array = malloc(sizeof(int)*2);
   int *p = &array[0];
   free(p);
   free(&array[0]); // expected-warning{{Attempt to free released memory}}
 }
 
-void testOffsetPassedToStrlen() {
+void testOffsetPassedToStrlen(void) {
   char * string = malloc(sizeof(char)*10);
   string += 1;
   int length = strlen(string); // expected-warning {{Potential leak of memory pointed to by 'string'}}
 }
 
-void testOffsetPassedToStrlenThenFree() {
+void testOffsetPassedToStrlenThenFree(void) {
   char * string = malloc(sizeof(char)*10);
   string += 1;
   int length = strlen(string);
   free(string); // expected-warning {{Argument to free() is offset by 1 byte from the start of memory allocated by malloc()}}
 }
 
-void testOffsetPassedAsConst() {
+void testOffsetPassedAsConst(void) {
   char * string = malloc(sizeof(char)*10);
   string += 1;
   passConstPtr(string);
@@ -1687,7 +1687,7 @@ int _nVectorSegments;
 void poolFreeC(void* s) {
   free(s); // no-warning
 }
-void freeMemory() {
+void freeMemory(void) {
   while (_nVectorSegments) {
     poolFreeC(_vectorSegments[_nVectorSegments++]);
   }
@@ -1728,7 +1728,7 @@ void *smallocWarn(size_t size) {
   }
 }
 
-int *radar15580979() {
+int *radar15580979(void) {
   int *data = (int *)malloc(32);
   int *p = data ?: (int*)malloc(32); // no warning
   return p;
@@ -1758,7 +1758,7 @@ struct IntAndPtr {
 
 void constEscape(const void *ptr);
 
-void testConstEscapeThroughAnotherField() {
+void testConstEscapeThroughAnotherField(void) {
   struct IntAndPtr s;
   s.p = malloc(sizeof(int));
   constEscape(&(s.x)); // could free s->p!
@@ -1776,12 +1776,12 @@ int testNoCheckerDataPropogationFromLogicalOpOperandToOpResult(void) {
 }
 
 void (*fnptr)(int);
-void freeIndirectFunctionPtr() {
+void freeIndirectFunctionPtr(void) {
   void *p = (void *)fnptr;
   free(p); // expected-warning {{Argument to free() is a function pointer}}
 }
 
-void freeFunctionPtr() {
+void freeFunctionPtr(void) {
   free((void *)fnptr);
   // expected-warning at -1{{Argument to free() is a function pointer}}
   // expected-warning at -2{{attempt to call free on non-heap object '(void *)fnptr'}}
@@ -1791,7 +1791,7 @@ void allocateSomeMemory(void *offendingParameter, void **ptr) {
   *ptr = malloc(1);
 }
 
-void testNoCrashOnOffendingParameter() {
+void testNoCrashOnOffendingParameter(void) {
   // "extern" is necessary to avoid unrelated warnings
   // on passing uninitialized value.
   extern void *offendingParameter;
@@ -1854,7 +1854,7 @@ crash_b() { crash_a(); } // no-crash
 // expected-warning at -1{{type specifier missing}} expected-warning at -1{{non-void}}
 
 long *global_a;
-void realloc_crash() {
+void realloc_crash(void) {
   long *c = global_a;
   c--;
   realloc(c, 8); // no-crash
@@ -1872,7 +1872,7 @@ void testMallocWithParam_2(int **p) {
   *p = (int*) malloc(sizeof(int)); // no-warning
 }
 
-void testPassToSystemHeaderFunctionIndirectly() {
+void testPassToSystemHeaderFunctionIndirectly(void) {
   int *p = malloc(4);
   p++;
   fakeSystemHeaderCallInt(p);
@@ -1880,14 +1880,14 @@ void testPassToSystemHeaderFunctionIndirectly() {
   // won't free (p-1) either.
 }
 
-void testMallocIntoMalloc() {
+void testMallocIntoMalloc(void) {
   StructWithPtr *s = malloc(sizeof(StructWithPtr));
   s->memP = malloc(sizeof(int));
   free(s);
 } // FIXME: should warn here
 
-int conjure();
-void testExtent() {
+int conjure(void);
+void testExtent(void) {
   int x = conjure();
   clang_analyzer_dump(x);
   // expected-warning-re at -1 {{{{^conj_\$[[:digit:]]+{int, LC1, S[[:digit:]]+, #1}}}}}}

diff  --git a/clang/test/Analysis/malloc.m b/clang/test/Analysis/malloc.m
index 1f67daba55ecb..657a6bafba8e7 100644
--- a/clang/test/Analysis/malloc.m
+++ b/clang/test/Analysis/malloc.m
@@ -40,18 +40,18 @@ @interface MyArray : NSObject {
 }
 @end
 
-void _ArrayCreate() {
+void _ArrayCreate(void) {
   MyArray *array = (MyArray *)malloc(12);
   array = [array init];
   free(array); // no-warning
 }
 
-void testNSDataTruePositiveLeak() {
+void testNSDataTruePositiveLeak(void) {
   char *b = (char *)malloc(12);
   NSData *d = [[NSData alloc] initWithBytes: b length: 12]; // expected-warning {{Potential leak of memory pointed to by 'b'}}
 }
 
-id wrapInNSValue() {
+id wrapInNSValue(void) {
   void *buffer = malloc(4);
   return [NSValue valueWithPointer:buffer]; // no-warning
 }
\ No newline at end of file

diff  --git a/clang/test/Analysis/max-nodes-suppress-on-sink.c b/clang/test/Analysis/max-nodes-suppress-on-sink.c
index da1e7bf022848..6ca014f7bed8d 100644
--- a/clang/test/Analysis/max-nodes-suppress-on-sink.c
+++ b/clang/test/Analysis/max-nodes-suppress-on-sink.c
@@ -15,9 +15,9 @@ extern void exit(int) __attribute__ ((__noreturn__));
 
 void clang_analyzer_warnIfReached(void);
 
-int coin();
+int coin(void);
 
-void test_single_cfg_block_sink() {
+void test_single_cfg_block_sink(void) {
   void *p = malloc(1); // no-warning (wherever the leak warning may occur here)
 
   // Due to max-nodes option in the run line, we should reach the first call
@@ -34,7 +34,7 @@ void test_single_cfg_block_sink() {
 
 // A similar test with more complicated control flow before the no-return thing,
 // so that the no-return thing wasn't in the same CFG block.
-void test_more_complex_control_flow_before_sink() {
+void test_more_complex_control_flow_before_sink(void) {
   void *p = malloc(1); // no-warning
 
   clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
@@ -72,7 +72,7 @@ void test_loop_with_sink(int n) {
 }
 
 // Handle unreachable blocks correctly.
-void test_unreachable_successor_blocks() {
+void test_unreachable_successor_blocks(void) {
   void *p = malloc(1); // no-warning
 
   clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}

diff  --git a/clang/test/Analysis/misc-ps-arm.m b/clang/test/Analysis/misc-ps-arm.m
index 9cb7bb202fef0..c950d7d7d62df 100644
--- a/clang/test/Analysis/misc-ps-arm.m
+++ b/clang/test/Analysis/misc-ps-arm.m
@@ -11,8 +11,8 @@
     float x, y;
 } Rdar11405978Vec;
     
-float32x2_t rdar11405978_bar();
-float32_t rdar11405978() {
+float32x2_t rdar11405978_bar(void);
+float32_t rdar11405978(void) {
   float32x2_t v = rdar11405978_bar();
   Rdar11405978Vec w = *(Rdar11405978Vec *)&v;
   return w.x; // no-warning

diff  --git a/clang/test/Analysis/misc-ps-eager-assume.m b/clang/test/Analysis/misc-ps-eager-assume.m
index f61e0ae9f8084..112dd3672d937 100644
--- a/clang/test/Analysis/misc-ps-eager-assume.m
+++ b/clang/test/Analysis/misc-ps-eager-assume.m
@@ -92,7 +92,7 @@ void pr3836(int *a, int *b) {
 
 void rdar7342806_aux(short x);
 
-void rdar7342806() {
+void rdar7342806(void) {
   extern short Count;
   extern short Flag1;
 

diff  --git a/clang/test/Analysis/misc-ps-region-store-i386.m b/clang/test/Analysis/misc-ps-region-store-i386.m
index 269a8155b12a0..5ca7bc3f5de44 100644
--- a/clang/test/Analysis/misc-ps-region-store-i386.m
+++ b/clang/test/Analysis/misc-ps-region-store-i386.m
@@ -6,7 +6,7 @@
 // we don't crash.
 typedef unsigned uintptr_t;
 void test_pointer_invalidated_as_int_aux(uintptr_t* ptr);
-void test_pointer_invalidated_as_int() {
+void test_pointer_invalidated_as_int(void) {
   void *x;
   test_pointer_invalidated_as_int_aux((uintptr_t*) &x);
   // Here we have a pointer to integer cast.

diff  --git a/clang/test/Analysis/misc-ps-region-store-x86_64.m b/clang/test/Analysis/misc-ps-region-store-x86_64.m
index 0bdc5a2b6a261..d52d127e23c1f 100644
--- a/clang/test/Analysis/misc-ps-region-store-x86_64.m
+++ b/clang/test/Analysis/misc-ps-region-store-x86_64.m
@@ -6,7 +6,7 @@
 // we don't crash.
 typedef unsigned long uintptr_t;
 void test_pointer_invalidated_as_int_aux(uintptr_t* ptr);
-void test_pointer_invalidated_as_int() {
+void test_pointer_invalidated_as_int(void) {
   void *x;
   test_pointer_invalidated_as_int_aux((uintptr_t*) &x);
   // Here we have a pointer to integer cast.

diff  --git a/clang/test/Analysis/misc-ps-region-store.m b/clang/test/Analysis/misc-ps-region-store.m
index 6332ff5a50103..706407ab279cb 100644
--- a/clang/test/Analysis/misc-ps-region-store.m
+++ b/clang/test/Analysis/misc-ps-region-store.m
@@ -43,7 +43,7 @@ - (void)handleFailureInMethod:(SEL)selector object:(id)object file:(NSString *)f
 
 // PR 2948 (testcase; crash on VisitLValue for union types)
 // http://llvm.org/bugs/show_bug.cgi?id=2948
-void checkaccess_union() {
+void checkaccess_union(void) {
   int ret = 0, status;
   // Since RegionStore doesn't handle unions yet,
   // this branch condition won't be triggered
@@ -61,7 +61,7 @@ void checkaccess_union() {
 struct test2_struct { int x; int y; char* s; };
 void test2_help(struct test2_struct* p);
 
-char test2() {
+char test2(void) {
   struct test2_struct s;
   test2_help(&s);
   char *p = 0;
@@ -144,7 +144,7 @@ void testB_2(BStruct *b) {
 // engine caches out.  Previously a false transition would cause UnknownVal
 // to bind to the variable, firing an assertion failure.  This bug was fixed
 // in r76262.
-void test_declstmt_caching() {
+void test_declstmt_caching(void) {
 again:
   {
     const char a[] = "I like to crash";
@@ -170,7 +170,7 @@ void test_rdar_7114618(struct s_7114618 *s) {
 }
 
 // Test pointers increment correctly.
-void f() {
+void f(void) {
   int a[2];
   a[1] = 3;
   int *p = a;
@@ -190,7 +190,7 @@ void f() {
   int x : 10;
   int y : 22;
 };
-int rdar_test_7185607() {
+int rdar_test_7185607(void) {
   struct test_7185607 s; // Uninitialized.
   *((unsigned *) &s) = 0U;
   return s.x; // no-warning
@@ -277,12 +277,12 @@ int rdar_6914474(void) {
   int x;
 };
 extern void test_invalidate_field(int *x);
-int test_invalidate_field_test() {
+int test_invalidate_field_test(void) {
   struct s_test_field_invalidate y;
   test_invalidate_field(&y.x);
   return y.x; // no-warning
 }
-int test_invalidate_field_test_positive() {
+int test_invalidate_field_test_positive(void) {
   struct s_test_field_invalidate y;
   return y.x; // expected-warning{{garbage}}
 }
@@ -296,7 +296,7 @@ int test_invalidate_field_test_positive() {
 
 void test_handle_array_wrapper_helper();
 
-int test_handle_array_wrapper() {
+int test_handle_array_wrapper(void) {
   struct ArrayWrapper x;
   test_handle_array_wrapper_helper(&x);
   struct WrappedStruct *p = (struct WrappedStruct*) x.y; // expected-warning{{Casting a non-structure type to a structure type and accessing a field can lead to memory access errors or data corruption}}
@@ -350,7 +350,7 @@ @interface RDar7312221
 - (void) doSomething_7312221;
 @end
 
-extern struct rdar_7312221_value *rdar_7312221_helper();
+extern struct rdar_7312221_value *rdar_7312221_helper(void);
 extern int rdar_7312221_helper_2(id o);
 extern void rdar_7312221_helper_3(int z);
 
@@ -389,12 +389,12 @@ void doSomething_7312221_with_struct(struct rdar_7312221_container *Self) {
 // <rdar://problem/7332673> - Just more tests cases for regions
 //===----------------------------------------------------------------------===//
 
-void rdar_7332673_test1() {
+void rdar_7332673_test1(void) {
     char value[1];
     if ( *(value) != 1 ) {} // expected-warning{{The left operand of '!=' is a garbage value}}
 }
 int rdar_7332673_test2_aux(char *x);
-void rdar_7332673_test2() {
+void rdar_7332673_test2(void) {
     char *value;
     if ( rdar_7332673_test2_aux(value) != 1 ) {} // expected-warning{{1st function call argument is an uninitialized value}}
 }
@@ -462,7 +462,7 @@ void element_region_with_symbolic_superregion(int* p) {
 //===----------------------------------------------------------------------===//
 
 static int test_cwe466_return_outofbounds_pointer_a[10]; // expected-note{{Original object declared here}}
-int *test_cwe466_return_outofbounds_pointer() {
+int *test_cwe466_return_outofbounds_pointer(void) {
   int *p = test_cwe466_return_outofbounds_pointer_a+11;
   return p; // expected-warning{{Returned pointer value points outside the original object}}
             // expected-note at -1{{Original object 'test_cwe466_return_outofbounds_pointer_a' is an array of 10 'int' objects, returned pointer points at index 11}}
@@ -475,7 +475,7 @@ void element_region_with_symbolic_superregion(int* p) {
 
 typedef struct { int *a; } pr3135_structure;
 int pr3135_bar(pr3135_structure *x);
-int pr3135() {
+int pr3135(void) {
   int x;
   pr3135_structure y = { &x };
   // the call to pr3135_bar may initialize x
@@ -494,7 +494,7 @@ int pr3135() {
   unsigned y;
 } RDar7403269;
 
-void rdar7403269() {
+void rdar7403269(void) {
   RDar7403269 z = { .y = 0 };
   if (z.x[4] == 0)
     return;
@@ -507,7 +507,7 @@ void rdar7403269() {
   unsigned y;
 } RDar7403269_b;
 
-void rdar7403269_b() {
+void rdar7403269_b(void) {
   RDar7403269_b z = { .y = 0 };
   if (z.x[5].w == 0)
     return;
@@ -515,7 +515,7 @@ void rdar7403269_b() {
   *p = 0xDEADBEEF; // no-warning
 }
 
-void rdar7403269_b_pos() {
+void rdar7403269_b_pos(void) {
   RDar7403269_b z = { .y = 0 };
   if (z.x[5].w == 1)
     return;
@@ -559,11 +559,11 @@ void test_increment_nonnull_rdar_7191542(const char *path) {
 // Path-sensitive tests for blocks.
 //===----------------------------------------------------------------------===//
 
-void indirect_block_call(void (^f)());
+void indirect_block_call(void (^f)(void));
 
 int blocks_1(int *p, int z) {
   __block int *q = 0;
-  void (^bar)() = ^{ q = p; };
+  void (^bar)(void) = ^{ q = p; };
   
   if (z == 1) {
     // The call to 'bar' might cause 'q' to be invalidated.
@@ -635,9 +635,9 @@ unsigned long rdar7582031_b2(RDar7582031 *o) {
 
 // Show that we handle static variables also getting invalidated.
 void rdar7582031_aux(void (^)(void));
-RDar7582031 *rdar7582031_aux_2();
+RDar7582031 *rdar7582031_aux_2(void);
 
-unsigned rdar7582031_static() {  
+unsigned rdar7582031_static(void) {  
   static RDar7582031 *o = 0;
   rdar7582031_aux(^{ o = rdar7582031_aux_2(); });
   
@@ -686,10 +686,10 @@ - (void) foo_positive:(id)target {
 //  not crash on variables passed by reference via __block.
 //===----------------------------------------------------------------------===//
 
-int rdar7468209_aux();
-void rdar7468209_aux_2();
+int rdar7468209_aux(void);
+void rdar7468209_aux_2(void);
 
-void rdar7468209() {
+void rdar7468209(void) {
   __block int x = 0;
   ^{
     x = rdar7468209_aux();
@@ -760,9 +760,9 @@ int test_return_struct(TestReturnStruct_rdar_7526777 *x) {
   return [x foo].x;
 }
 
-testReturn_rdar_7526777 test_return_struct_2_aux_rdar_7526777();
+testReturn_rdar_7526777 test_return_struct_2_aux_rdar_7526777(void);
 
-int test_return_struct_2_rdar_7526777() {
+int test_return_struct_2_rdar_7526777(void) {
   return test_return_struct_2_aux_rdar_7526777().x;
 }
 
@@ -775,7 +775,7 @@ int test_return_struct_2_rdar_7526777() {
 
 _Bool OSAtomicCompareAndSwapPtrBarrier( void *__oldValue, void *__newValue, void * volatile *__theValue );
 
-void rdar_7527292() {
+void rdar_7527292(void) {
   static id Cache7527292[32];
   for (signed long idx = 0;
        idx < 32;
@@ -796,7 +796,7 @@ void rdar_7527292() {
   int y[];
 };
 
-const struct rdar_7515938 *rdar_7515938() {
+const struct rdar_7515938 *rdar_7515938(void) {
   static const struct rdar_7515938 z = { 0, { 1, 2 } };
   if (z.y[0] != 1) {
     int *p = 0;
@@ -810,7 +810,7 @@ void rdar_7527292() {
   char y[];
 };
 
-const struct rdar_7515938_str *rdar_7515938_str() {
+const struct rdar_7515938_str *rdar_7515938_str(void) {
   static const struct rdar_7515938_str z = { 0, "hello" };
   return &z;
 }
@@ -853,20 +853,20 @@ int PR4172B_f1(void) {
 void test_a_rev96062_aux(struct s_rev96062 *s);
 void test_a_rev96062_aux2(struct s_rev96062_nested *s);
 
-int test_a_rev96062() {
+int test_a_rev96062(void) {
   int a, b;
   struct s_rev96062 x = { &a, &b };
   test_a_rev96062_aux(&x);
   return a + b; // no-warning
 }
-int test_b_rev96062() {
+int test_b_rev96062(void) {
   int a, b;
   struct s_rev96062 x = { &a, &b };
   struct s_rev96062 z = x;
   test_a_rev96062_aux(&z);
   return a + b; // no-warning
 }
-int test_c_rev96062() {
+int test_c_rev96062(void) {
   int a, b;
   struct s_rev96062 x = { &a, &b };
   struct s_rev96062_nested w = { x };
@@ -966,7 +966,7 @@ @interface Rdar7817800 {
 - (void) rdar7817800_baz;
 @end
 
-char *rdar7817800_foobar();
+char *rdar7817800_foobar(void);
 void rdar7817800_qux(void*);
 
 @implementation Rdar7817800
@@ -1019,8 +1019,8 @@ void pr6854(void * arg) {
 
 // <rdar://problem/8032791> False positive due to symbolic store not find
 //  value because of 'const' qualifier
-double rdar_8032791_2();
-double rdar_8032791_1() {
+double rdar_8032791_2(void);
+double rdar_8032791_1(void) {
    struct R8032791 { double x[2]; double y; }
    data[3] = {
      {{1.0, 3.0}, 3.0},  //  1   2   3
@@ -1038,7 +1038,7 @@ void pr6854(void * arg) {
 
 // PR 7450 - Handle pointer arithmetic with __builtin_alloca
 void pr_7450_aux(void *x);
-void pr_7450() {
+void pr_7450(void) {
   void *p = __builtin_alloca(10);
   // Don't crash when analyzing the following statement.
   pr_7450_aux(p + 8);
@@ -1061,7 +1061,7 @@ void rdar_8243408(void) {
 }
 
 // <rdar://problem/8258814>
-int r8258814()
+int r8258814(void)
 {
   int foo;
   int * a = &foo;
@@ -1098,10 +1098,10 @@ int r8258814()
 
 // PR 8015 - don't return undefined values for arrays when using a valid
 // symbolic index
-int pr8015_A();
+int pr8015_A(void);
 void pr8015_B(const char *);
 
-void pr8015_C() {
+void pr8015_C(void) {
   int number = pr8015_A();
   const char *numbers[] = { "zero" };    
   if (number == 0) {
@@ -1112,7 +1112,7 @@ void pr8015_C() {
 // Tests that we correctly handle that 'number' is perfectly constrained
 // after 'if (number == 0)', allowing us to resolve that
 // numbers[number] == numbers[0].
-void pr8015_D_FIXME() {
+void pr8015_D_FIXME(void) {
   int number = pr8015_A();
   const char *numbers[] = { "zero" };
   if (number == 0) {
@@ -1124,7 +1124,7 @@ void pr8015_D_FIXME() {
   }
 }
 
-void pr8015_E() {
+void pr8015_E(void) {
   // Similar to pr8015_C, but number is allowed to be a valid range.
   unsigned number = pr8015_A();
   const char *numbers[] = { "zero", "one", "two" };
@@ -1133,7 +1133,7 @@ void pr8015_E() {
   }
 }
 
-void pr8015_F_FIXME() {
+void pr8015_F_FIXME(void) {
   // Similar to pr8015_E, but like pr8015_D we check if the pointer
   // is the same as one of the string literals.  The null dereference
   // here is not feasible in practice, so this is a false positive.
@@ -1217,7 +1217,7 @@ void rdar_8642434_funcB(struct rdar_8642434_typeA *x, struct rdar_8642434_typeA
   int x, y, z;
 } s_test_rdar8848957;
 
-s_test_rdar8848957 foo_rdar8848957();
+s_test_rdar8848957 foo_rdar8848957(void);
 int rdar8848957(int index) {
   s_test_rdar8848957 vals[10];
   vals[index] = foo_rdar8848957();
@@ -1261,7 +1261,7 @@ void Rdar_9103310_E(Rdar_9103310_A * x, struct Rdar_9103310_C * b) { // expected
 
 // Test handling binding lazy compound values to a region and then have
 // specific elements have other bindings.
-int PR9455() {
+int PR9455(void) {
   char arr[4] = "000";
   arr[0] = '1';
   if (arr[1] == '0')
@@ -1270,7 +1270,7 @@ int PR9455() {
   *p = 0xDEADBEEF; // no-warning
   return 1;
 }
-int PR9455_2() {
+int PR9455_2(void) {
   char arr[4] = "000";
   arr[0] = '1';
   if (arr[1] == '0') {
@@ -1306,7 +1306,7 @@ RDar9163742_Rect RDar9163742_IntegralRect(RDar9163742_Rect frame)
 }
 
 // Test correct handling of prefix '--' operator.
-void rdar9444714() {
+void rdar9444714(void) {
   int   x;
   char    str[ 32 ];
   char    buf[ 32 ];
@@ -1335,7 +1335,7 @@ void rdar9444714() {
     unsigned value;
 } RDar11127008;
 
-signed rdar_11127008_index();
+signed rdar_11127008_index(void);
 
 static unsigned rdar_11127008(void) {
     RDar11127008 values[] = {{.value = 0}, {.value = 1}};
@@ -1351,7 +1351,7 @@ static unsigned rdar_11127008(void) {
 
 void rdar11125868_aux(radar11125868_cb cb);
 
-int rdar11125868() {
+int rdar11125868(void) {
   int integersStackArray[1];
   int *integers = integersStackArray;
   rdar11125868_aux(^(int *integerValue, unsigned index) {
@@ -1360,7 +1360,7 @@ int rdar11125868() {
   return integers[0] == 0; // no-warning
 }
 
-int rdar11125868_positive() {
+int rdar11125868_positive(void) {
   int integersStackArray[1];
   int *integers = integersStackArray;
   return integers[0] == 0; // expected-warning {{The left operand of '==' is a}}

diff  --git a/clang/test/Analysis/misc-ps.c b/clang/test/Analysis/misc-ps.c
index 153476b7bac81..d2f73ecb23082 100644
--- a/clang/test/Analysis/misc-ps.c
+++ b/clang/test/Analysis/misc-ps.c
@@ -5,7 +5,7 @@ void clang_analyzer_eval(int);
 int size_rdar9373039 = 1;
 int foo_rdar9373039(const char *);
 
-int rdar93730392() {
+int rdar93730392(void) {
   int x;
   int j = 0;
 
@@ -91,8 +91,8 @@ static int radar10367606(int t) {
 }
 
 /* Caching out on a sink node. */
-extern int fooR10376675();
-extern int* bazR10376675();
+extern int fooR10376675(void);
+extern int* bazR10376675(void);
 extern int nR10376675;
 void barR10376675(int *x) {
   int *pm;
@@ -116,7 +116,7 @@ void RDar10385775(struct rdar10385775* p) {
 
 // Test double loop of array and array literals.  Previously this
 // resulted in a false positive uninitailized value warning.
-void rdar10686586() {
+void rdar10686586(void) {
     int array1[] = { 1, 2, 3, 0 };
     int array2[] = { 1, 2, 3, 0 };
     int *array[] = { array1, array2 };

diff  --git a/clang/test/Analysis/misc-ps.m b/clang/test/Analysis/misc-ps.m
index 88ade4917bf37..3ac8dde3dd997 100644
--- a/clang/test/Analysis/misc-ps.m
+++ b/clang/test/Analysis/misc-ps.m
@@ -76,9 +76,9 @@ - (void)foo:(void (^)(NSObject *x))block {
 //  Addresses false positive in <rdar://problem/6268365>
 //
 
-unsigned r6268365Aux();
+unsigned r6268365Aux(void);
 
-void r6268365() {
+void r6268365(void) {
   unsigned x = 0;
   x &= r6268365Aux();
   unsigned j = 0;
@@ -104,7 +104,7 @@ void divzeroassumeB(unsigned x, unsigned j) {
 // InitListExpr processing
 
 typedef float __m128 __attribute__((__vector_size__(16), __may_alias__));
-__m128 return128() {
+__m128 return128(void) {
   // This compound literal has a Vector type.  We currently just
   // return UnknownVal.
   return __extension__(__m128) { 0.0f, 0.0f, 0.0f, 0.0f };
@@ -151,7 +151,7 @@ void check_deref_undef(void) {
 
 // PR 3422
 void pr3422_helper(char *p);
-void pr3422() {
+void pr3422(void) {
   char buf[100];
   char *q = &buf[10];
   pr3422_helper(&q[1]);
@@ -240,8 +240,8 @@ void pr6708148_test(void) {
 }
 
 // Handle both kinds of noreturn attributes for pruning paths.
-void rdar_6777003_noret() __attribute__((noreturn));
-void rdar_6777003_analyzer_noret() __attribute__((analyzer_noreturn));
+void rdar_6777003_noret(void) __attribute__((noreturn));
+void rdar_6777003_analyzer_noret(void) __attribute__((analyzer_noreturn));
 
 void rdar_6777003(int x) {
   int *p = 0;
@@ -288,7 +288,7 @@ void rdar_6777209(char *p) {
 // PR 4033.  A symbolic 'void *' pointer can be used as the address for a
 // computed goto.
 typedef void *Opcode;
-Opcode pr_4033_getOpcode();
+Opcode pr_4033_getOpcode(void);
 void pr_4033(void) {
   void *lbl = &&next_opcode;
 next_opcode:
@@ -302,7 +302,7 @@ void pr_4033(void) {
 // example came from a recent false positive due to a regression where the
 // branch condition was falsely reported as being uninitialized.
 void invalidate_by_ref(char **x);
-int test_invalidate_by_ref() {
+int test_invalidate_by_ref(void) {
   unsigned short y;
   invalidate_by_ref((char**) &y);
   if (y) // no-warning
@@ -314,26 +314,26 @@ int test_invalidate_by_ref() {
 // constructed correctly.  Previously, the successor block of the entrance
 // was the block containing the merge for '?', which would trigger an
 // assertion failure.
-int rdar_7027684_aux();
-int rdar_7027684_aux_2() __attribute__((noreturn));
+int rdar_7027684_aux(void);
+int rdar_7027684_aux_2(void) __attribute__((noreturn));
 void rdar_7027684(int x, int y) {
   {}; // this empty compound statement is critical.
   (rdar_7027684_aux() ? rdar_7027684_aux_2() : (void) 0);
 }
 
 // Test that we handle casts of string literals to arbitrary types.
-unsigned const char *string_literal_test1() {
+unsigned const char *string_literal_test1(void) {
   return (const unsigned char*) "hello";
 }
 
-const float *string_literal_test2() {
+const float *string_literal_test2(void) {
   return (const float*) "hello";
 }
 
 // Test that we handle casts *from* incomplete struct types.
 extern const struct _FooAssertStruct _cmd;
 void test_cast_from_incomplete_struct_aux(volatile const void *x);
-void test_cast_from_incomplete_struct() {
+void test_cast_from_incomplete_struct(void) {
   test_cast_from_incomplete_struct_aux(&_cmd);
 }
 
@@ -350,13 +350,13 @@ void test_rdar_7034511(NSArray *y) {
 
 // Handle casts of function pointers (CodeTextRegions) to arbitrary pointer
 // types. This was previously causing a crash in CastRegion.
-void handle_funcptr_voidptr_casts() {
+void handle_funcptr_voidptr_casts(void) {
   void **ptr;
   typedef void *PVOID;
   typedef void *PCHAR;  
   typedef long INT_PTR, *PINT_PTR;
-  typedef INT_PTR (*FARPROC)();
-  FARPROC handle_funcptr_voidptr_casts_aux();
+  typedef INT_PTR (*FARPROC)(void);
+  FARPROC handle_funcptr_voidptr_casts_aux(void);
   PVOID handle_funcptr_voidptr_casts_aux_2(PVOID volatile *x);
   PVOID handle_funcptr_voidptr_casts_aux_3(PCHAR volatile *x);  
   
@@ -367,7 +367,7 @@ void handle_funcptr_voidptr_casts() {
 
 // RegionStore::Retrieve previously crashed on this example.  This example
 // was previously in the test file 'xfail_regionstore_wine_crash.c'.
-void testA() {
+void testA(void) {
   long x = 0;
   char *y = (char *) &x;
   if (!*y)
@@ -396,7 +396,7 @@ void testB(BStruct *b) {
 }
 
 void test_trivial_symbolic_comparison(int *x) {
-  int test_trivial_symbolic_comparison_aux();
+  int test_trivial_symbolic_comparison_aux(void);
   int a = test_trivial_symbolic_comparison_aux();
   int b = a;
   if (a != b) {
@@ -420,7 +420,7 @@ void test_trivial_symbolic_comparison(int *x) {
 // static and non-static).
 //
 static int* x_rdar_7062158;
-void rdar_7062158() {
+void rdar_7062158(void) {
   int *current = x_rdar_7062158;
   if (current == x_rdar_7062158)
     return;
@@ -430,7 +430,7 @@ void rdar_7062158() {
 }
 
 int* x_rdar_7062158_2;
-void rdar_7062158_2() {
+void rdar_7062158_2(void) {
   int *current = x_rdar_7062158_2;
   if (current == x_rdar_7062158_2)
     return;
@@ -456,8 +456,8 @@ unsigned char test_array_index_bitwidth(const unsigned char *p) {
 
 // This case tests that CastRegion handles casts involving BlockPointerTypes.
 // It should not crash.
-void test_block_cast() {
-  id test_block_cast_aux();
+void test_block_cast(void) {
+  id test_block_cast_aux(void);
   (void (^)(void *))test_block_cast_aux(); // expected-warning{{expression result unused}}
 }
 
@@ -491,7 +491,7 @@ void radar11390991_NoBarrier_CompareAndSwap(volatile Atomic32 *ptr,
 }
 
 // PR 4594 - This was a crash when handling casts in SimpleSValuator.
-void PR4594() {
+void PR4594(void) {
   char *buf[1];
   char **foo = buf;
   *foo = "test";
@@ -499,7 +499,7 @@ void PR4594() {
 
 // Test invalidation logic where an integer is casted to an array with a
 // 
diff erent sign and then invalidated.
-void test_invalidate_cast_int() {
+void test_invalidate_cast_int(void) {
   void test_invalidate_cast_int_aux(unsigned *i);
   signed i;  
   test_invalidate_cast_int_aux((unsigned*) &i);
@@ -517,7 +517,7 @@ void test_invalidate_cast_int() {
 
 // Reduced from a crash in StoreManager::CastRegion involving a divide-by-zero.
 // This resulted from not properly handling region casts to 'const void*'.
-void test_cast_const_voidptr() {
+void test_cast_const_voidptr(void) {
   char x[10];
   char *p = &x[1];
   const void* q = p;
@@ -525,7 +525,7 @@ void test_cast_const_voidptr() {
 
 // Reduced from a crash when analyzing Wine.  This test handles loads from
 // function addresses.
-typedef long (*FARPROC)();
+typedef long (*FARPROC)(void);
 FARPROC test_load_func(FARPROC origfun) {
   if (!*(unsigned char*) origfun)
     return origfun;
@@ -538,7 +538,7 @@ FARPROC test_load_func(FARPROC origfun) {
   int y;
 };
 void test_pass_val_aux(struct test_pass_val s);
-void test_pass_val() {
+void test_pass_val(void) {
   struct test_pass_val s;
   s.x = 1;
   s.y = 2;
@@ -599,21 +599,21 @@ - (id) foo {
   int w;
   int z;
 };
-void test_offsetof_1() {
+void test_offsetof_1(void) {
   if (__builtin_offsetof(struct test_offsetof_A, x) ==
       __builtin_offsetof(struct test_offsetof_B, w))
     return;
   int *p = 0;
   *p = 0xDEADBEEF; // no-warning
 }
-void test_offsetof_2() {
+void test_offsetof_2(void) {
   if (__builtin_offsetof(struct test_offsetof_A, y) ==
       __builtin_offsetof(struct test_offsetof_B, z))
     return;
   int *p = 0;
   *p = 0xDEADBEEF; // no-warning
 }
-void test_offsetof_3() {
+void test_offsetof_3(void) {
   if (__builtin_offsetof(struct test_offsetof_A, y) -
       __builtin_offsetof(struct test_offsetof_A, x)
       ==
@@ -623,7 +623,7 @@ void test_offsetof_3() {
   int *p = 0;
   *p = 0xDEADBEEF; // no-warning
 }
-void test_offsetof_4() {
+void test_offsetof_4(void) {
   if (__builtin_offsetof(struct test_offsetof_A, y) ==
       __builtin_offsetof(struct test_offsetof_B, w))
     return;
@@ -639,8 +639,8 @@ @interface RDar6829164 : NSObject {
 - (id) init;
 @end
 
-id rdar_6829164_1();
-double rdar_6829164_2();
+id rdar_6829164_1(void);
+double rdar_6829164_2(void);
 
 @implementation RDar6829164
 - (id) init {
@@ -657,7 +657,7 @@ - (id) init {
 // <rdar://problem/7242015> - Invalidate values passed-by-reference
 // to functions when the pointer to the value is passed as an integer.
 void test_7242015_aux(unsigned long);
-int rdar_7242015() {
+int rdar_7242015(void) {
   int x;
   test_7242015_aux((unsigned long) &x); // no-warning
   return x; // Previously we return and uninitialized value when
@@ -680,7 +680,7 @@ void pr_4988(void) {
 
 // <rdar://problem/7152418> - A 'signed char' is used as a flag, which is
 //  implicitly converted to an int.
-void *rdar7152418_bar();
+void *rdar7152418_bar(void);
 @interface RDar7152418 {
   signed char x;
 }
@@ -760,7 +760,7 @@ NSSwappedFloat test_cast_nonstruct_to_union(float x) {
   return ((union bran *)&x)->sf; // no-warning
 }
 
-void test_undefined_array_subscript() {
+void test_undefined_array_subscript(void) {
   int i, a[10];
   int *p = &a[i]; // expected-warning{{Array subscript is undefined}}
 }
@@ -864,9 +864,9 @@ int rdar_7593875(int n) {
 // Previously this caused an assertion failure.
 //===----------------------------------------------------------------------===//
 
-void *foo_rev95119();
+void *foo_rev95119(void);
 void baz_rev95119(double x);
-void bar_rev95119() {
+void bar_rev95119(void) {
   // foo_rev95119() returns a symbolic pointer.  It is then 
   // cast to an int which is then cast to a double.
   int value = (int) foo_rev95119();
@@ -893,8 +893,8 @@ void foo_rev95192(int **x) {
 // violates our invariants.
 //===----------------------------------------------------------------------===//
 
-void *foo_rev95267();
-int bar_rev95267() {
+void *foo_rev95267(void);
+int bar_rev95267(void) {
   char (*Callback_rev95267)(void) = (char (*)(void)) foo_rev95267;
   if ((*Callback_rev95267)() == (char) 0)
     return 1;
@@ -902,20 +902,20 @@ int bar_rev95267() {
 }
 
 // Same as previous case, but handle casts to 'void'.
-int bar_rev95274() {
+int bar_rev95274(void) {
   void (*Callback_rev95274)(void) = (void (*)(void)) foo_rev95267;
   (*Callback_rev95274)();
   return 0;
 }
 
-void rdar7582031_test_static_init_zero() {
+void rdar7582031_test_static_init_zero(void) {
   static unsigned x;
   if (x == 0)
     return;
   int *p = 0;
   *p = 0xDEADBEEF;
 }
-void rdar7582031_test_static_init_zero_b() {
+void rdar7582031_test_static_init_zero_b(void) {
   static void* x;
   if (x == 0)
     return;
@@ -947,7 +947,7 @@ void foo_rev95547_b(struct s_rev95547 w) {
 // This previously triggered a crash.
 //===----------------------------------------------------------------------===//
 
-void pr6938() {
+void pr6938(void) {
   if (1 && ({
     while (0);
     0;
@@ -955,7 +955,7 @@ void pr6938() {
   }
 }
 
-void pr6938_b() {
+void pr6938_b(void) {
   if (1 && *({ // expected-warning{{Dereference of null pointer}}
     while (0) {}
     ({
@@ -988,8 +988,8 @@ void test_pr7361 (char a) {\
 // PR 7491 - Test that symbolic expressions can be used as conditions.
 //===----------------------------------------------------------------------===
 
-void pr7491 () {
-  extern int getint();
+void pr7491 (void) {
+  extern int getint(void);
   int a = getint()-1;
   if (a) {
     return;
@@ -1008,15 +1008,15 @@ void pr7491 () {
 //===----------------------------------------------------------------------===
 
 int *pr7475_someGlobal;
-void pr7475_setUpGlobal();
+void pr7475_setUpGlobal(void);
 
-void pr7475() {
+void pr7475(void) {
   if (pr7475_someGlobal == 0)
     pr7475_setUpGlobal();
   *pr7475_someGlobal = 0; // no-warning
 }
 
-void pr7475_warn() {
+void pr7475_warn(void) {
   static int *someStatic = 0;
   if (someStatic == 0)
     pr7475_setUpGlobal();
@@ -1097,7 +1097,7 @@ void test_enum_cases_positive(enum Cases C) {
 }
 
 // <rdar://problem/6351970> rule request: warn if synchronization mutex can be nil
-void rdar6351970() {
+void rdar6351970(void) {
   id x = 0;
   @synchronized(x) {} // expected-warning{{Nil value used as mutex for @synchronized() (no synchronization will occur)}}
 }
@@ -1107,7 +1107,7 @@ void rdar6351970_b(id x) {
     @synchronized(x) {} // expected-warning{{Nil value used as mutex for @synchronized() (no synchronization will occur)}}
 }
 
-void rdar6351970_c() {
+void rdar6351970_c(void) {
   id x;
   @synchronized(x) {} // expected-warning{{Uninitialized value used as mutex for @synchronized}}
 }
@@ -1169,8 +1169,8 @@ void __PR8458(PR8458 *x) {
   char **data;
 } saved_pr8440;
 
-char *foo_pr8440();
-char **bar_pr8440();
+char *foo_pr8440(void);
+char **bar_pr8440(void);
 void baz_pr8440(int n)
 {
    saved_pr8440.num = n;
@@ -1184,12 +1184,12 @@ void baz_pr8440(int n)
 // Support direct accesses to non-null memory.  Reported in:
 //  PR 5272
 //  <rdar://problem/6839683>
-int test_direct_address_load() {
+int test_direct_address_load(void) {
   int *p = (int*) 0x4000;
   return *p; // no-warning
 }
 
-void pr5272_test() {
+void pr5272_test(void) {
   struct pr5272 { int var2; };
   (*(struct pr5272*)0xBC000000).var2 = 0; // no-warning
   (*(struct pr5272*)0xBC000000).var2 += 2; // no-warning
@@ -1198,10 +1198,10 @@ void pr5272_test() {
 // Support casting the return value of function to another 
diff erent type
 // This previously caused a crash, although we likely need more precise
 // reasoning here. <rdar://problem/8663544>
-void* rdar8663544();
+void* rdar8663544(void);
 typedef struct {} Val8663544;
-Val8663544 bazR8663544() {
-  Val8663544(*func) () = (Val8663544(*) ()) rdar8663544;
+Val8663544 bazR8663544(void) {
+  Val8663544(*func) (void) = (Val8663544(*) (void)) rdar8663544;
   return func();
 }
 
@@ -1218,7 +1218,7 @@ void pr8619(int a, int b, int c) {
 union pr8648_union {
         signed long long pr8648_union_field;
 };
-void pr8648() {
+void pr8648(void) {
   long long y;
   union pr8648_union x = { .pr8648_union_field = 0LL };
   y = x.pr8648_union_field;
@@ -1240,7 +1240,7 @@ void pr8648() {
 // contains a condition with multiple basic blocks, and the value of the
 // statement expression is then indexed as part of a bigger condition expression.
 // This example exposed a bug in child traversal in the CFGBuilder.
-void pr9269() {
+void pr9269(void) {
   struct s { char *bar[10]; } baz[2] = { 0 };
   unsigned i = 0;
   for (i = 0;
@@ -1271,7 +1271,7 @@ void pr9287_c(int type, int *p) {
   }
 }
 
-void test_switch() {
+void test_switch(void) {
   switch (4) {
     case 1: {
       int *p = 0;
@@ -1305,8 +1305,8 @@ static void test(unsigned int bit_mask)
 }
 
 // Don't crash on code containing __label__.
-int radar9414427_aux();
-void radar9414427() {
+int radar9414427_aux(void);
+void radar9414427(void) {
   __label__ mylabel;
   if (radar9414427_aux()) {
   mylabel: do {}
@@ -1343,7 +1343,7 @@ - (void)foo {
 
 // Don't crash when a ?: is only preceded by a statement (not an expression)
 // in the CFG.
-void __assert_fail();
+void __assert_fail(void);
 
 enum rdar1196620_e { E_A, E_B, E_C, E_D };
 struct rdar1196620_s { int ints[E_D+1]; };

diff  --git a/clang/test/Analysis/mmap-writeexec.c b/clang/test/Analysis/mmap-writeexec.c
index 2ebc961103425..c82dfbb4fb2e3 100644
--- a/clang/test/Analysis/mmap-writeexec.c
+++ b/clang/test/Analysis/mmap-writeexec.c
@@ -18,7 +18,7 @@ typedef __typeof(sizeof(int)) size_t;
 void *mmap(void *, size_t, int, int, int, long);
 int mprotect(void *, size_t, int);
 
-void f1()
+void f1(void)
 {
   void *a = mmap(NULL, 16, PROT_READ | PROT_EXEC, MAP_PRIVATE | MAP_ANON, -1, 0); // no-warning
   void *b = mmap(a, 16, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_ANON, -1, 0); // no-warning
@@ -28,7 +28,7 @@ void f1()
   (void)c;
 }
 
-void f2()
+void f2(void)
 {
   void *(*callm)(void *, size_t, int, int, int, long);
   callm = mmap;
@@ -36,7 +36,7 @@ void f2()
   (void)callm(NULL, 1024, prot, MAP_PRIVATE | MAP_ANON, -1, 0); // expected-warning{{Both PROT_WRITE and PROT_EXEC flags are set. This can lead to exploitable memory regions, which could be overwritten with malicious code}}
 }
 
-void f3()
+void f3(void)
 {
   void *p = mmap(NULL, 1024, PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); // no-warning
   int m = mprotect(p, 1024, PROT_WRITE | PROT_EXEC); // expected-warning{{Both PROT_WRITE and PROT_EXEC flags are set. This can lead to exploitable memory regions, which could be overwritten with malicious code}}

diff  --git a/clang/test/Analysis/nil-receiver-undefined-larger-than-voidptr-ret.m b/clang/test/Analysis/nil-receiver-undefined-larger-than-voidptr-ret.m
index 9685fa00a0225..f65743ac5427d 100644
--- a/clang/test/Analysis/nil-receiver-undefined-larger-than-voidptr-ret.m
+++ b/clang/test/Analysis/nil-receiver-undefined-larger-than-voidptr-ret.m
@@ -24,39 +24,39 @@ - (long double)longDoubleM { return 0.0; }
 - (void)voidM {}
 @end
 
-void createFoo() {
+void createFoo(void) {
   MyClass *obj = 0;  
   
   void *v = [obj voidPtrM]; // no-warning
   int i = [obj intM]; // no-warning
 }
 
-void createFoo2() {
+void createFoo2(void) {
   MyClass *obj = 0;  
   
   long double ld = [obj longDoubleM];
 }
 
-void createFoo3() {
+void createFoo3(void) {
   MyClass *obj;
   obj = 0;  
   
   long long ll = [obj longlongM];
 }
 
-void createFoo4() {
+void createFoo4(void) {
   MyClass *obj = 0;  
   
   double d = [obj doubleM];
 }
 
-void createFoo5() {
+void createFoo5(void) {
   MyClass *obj = (id)@"";  
   
   double d = [obj doubleM]; // no-warning
 }
 
-void createFoo6() {
+void createFoo6(void) {
   MyClass *obj;
   obj = 0;  
   
@@ -75,7 +75,7 @@ void handleNilPruneLoop(MyClass *obj) {
   long long j = [obj longlongM];
 }
 
-int handleVoidInComma() {
+int handleVoidInComma(void) {
   MyClass *obj = 0;
   return [obj voidM], 0;
 }

diff  --git a/clang/test/Analysis/no-outofbounds.c b/clang/test/Analysis/no-outofbounds.c
index ae534a94a241e..5d88224669b0c 100644
--- a/clang/test/Analysis/no-outofbounds.c
+++ b/clang/test/Analysis/no-outofbounds.c
@@ -5,7 +5,7 @@
 // This file tests cases where we should not flag out-of-bounds warnings.
 //===----------------------------------------------------------------------===//
 
-void f() {
+void f(void) {
   long x = 0;
   char *y = (char*) &x;
   char c = y[0] + y[1] + y[2]; // no-warning
@@ -13,7 +13,7 @@ void f() {
   short s = z[0] + z[1]; // no-warning
 }
 
-void g() {
+void g(void) {
   int a[2];
   char *b = (char*)a;
   b[3] = 'c'; // no-warning
@@ -23,7 +23,7 @@ typedef typeof(sizeof(int)) size_t;
 void *malloc(size_t);
 void free(void *);
 
-void field() {
+void field(void) {
   struct vec { size_t len; int data[0]; };
   struct vec *a = malloc(sizeof(struct vec) + 10*sizeof(int));
   a->len = 10;

diff  --git a/clang/test/Analysis/non-diagnosable-assumptions.c b/clang/test/Analysis/non-diagnosable-assumptions.c
index 44b69bed7c272..c3fdfea238a81 100644
--- a/clang/test/Analysis/non-diagnosable-assumptions.c
+++ b/clang/test/Analysis/non-diagnosable-assumptions.c
@@ -11,9 +11,9 @@
 // non-diagnosable conditions.
 
 // Function calls are currently non-diagnosable.
-int non_diagnosable();
+int non_diagnosable(void);
 
-void test_true() {
+void test_true(void) {
   if (non_diagnosable()) {
     // expected-note at -1{{Assuming the condition is true}}
     // expected-note at -2{{Taking true branch}}
@@ -23,7 +23,7 @@ void test_true() {
   }
 }
 
-void test_false() {
+void test_false(void) {
   if (non_diagnosable()) {
     // expected-note at -1{{Assuming the condition is false}}
     // expected-note at -2{{Taking false branch}}
@@ -36,7 +36,7 @@ void test_false() {
 
 // Test that we're still reporting that the condition is true,
 // when we encounter an exclamation mark (used to be broken).
-void test_exclamation_mark() {
+void test_exclamation_mark(void) {
   if (!non_diagnosable()) {
     // expected-note at -1{{Assuming the condition is true}}
     // expected-note at -2{{Taking true branch}}

diff  --git a/clang/test/Analysis/nonnull.m b/clang/test/Analysis/nonnull.m
index 6db7cfaf4917a..c61afb6d8da4c 100644
--- a/clang/test/Analysis/nonnull.m
+++ b/clang/test/Analysis/nonnull.m
@@ -188,7 +188,7 @@ void testVararg(int k, void *p) {
     testVararg_check(2, p, n); // expected-warning{{nonnull}}
 }
 
-void testNotPtr() {
+void testNotPtr(void) {
   struct S { int a; int b; int c; } s = {};
   extern void testNotPtr_check(struct S, int) __attribute__((nonnull(1, 2)));
   testNotPtr_check(s, 0);

diff  --git a/clang/test/Analysis/null-deref-path-notes.c b/clang/test/Analysis/null-deref-path-notes.c
index b1bef63390da1..6d4a4aa4ef961 100644
--- a/clang/test/Analysis/null-deref-path-notes.c
+++ b/clang/test/Analysis/null-deref-path-notes.c
@@ -2,7 +2,7 @@
 
 // Avoid the crash when finding the expression for tracking the origins
 // of the null pointer for path notes.
-void pr34373() {
+void pr34373(void) {
   int *a = 0; // expected-note{{'a' initialized to a null pointer value}}
   (a + 0)[0]; // expected-warning{{Array access results in a null pointer dereference}}
               // expected-note at -1{{Array access results in a null pointer dereference}}

diff  --git a/clang/test/Analysis/null-deref-path-notes.m b/clang/test/Analysis/null-deref-path-notes.m
index 837664aa397eb..00b6c52d3544b 100644
--- a/clang/test/Analysis/null-deref-path-notes.m
+++ b/clang/test/Analysis/null-deref-path-notes.m
@@ -41,7 +41,7 @@ void repeatedStores(int coin) {
   if (coin) {
     // expected-note at -1 {{Assuming 'coin' is 0}}
     // expected-note at -2 {{Taking false branch}}
-    extern int *getPointer();
+    extern int *getPointer(void);
     p = getPointer();
   } else {
     p = 0; // expected-note {{Null pointer value stored to 'p'}}

diff  --git a/clang/test/Analysis/null-deref-ps-region.c b/clang/test/Analysis/null-deref-ps-region.c
index bb35944411bb1..72993076cbd20 100644
--- a/clang/test/Analysis/null-deref-ps-region.c
+++ b/clang/test/Analysis/null-deref-ps-region.c
@@ -23,56 +23,56 @@ void f14(int *a) {
   }
 }
 
-void foo() {
+void foo(void) {
   int *x = malloc(sizeof(int));
   memset(x, 0, sizeof(int));
   int n = 1 / *x; // expected-warning {{Division by zero}}
   free(x);
 }
 
-void bar() {
+void bar(void) {
   int *x = malloc(sizeof(int));
   memset(x, 0, 1);
   int n = 1 / *x; // no-warning
   free(x);
 }
 
-void testConcreteNull() {
+void testConcreteNull(void) {
   int *x = 0;
   memset(x, 0, 1); // expected-warning {{Null pointer passed as 1st argument to memory set function}}
 }
 
-void testStackArray() {
+void testStackArray(void) {
   char buf[13];
   memset(buf, 0, 1); // no-warning
 }
 
-void testHeapSymbol() {
+void testHeapSymbol(void) {
   char *buf = (char *)malloc(13);
   memset(buf, 0, 1); // no-warning
   free(buf);
 }
 
-void testStackArrayOutOfBound() {
+void testStackArrayOutOfBound(void) {
   char buf[1];
   memset(buf, 0, 1024);
   // expected-warning at -1 {{Memory set function overflows the destination buffer}}
   // expected-warning at -2 {{'memset' will always overflow; destination buffer has size 1, but size argument is 1024}}
 }
 
-void testHeapSymbolOutOfBound() {
+void testHeapSymbolOutOfBound(void) {
   char *buf = (char *)malloc(1);
   memset(buf, 0, 1024);
   // expected-warning at -1 {{Memory set function overflows the destination buffer}}
   free(buf);
 }
 
-void testStackArraySameSize() {
+void testStackArraySameSize(void) {
   char buf[1];
   memset(buf, 0, sizeof(buf)); // no-warning
 }
 
-void testHeapSymbolSameSize() {
+void testHeapSymbolSameSize(void) {
   char *buf = (char *)malloc(1);
   memset(buf, 0, 1); // no-warning
   free(buf);

diff  --git a/clang/test/Analysis/null-deref-ps.c b/clang/test/Analysis/null-deref-ps.c
index d1c19e533deb4..73e7ef0665666 100644
--- a/clang/test/Analysis/null-deref-ps.c
+++ b/clang/test/Analysis/null-deref-ps.c
@@ -58,7 +58,7 @@ int f4(int *p) {
   return *q; // expected-warning{{Dereference of null pointer (loaded from variable 'q')}}
 }
 
-int f4_b() {
+int f4_b(void) {
   short array[2];
   uintptr_t x = array; // expected-warning{{incompatible pointer to integer conversion}}
   short *p = x; // expected-warning{{incompatible integer to pointer conversion}}
@@ -79,7 +79,7 @@ int f4_b() {
   return 0;
 }
 
-int f5() {
+int f5(void) {
   
   char *s = "hello world";
   return s[0]; // no-warning
@@ -275,7 +275,7 @@ void f12(HF12ITEM i, char *q) {
 }
 
 // Test handling of translating between integer "pointers" and back.
-void f13() {
+void f13(void) {
   int *x = 0;
   if (((((int) x) << 2) + 1) >> 1) *x = 1;
 }
@@ -284,7 +284,7 @@ void f13() {
 // handling pointer values that were undefined.
 void pr4759_aux(int *p) __attribute__((nonnull));
 
-void pr4759() {
+void pr4759(void) {
   int *p;
   pr4759_aux(p); // expected-warning{{1st function call argument is an uninitialized value}}
 }
@@ -323,7 +323,7 @@ void test_address_space_condition(int AS_ATTRIBUTE *cpu_data) {
   }
 }
 struct X { int member; };
-int test_address_space_member() {
+int test_address_space_member(void) {
   struct X AS_ATTRIBUTE *data = (struct X AS_ATTRIBUTE *)0UL;
   int ret;
   ret = data->member; // no-warning

diff  --git a/clang/test/Analysis/null-deref-static.m b/clang/test/Analysis/null-deref-static.m
index 887bea2523903..06a97644aa1d1 100644
--- a/clang/test/Analysis/null-deref-static.m
+++ b/clang/test/Analysis/null-deref-static.m
@@ -1,16 +1,16 @@
 // RUN: %clang_cc1 -w -fblocks -analyze -analyzer-checker=core,deadcode,alpha.core,debug.ExprInspection -verify %s
 
 void *malloc(unsigned long);
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 
-void test_static_from_block() {
+void test_static_from_block(void) {
   static int *x;
   ^{
     *x; // no-warning
   };
 }
 
-void test_static_within_block() {
+void test_static_within_block(void) {
   ^{
     static int *x;
     *x; // expected-warning{{Dereference of null pointer}}

diff  --git a/clang/test/Analysis/nullability.m b/clang/test/Analysis/nullability.m
index f777900006de4..216ceffd25e61 100644
--- a/clang/test/Analysis/nullability.m
+++ b/clang/test/Analysis/nullability.m
@@ -2,10 +2,10 @@
 
 // expected-no-diagnostics
 
-id _Nonnull conjure_nonnull();
+id _Nonnull conjure_nonnull(void);
 void use_nullable(_Nullable id x);
 
-id _Nonnull foo() {
+id _Nonnull foo(void) {
   void *j = conjure_nonnull();
   use_nullable(j);
   return j; // no-warning

diff  --git a/clang/test/Analysis/objc-arc.m b/clang/test/Analysis/objc-arc.m
index 7127232f0de5c..5fe5eb345fdbc 100644
--- a/clang/test/Analysis/objc-arc.m
+++ b/clang/test/Analysis/objc-arc.m
@@ -49,7 +49,7 @@ - (id)initWithArray:(NSArray *)array;
 __attribute__((ns_returns_not_retained)) id objc_unretainedObject(objc_objectptr_t pointer);
 
 // Test the analyzer is working at all.
-void test_working() {
+void test_working(void) {
   int *p = 0;
   *p = 0xDEADBEEF; // expected-warning {{null}}
 }
@@ -75,7 +75,7 @@ void testblock_qux(int x) {
 }
 
 // Test that Objective-C pointers are null initialized.
-void test_nil_initialized() {
+void test_nil_initialized(void) {
   id x;
   if (x == 0)
     return;
@@ -84,12 +84,12 @@ void test_nil_initialized() {
 }
 
 // Test that we don't flag leaks of Objective-C objects.
-void test_alloc() {
+void test_alloc(void) {
   [NSObject alloc]; // no-warning
 }
 
 // Test that CF allocations are still caught as leaks.
-void test_cf_leak() {
+void test_cf_leak(void) {
   CFAbsoluteTime t = CFAbsoluteTimeGetCurrent();
   CFDateRef date = CFDateCreate(0, t); // expected-warning {{Potential leak}}
   (void) date;
@@ -115,7 +115,7 @@ - (RDar9424890_A *)obj:(RDar9424890_A *)obj {
 @end
 
 // Test that dead store checking works in the prescence of "cleanups" in the AST.
-void rdar9424882() {
+void rdar9424882(void) {
   id x = [NSObject alloc]; // expected-warning {{Value stored to 'x' during its initialization is never read}}
 }
 
@@ -127,15 +127,15 @@ @interface NSString : NSObject
 - (id) self;
 @end
 
-CFTypeRef CFCreateSomething();
-CFStringRef CFCreateString();
-CFTypeRef CFGetSomething();
-CFStringRef CFGetString();
+CFTypeRef CFCreateSomething(void);
+CFStringRef CFCreateString(void);
+CFTypeRef CFGetSomething(void);
+CFStringRef CFGetString(void);
 
-id CreateSomething();
-NSString *CreateNSString();
+id CreateSomething(void);
+NSString *CreateNSString(void);
 
-void from_cf() {
+void from_cf(void) {
   id obj1 = (__bridge_transfer id)CFCreateSomething(); // expected-warning{{never read}}
   id obj2 = (__bridge_transfer NSString*)CFCreateString();
   [obj2 self]; // Add a use, to show we can use the object after it has been transferred.
@@ -153,14 +153,14 @@ void to_cf(id obj) {
   CFStringRef cf4 = (__bridge CFStringRef)CreateNSString();  // expected-warning{{never read}}
 }
 
-void test_objc_retainedObject() {
+void test_objc_retainedObject(void) {
   CFAbsoluteTime t = CFAbsoluteTimeGetCurrent();
   CFDateRef date = CFDateCreate(0, t);
   id x = objc_retainedObject(date);
   (void) x;
 }
 
-void test_objc_unretainedObject() {
+void test_objc_unretainedObject(void) {
   CFAbsoluteTime t = CFAbsoluteTimeGetCurrent();
   CFDateRef date = CFDateCreate(0, t);  // expected-warning {{Potential leak}}
   id x = objc_unretainedObject(date);
@@ -168,12 +168,12 @@ void test_objc_unretainedObject() {
 }
 
 // Previously this resulted in a "return of stack address" warning.
-id test_return() {
+id test_return(void) {
   id x = (__bridge_transfer id) CFCreateString();
   return x; // no-warning
 }
 
-void test_objc_arrays() {
+void test_objc_arrays(void) {
     { // CASE ONE -- OBJECT IN ARRAY CREATED DIRECTLY
         NSObject *o = [[NSObject alloc] init];
         NSArray *a = [[NSArray alloc] initWithObjects:o, (void*)0];
@@ -210,20 +210,20 @@ void rdar11059275(dispatch_object_t object) {
   NSObject *o = [[NSObject alloc] init];
   dispatch_set_context(object, CFBridgingRetain(o)); // no-warning  
 }
-void rdar11059275_positive() {
+void rdar11059275_positive(void) {
   NSObject *o = [[NSObject alloc] init]; // expected-warning {{leak}}
   CFBridgingRetain(o);
 }
-void rdar11059275_negative() {
+void rdar11059275_negative(void) {
   NSObject *o = [[NSObject alloc] init]; // no-warning
   (void) o;
 }
 
-__attribute__((ns_returns_retained)) id rdar14061675_helper() {
+__attribute__((ns_returns_retained)) id rdar14061675_helper(void) {
   return [[NSObject alloc] init];
 }
 
-id rdar14061675() {
+id rdar14061675(void) {
   // ARC produces an implicit cast here. We need to make sure the combination
   // of that and the inlined call don't produce a spurious edge cycle.
   id result = rdar14061675_helper();
@@ -240,7 +240,7 @@ id rdar14061675() {
 extern void CFRelease(CFTypeRef cf);
 
 
-void check_bridge_retained_cast() {
+void check_bridge_retained_cast(void) {
     NSString *nsStr = [[NSString alloc] init];
     CFStringRef cfStr = (__bridge_retained CFStringRef)nsStr;
     CFRelease(cfStr); // no-warning
@@ -255,7 +255,7 @@ void check_bridge_to_non_cocoa(CFStringRef s) {
 
 struct B;
 
-struct B * check_bridge_to_non_cf() {
+struct B * check_bridge_to_non_cf(void) {
   NSString *s = [[NSString alloc] init];
   return (__bridge struct B*) s;
 }

diff  --git a/clang/test/Analysis/objc-bool.m b/clang/test/Analysis/objc-bool.m
index 98d0cb2773f64..62202ad4cc67b 100644
--- a/clang/test/Analysis/objc-bool.m
+++ b/clang/test/Analysis/objc-bool.m
@@ -5,7 +5,7 @@
 
 typedef signed char BOOL;
 
-void rdar_10597458() {
+void rdar_10597458(void) {
   if (__objc_yes)
     return;
   int *p = 0;

diff  --git a/clang/test/Analysis/objc-boxing.m b/clang/test/Analysis/objc-boxing.m
index 66f24ddf77b3e..a4b8057d4d5d8 100644
--- a/clang/test/Analysis/objc-boxing.m
+++ b/clang/test/Analysis/objc-boxing.m
@@ -49,11 +49,11 @@ + (NSValue *)valueWithBytes:(const void *)value
 extern void free(void *);
 extern char *strdup(const char *str);
 
-id constant_string() {
+id constant_string(void) {
     return @("boxed constant string.");
 }
 
-id dynamic_string() {
+id dynamic_string(void) {
     return @(strdup("boxed dynamic string")); // expected-warning{{Potential memory leak}}
 }
 
@@ -61,14 +61,14 @@ typedef struct __attribute__((objc_boxable)) {
   const char *str;
 } BoxableStruct;
 
-id leak_within_boxed_struct() {
+id leak_within_boxed_struct(void) {
   BoxableStruct bs;
   bs.str = strdup("dynamic string"); // The duped string shall be owned by val.
   NSValue *val = @(bs); // no-warning
   return val;
 }
 
-id leak_of_boxed_struct() {
+id leak_of_boxed_struct(void) {
   BoxableStruct *bs = malloc(sizeof(BoxableStruct)); // The pointer stored in bs isn't owned by val.
   NSValue *val = @(*bs); // expected-warning{{Potential leak of memory pointed to by 'bs'}}
   return val;
@@ -80,7 +80,7 @@ id const_char_pointer(int *x) {
   return @(*x); // expected-warning {{Dereference of null pointer (loaded from variable 'x')}}
 }
 
-void checkNonNil() {
+void checkNonNil(void) {
   clang_analyzer_eval(!!@3); // expected-warning{{TRUE}}
   clang_analyzer_eval(!!@(3+4)); // expected-warning{{TRUE}}
   clang_analyzer_eval(!!@(57.0)); // expected-warning{{TRUE}}

diff  --git a/clang/test/Analysis/objc-for.m b/clang/test/Analysis/objc-for.m
index d4a04c1c3e80b..a5b89d2619c6d 100644
--- a/clang/test/Analysis/objc-for.m
+++ b/clang/test/Analysis/objc-for.m
@@ -1,7 +1,7 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx.cocoa.Loops,debug.ExprInspection -verify -analyzer-config eagerly-assume=false %s
 
 void clang_analyzer_eval(int);
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 
 #define nil ((id)0)
 
@@ -53,7 +53,7 @@ @interface NSPointerArray : NSObject <NSFastEnumeration>
 @interface NSString : NSObject
 @end
 
-void test() {
+void test(void) {
   id x;
   for (x in [NSArray testObject])
     clang_analyzer_eval(x != nil); // expected-warning{{TRUE}}
@@ -71,7 +71,7 @@ void test() {
     clang_analyzer_eval(x != nil); // expected-warning{{UNKNOWN}}
 }
 
-void testWithVarInFor() {
+void testWithVarInFor(void) {
   for (id x in [NSArray testObject])
     clang_analyzer_eval(x != nil); // expected-warning{{TRUE}}
   for (id x in [NSPointerArray testObject])
@@ -168,7 +168,7 @@ void onlySuppressLoopExitAfterZeroIterations_WithContinue(NSMutableDictionary *D
   }
 }
 
-int* getPtr();
+int* getPtr(void);
 void onlySuppressLoopExitAfterZeroIterations_WithBreak(NSMutableDictionary *D) {
   if (D.count > 0) {
     int *x;
@@ -345,7 +345,7 @@ void boxedArrayEscape(NSMutableArray *array) {
     clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }
 
-int not_reachable_on_iteration_through_nil() {
+int not_reachable_on_iteration_through_nil(void) {
   NSDictionary* d = nil;
   for (NSString* s in [d allKeys])
     clang_analyzer_warnIfReached(); // no-warning

diff  --git a/clang/test/Analysis/objc-indirect-copy-restore.m b/clang/test/Analysis/objc-indirect-copy-restore.m
index 4881d218f31b0..f7fd10b3dc975 100644
--- a/clang/test/Analysis/objc-indirect-copy-restore.m
+++ b/clang/test/Analysis/objc-indirect-copy-restore.m
@@ -1,7 +1,7 @@
 // RUN: %clang_analyze_cc1 -fobjc-arc -analyzer-checker=core,debug.ExprInspection -verify %s
 
 void clang_analyzer_eval(int);
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 
 extern void __assert_fail (__const char *__assertion, __const char *__file,
     unsigned int __line, __const char *__function)

diff  --git a/clang/test/Analysis/objc-message.m b/clang/test/Analysis/objc-message.m
index f525ce7968ddc..c7efdb64c1974 100644
--- a/clang/test/Analysis/objc-message.m
+++ b/clang/test/Analysis/objc-message.m
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,debug.ExprInspection -analyzer-store=region -verify -Wno-objc-root-class %s
 
-extern void clang_analyzer_warnIfReached();
+extern void clang_analyzer_warnIfReached(void);
 void clang_analyzer_eval(int);
 
 @interface SomeClass

diff  --git a/clang/test/Analysis/objc-method-coverage.m b/clang/test/Analysis/objc-method-coverage.m
index 1915586de93a6..2d88f9ab146e3 100644
--- a/clang/test/Analysis/objc-method-coverage.m
+++ b/clang/test/Analysis/objc-method-coverage.m
@@ -1,7 +1,7 @@
 // REQUIRES: asserts
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-stats -fblocks %s 2>&1 | FileCheck %s
 @interface I
-int f() {
+int f(void) {
   return 0;
 }
 @end

diff  --git a/clang/test/Analysis/objc-radar17039661.m b/clang/test/Analysis/objc-radar17039661.m
index c53b3e0fbf82c..14cff38b6f249 100644
--- a/clang/test/Analysis/objc-radar17039661.m
+++ b/clang/test/Analysis/objc-radar17039661.m
@@ -45,7 +45,7 @@ static inline BOOL performAction(NSNumber *(^action)(NSNumber *traitValue)) {
   return didFindTrait;
 }
 
-void runTest() {
+void runTest(void) {
   __attribute__((__blocks__(byref))) NSNumber *builtinResult = ((NSNumber *)0);
   BOOL wasBuiltinTrait = performAction(^(NSNumber *traitValue) {
     builtinResult = [traitValue retain];

diff  --git a/clang/test/Analysis/offsetofexpr-callback.c b/clang/test/Analysis/offsetofexpr-callback.c
index 0fcb90797d2ba..9376a98f4846b 100644
--- a/clang/test/Analysis/offsetofexpr-callback.c
+++ b/clang/test/Analysis/offsetofexpr-callback.c
@@ -5,7 +5,7 @@ struct S {
   char c;
 };
 
-void test() {
+void test(void) {
   offsetof(struct S, c); 
 }
 

diff  --git a/clang/test/Analysis/openmp-unsupported.c b/clang/test/Analysis/openmp-unsupported.c
index b2e1a1b021797..85dd4b66ba871 100644
--- a/clang/test/Analysis/openmp-unsupported.c
+++ b/clang/test/Analysis/openmp-unsupported.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -triple i386-apple-darwin10 -analyze -analyzer-checker=core.builtin -fopenmp -verify %s
 // expected-no-diagnostics
 
-void openmp_parallel_crash_test() {
+void openmp_parallel_crash_test(void) {
 #pragma omp parallel
   ;
 #pragma omp parallel for

diff  --git a/clang/test/Analysis/out-of-bounds-false-positive.c b/clang/test/Analysis/out-of-bounds-false-positive.c
index 3e80714492509..2c63f0791ecb2 100644
--- a/clang/test/Analysis/out-of-bounds-false-positive.c
+++ b/clang/test/Analysis/out-of-bounds-false-positive.c
@@ -2,7 +2,7 @@
 // RUN:   -analyzer-config eagerly-assume=false -verify %s
 
 void clang_analyzer_eval(int);
-void clang_analyzer_printState();
+void clang_analyzer_printState(void);
 
 typedef unsigned long long size_t;
 const char a[] = "abcd"; // extent: 5 bytes

diff  --git a/clang/test/Analysis/out-of-bounds.c b/clang/test/Analysis/out-of-bounds.c
index 1970cd658c427..edf70085e18fa 100644
--- a/clang/test/Analysis/out-of-bounds.c
+++ b/clang/test/Analysis/out-of-bounds.c
@@ -150,19 +150,19 @@ void test_assume_after_access(unsigned long x) {
 
 // Don't warn when indexing below the start of a symbolic region's whose
 // base extent we don't know.
-int *get_symbolic();
-void test_index_below_symboloc() {
+int *get_symbolic(void);
+void test_index_below_symboloc(void) {
   int *buf = get_symbolic();
   buf[-1] = 0; // no-warning;
 }
 
-void test_incomplete_struct() {
+void test_incomplete_struct(void) {
   extern struct incomplete incomplete;
   int *p = (int *)&incomplete;
   p[1] = 42; // no-warning
 }
 
-void test_extern_void() {
+void test_extern_void(void) {
   extern void v;
   int *p = (int *)&v;
   p[1] = 42; // no-warning

diff  --git a/clang/test/Analysis/outofbound.c b/clang/test/Analysis/outofbound.c
index 60190b4bc3554..6e61d8929f13e 100644
--- a/clang/test/Analysis/outofbound.c
+++ b/clang/test/Analysis/outofbound.c
@@ -8,13 +8,13 @@ typedef __typeof(sizeof(int)) size_t;
 void *malloc(size_t);
 void *calloc(size_t, size_t);
 
-char f1() {
+char f1(void) {
   char* s = "abcd";
   char c = s[4]; // no-warning
   return s[5] + c; // expected-warning{{Access out-of-bound array element (buffer overflow)}}
 }
 
-void f2() {
+void f2(void) {
   int *p = malloc(12);
   p[3] = 4; // expected-warning{{Access out-of-bound array element (buffer overflow)}}
 }
@@ -27,14 +27,14 @@ struct seven_words {
   int c[7];
 };
 
-void f3() {
+void f3(void) {
   struct three_words a, *p;
   p = &a;
   p[0] = a; // no-warning
   p[1] = a; // expected-warning{{Access out-of-bound array element (buffer overflow)}}
 }
 
-void f4() {
+void f4(void) {
   struct seven_words c;
   struct three_words a, *p = (struct three_words *)&c;
   p[0] = a; // no-warning
@@ -42,19 +42,19 @@ void f4() {
   p[2] = a; // expected-warning{{Access out-of-bound array element (buffer overflow)}}
 }
 
-void f5() {
+void f5(void) {
   char *p = calloc(2,2);
   p[3] = '.'; // no-warning
   p[4] = '!'; // expected-warning{{out-of-bound}}
 }
 
-void f6() {
+void f6(void) {
   char a[2];
   int *b = (int*)a;
   b[1] = 3; // expected-warning{{out-of-bound}}
 }
 
-void f7() {
+void f7(void) {
   struct three_words a;
   a.c[3] = 1; // expected-warning{{out-of-bound}}
 }

diff  --git a/clang/test/Analysis/padding_c.c b/clang/test/Analysis/padding_c.c
index e01bb7ef73c04..869e443c4785e 100644
--- a/clang/test/Analysis/padding_c.c
+++ b/clang/test/Analysis/padding_c.c
@@ -178,7 +178,7 @@ struct HoldsOverlyAlignedChar { // expected-warning{{Excessive padding in 'struc
   char c2;
 };
 
-void internalStructFunc() {
+void internalStructFunc(void) {
   struct X { // expected-warning{{Excessive padding in 'struct X'}}
     char c1;
     int t;
@@ -187,7 +187,7 @@ void internalStructFunc() {
   struct X obj;
 }
 
-void typedefStructFunc() {
+void typedefStructFunc(void) {
   typedef struct { // expected-warning{{Excessive padding in 'S'}}
     char c1;
     int t;
@@ -196,7 +196,7 @@ void typedefStructFunc() {
   S obj;
 }
 
-void anonStructFunc() {
+void anonStructFunc(void) {
   struct { // expected-warning{{Excessive padding in 'struct (unnamed}}
     char c1;
     int t;
@@ -230,7 +230,7 @@ struct SmallArrayInFunc {
   char c2;
 };
 
-void arrayHolder() {
+void arrayHolder(void) {
   struct SmallArrayInFunc Arr[15];
 }
 
@@ -245,6 +245,6 @@ struct HoldsSmallArray {
   struct SmallArrayInStruct Field[20];
 } HoldsSmallArrayElt;
 
-void nestedPadding() {
+void nestedPadding(void) {
   struct HoldsSmallArray Arr[15];
 }

diff  --git a/clang/test/Analysis/plist-html-macros.c b/clang/test/Analysis/plist-html-macros.c
index 3563450788c8e..af80fac9f6d43 100644
--- a/clang/test/Analysis/plist-html-macros.c
+++ b/clang/test/Analysis/plist-html-macros.c
@@ -24,7 +24,7 @@ void null_deref(int *a) {
   *a = 1; // expected-warning{{null}}
 }
 
-void test1() {
+void test1(void) {
   CALL_FN(0);
 }
 

diff  --git a/clang/test/Analysis/plist-macros-with-expansion-ctu.c b/clang/test/Analysis/plist-macros-with-expansion-ctu.c
index 82d59249ecdbd..956088cc0f675 100644
--- a/clang/test/Analysis/plist-macros-with-expansion-ctu.c
+++ b/clang/test/Analysis/plist-macros-with-expansion-ctu.c
@@ -18,7 +18,7 @@ extern void F2(int **);
 extern void F3(int **);
 extern void F_H(int **);
 
-void test0() {
+void test0(void) {
   int *X;
   F3(&X);
   *X = 1; // expected-warning{{Dereference of null pointer}}
@@ -28,7 +28,7 @@ void test0() {
 // CHECK-NEXT: <array>
 // CHECK-NEXT: </array>
 
-void test1() {
+void test1(void) {
   int *X;
   F1(&X);
   *X = 1; // expected-warning{{Dereference of null pointer}}
@@ -38,7 +38,7 @@ void test1() {
 // CHECK-NEXT: <array>
 // CHECK-NEXT: </array>
 
-void test2() {
+void test2(void) {
   int *X;
   F2(&X);
   *X = 1; // expected-warning{{Dereference of null pointer}}
@@ -50,7 +50,7 @@ void test2() {
 
 #define M F1(&X)
 
-void test3() {
+void test3(void) {
   int *X;
   M;
   *X = 1; // expected-warning{{Dereference of null pointer}}
@@ -73,7 +73,7 @@ void test3() {
 #undef M
 #define M F2(&X)
 
-void test4() {
+void test4(void) {
   int *X;
   M;
   *X = 1; // expected-warning{{Dereference of null pointer}}
@@ -93,7 +93,7 @@ void test4() {
 // CHECK-NEXT:  </dict>
 // CHECK-NEXT: </array>
 
-void test_h() {
+void test_h(void) {
   int *X;
   F_H(&X);
   *X = 1; // expected-warning{{Dereference of null pointer}}

diff  --git a/clang/test/Analysis/plist-macros-with-expansion.c b/clang/test/Analysis/plist-macros-with-expansion.c
index cc7844e8f5a20..c3222f63537cc 100644
--- a/clang/test/Analysis/plist-macros-with-expansion.c
+++ b/clang/test/Analysis/plist-macros-with-expansion.c
@@ -5,7 +5,7 @@
 // RUN: FileCheck --input-file=%t.plist %s
 
 #define STRANGE_FN(x) STRANGE_FN(x, 0)
-void test_strange_macro_expansion() {
+void test_strange_macro_expansion(void) {
   char *path;
   STRANGE_FN(path); // no-crash
   // expected-warning at -1 {{implicit declaration of function}}

diff  --git a/clang/test/Analysis/plist-output-alternate.m b/clang/test/Analysis/plist-output-alternate.m
index f9d5bccefe3c9..e8c762317a75b 100644
--- a/clang/test/Analysis/plist-output-alternate.m
+++ b/clang/test/Analysis/plist-output-alternate.m
@@ -39,7 +39,7 @@ void test_null_field(void) {
 }
 
 // <rdar://problem/8331641> leak reports should not show paths that end with exit() (but ones that don't end with exit())
-void panic() __attribute__((noreturn));
+void panic(void) __attribute__((noreturn));
 enum { kCFNumberSInt8Type = 1,     kCFNumberSInt16Type = 2,     kCFNumberSInt32Type = 3,     kCFNumberSInt64Type = 4,     kCFNumberFloat32Type = 5,     kCFNumberFloat64Type = 6,      kCFNumberCharType = 7,     kCFNumberShortType = 8,     kCFNumberIntType = 9,     kCFNumberLongType = 10,     kCFNumberLongLongType = 11,     kCFNumberFloatType = 12,     kCFNumberDoubleType = 13,      kCFNumberCFIndexType = 14,      kCFNumberNSIntegerType = 15,     kCFNumberCGFloatType = 16,     kCFNumberMaxType = 16    };
 typedef const struct __CFAllocator * CFAllocatorRef;
 extern const CFAllocatorRef kCFAllocatorDefault;

diff  --git a/clang/test/Analysis/plist-output.m b/clang/test/Analysis/plist-output.m
index 553982b32fd84..543fa8ad40cb2 100644
--- a/clang/test/Analysis/plist-output.m
+++ b/clang/test/Analysis/plist-output.m
@@ -50,8 +50,8 @@ void test_assumptions(int a, int b)
   *p = 0xDEADBEEF;
 }
 
-int *bar_cond_assign();
-int test_cond_assign() {
+int *bar_cond_assign(void);
+int test_cond_assign(void) {
   int *p;
   if (p = bar_cond_assign())
     return 1;
@@ -91,7 +91,7 @@ - (void)test2 {
 @end
 
 // Test that loops are documented in the path.
-void rdar12280665() {
+void rdar12280665(void) {
   for (unsigned i = 0; i < 2; ++i) {
 	  if (i == 1) {
 		  int *p = 0;
@@ -101,7 +101,7 @@ void rdar12280665() {
 }
 
 // Test for a "loop executed 0 times" diagnostic.
-int *radar12322528_bar();
+int *radar12322528_bar(void);
 
 void radar12322528_for(int x) {
   int *p = 0;
@@ -121,7 +121,7 @@ void radar12322528_while(int x) {
   *p = 0xDEADBEEF;
 }
 
-void radar12322528_foo_2() {
+void radar12322528_foo_2(void) {
   int *p = 0;
   for (unsigned i = 0; i < 2; ++i) {
     if (i == 1)
@@ -130,13 +130,13 @@ void radar12322528_foo_2() {
   *p = 0xDEADBEEF;
 }
 
-void test_loop_diagnostics() {
+void test_loop_diagnostics(void) {
   int *p = 0;
   for (int i = 0; i < 2; ++i) { p = 0; }
   *p = 1;
 }
 
-void test_loop_diagnostics_2() {
+void test_loop_diagnostics_2(void) {
   int *p = 0;
   for (int i = 0; i < 2; ) {
     ++i;
@@ -145,7 +145,7 @@ void test_loop_diagnostics_2() {
   *p = 1;
 }
 
-void test_loop_diagnostics_3() {
+void test_loop_diagnostics_3(void) {
   int *p = 0;
   int i = 0;
   while (i < 2) {
@@ -178,7 +178,7 @@ - (void)test {
 
 struct  RDar13295437_S { int *i; };
 
-int  RDar13295437() {
+int  RDar13295437(void) {
   struct RDar13295437_S s = {0};
   struct RDar13295437_S *sp = &s;
   RDar13295437_f(sp->i);

diff  --git a/clang/test/Analysis/plist-stats-output.c b/clang/test/Analysis/plist-stats-output.c
index cab9523d79bce..4bcae557d9276 100644
--- a/clang/test/Analysis/plist-stats-output.c
+++ b/clang/test/Analysis/plist-stats-output.c
@@ -2,7 +2,7 @@
 // REQUIRES: asserts
 // RUN: FileCheck --input-file=%t.plist %s
 
-int foo() {}
+int foo(void) {}
 
 
 // CHECK:  <key>diagnostics</key>

diff  --git a/clang/test/Analysis/pointer-arithmetic.c b/clang/test/Analysis/pointer-arithmetic.c
index 575dfffc01e86..3851701e10cc3 100644
--- a/clang/test/Analysis/pointer-arithmetic.c
+++ b/clang/test/Analysis/pointer-arithmetic.c
@@ -1,19 +1,19 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -verify %s
 
-int test1() {
+int test1(void) {
   int *p = (int *)sizeof(int);
   p -= 1;
   return *p; // expected-warning {{Dereference of null pointer}}
 }
 
-int test2() {
+int test2(void) {
   int *p = (int *)sizeof(int);
   p -= 2;
   p += 1;
   return *p; // expected-warning {{Dereference of null pointer}}
 }
 
-int test3() {
+int test3(void) {
   int *p = (int *)sizeof(int);
   p++;
   p--;
@@ -21,7 +21,7 @@ int test3() {
   return *p; // expected-warning {{Dereference of null pointer}}
 }
 
-int test4() {
+int test4(void) {
   // This is a special case where pointer arithmetic is not calculated to
   // preserve useful warnings on dereferences of null pointers.
   int *p = 0;

diff  --git a/clang/test/Analysis/pointer-escape-on-conservative-calls.c b/clang/test/Analysis/pointer-escape-on-conservative-calls.c
index 7ddd7a1ddb8f6..19d86ce1866f8 100644
--- a/clang/test/Analysis/pointer-escape-on-conservative-calls.c
+++ b/clang/test/Analysis/pointer-escape-on-conservative-calls.c
@@ -2,9 +2,9 @@
 
 
 void f(int *);
-int *getMem();
+int *getMem(void);
 
-int main() {
+int main(void) {
     f(getMem());
     return 0;
 }

diff  --git a/clang/test/Analysis/pr22954.c b/clang/test/Analysis/pr22954.c
index 093f6311a5057..8ca2f809c9e9a 100644
--- a/clang/test/Analysis/pr22954.c
+++ b/clang/test/Analysis/pr22954.c
@@ -20,7 +20,7 @@ struct aa {
 };
 
 // Test 
diff erent types of structure initialisation.
-int f0() {
+int f0(void) {
   struct aa a0 = {{1, 2, 3, 4}, 0};
   a0.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -34,7 +34,7 @@ int f0() {
   return 0;
 }
 
-int f1() {
+int f1(void) {
   struct aa a1;
   a1.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -48,7 +48,7 @@ int f1() {
   return 0;
 }
 
-int f2() {
+int f2(void) {
   struct aa a2 = {{1, 2}};
   a2.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -62,7 +62,7 @@ int f2() {
   return 0;
 }
 
-int f3() {
+int f3(void) {
   struct aa a3 = {{1, 2, 3, 4}, 0};
   a3.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -86,7 +86,7 @@ struct bb {
   char * s2;
 };
 
-int f4() {
+int f4(void) {
   struct bb b0 = {{1, 2, 3, 4}, 0};
   b0.s2 = strdup("hello");
   b0.a.s2 = strdup("hola");
@@ -108,7 +108,7 @@ int f4() {
 }
 
 // Test that memory leaks are caught.
-int f5() {
+int f5(void) {
   struct aa a0 = {{1, 2, 3, 4}, 0};
   a0.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -116,7 +116,7 @@ int f5() {
   return 0; // expected-warning{{Potential leak of memory pointed to by 'a0.s2'}}
 }
 
-int f6() {
+int f6(void) {
   struct aa a1;
   a1.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -124,7 +124,7 @@ int f6() {
   return 0; // expected-warning{{Potential leak of memory pointed to by 'a1.s2'}}
 }
 
-int f7() {
+int f7(void) {
   struct aa a2 = {{1, 2}};
   a2.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -132,7 +132,7 @@ int f7() {
   return 0; // expected-warning{{Potential leak of memory pointed to by 'a2.s2'}}
 }
 
-int f8() {
+int f8(void) {
   struct aa a3 = {{1, 2, 3, 4}, 0};
   a3.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -141,7 +141,7 @@ int f8() {
   return 0; // expected-warning{{Potential leak of memory pointed to by 'a3.s2'}}
 }
 
-int f9() {
+int f9(void) {
   struct bb b0 = {{1, 2, 3, 4}, 0};
   b0.s2 = strdup("hello");
   b0.a.s2 = strdup("hola");
@@ -152,7 +152,7 @@ int f9() {
   return 0;
 }
 
-int f10() {
+int f10(void) {
   struct bb b0 = {{1, 2, 3, 4}, 0};
   b0.s2 = strdup("hello");
   b0.a.s2 = strdup("hola");
@@ -169,7 +169,7 @@ struct cc {
   char * s2;
 };
 
-int f11() {
+int f11(void) {
   char x[4] = {1, 2};
   x[0] = 1;
   x[1] = 2;
@@ -194,7 +194,7 @@ struct dd {
   char s1[4];
 };
 
-int f12() {
+int f12(void) {
   struct dd d0 = {0, {1, 2, 3, 4}};
   d0.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -219,7 +219,7 @@ struct EE {
   char * s2;
 };
 
-int f13() {
+int f13(void) {
   struct EE E0 = {{{1, 2}, {3, 4}}, 0};
   E0.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -236,7 +236,7 @@ int f13() {
 // Test global parameters.
 struct aa a15 = {{1, 2, 3, 4}, 0};
 
-int f15() {
+int f15(void) {
   a15.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
   memcpy(a15.s1, input, 4);
@@ -256,7 +256,7 @@ struct gg {
   char * s2;
 };
 
-int f16() {
+int f16(void) {
   struct gg g0 = {{}, 0};
   g0.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -277,7 +277,7 @@ struct hh {
   char * s2;
 };
 
-int f17() {
+int f17(void) {
   struct hh h0;
   h0.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -297,7 +297,7 @@ struct ii {
   char * s2;
 };
 
-int f18() {
+int f18(void) {
   struct ii i18 = {{1, 2, 3, 4}, 5, 6};
   i18.i = 10;
   i18.j = 11;
@@ -314,7 +314,7 @@ int f18() {
   return 0;
 }
 
-int f181() {
+int f181(void) {
   struct ii i181 = {{1, 2, 3, 4}, 5, 6};
   i181.i = 10;
   i181.j = 11;
@@ -453,7 +453,7 @@ struct mm {
   char * s4;
 };
 
-int f24() {
+int f24(void) {
   struct ll l24 = {{1, 2, 3, 4}, 0};
   struct mm * m24 = (struct mm *)&l24;
   m24->s4 = strdup("hello");
@@ -518,7 +518,7 @@ int f26(int i) {
 }
 
 // Test sizeof as a size argument.
-int f261() {
+int f261(void) {
   struct aa a261 = {{1, 2, 3, 4}, 0};
   a261.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -532,7 +532,7 @@ int f261() {
 }
 
 // Test negative size argument.
-int f262() {
+int f262(void) {
   struct aa a262 = {{1, 2, 3, 4}, 0};
   a262.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -639,7 +639,7 @@ union uu {
   char s1[4];
 };
 
-int f30() {
+int f30(void) {
   union uu u30 = { .s1 = {1, 2, 3, 4}};
   char input[] = {1, 2, 3, 4};
   memcpy(u30.s1, input, 4);
@@ -656,7 +656,7 @@ struct kk {
   char * s2;
 };
 
-int f31() {
+int f31(void) {
   struct kk k31;
   k31.s2 = strdup("hello");
   k31.u.x = 1;
@@ -677,7 +677,7 @@ union vv {
   char * s2;
 };
 
-int f32() {
+int f32(void) {
   union vv v32;
   v32.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};
@@ -699,7 +699,7 @@ struct nn {
 };
 
 // Test bad types to dest buffer.
-int f33() {
+int f33(void) {
   struct nn n33 = {1, 2, 3, 4, 0};
   n33.s2 = strdup("hello");
   char input[] = {'a', 'b', 'c', 'd'};

diff  --git a/clang/test/Analysis/pr_4164.c b/clang/test/Analysis/pr_4164.c
index 02c1f41ebbd5f..e1d4e475d69f8 100644
--- a/clang/test/Analysis/pr_4164.c
+++ b/clang/test/Analysis/pr_4164.c
@@ -16,7 +16,7 @@ typedef __uint32_t __darwin_socklen_t;
 typedef __darwin_socklen_t socklen_t;
 int getsockopt(int, int, int, void * restrict, socklen_t * restrict);
 
-int test1() {
+int test1(void) {
   int s = -1;
   int size;
   socklen_t size_len = sizeof(size);
@@ -32,7 +32,7 @@ int test1() {
 // ElementRegion itself has elements whose type are integral (essentially raw
 // data) we strip off the ElementRegion when doing the invalidation.
 int takes_charptr(char* p);
-int test2() {
+int test2(void) {
   int size;
   if (takes_charptr((char*)&size))
     return -1;

diff  --git a/clang/test/Analysis/properties.m b/clang/test/Analysis/properties.m
index d83b8ed14f93c..4a76b42343fc4 100644
--- a/clang/test/Analysis/properties.m
+++ b/clang/test/Analysis/properties.m
@@ -152,7 +152,7 @@ -(void)dealloc {
 @end
 
 #if !__has_feature(objc_arc)
-void rdar6611873() {
+void rdar6611873(void) {
   Person *p = [[[Person alloc] init] autorelease];
   
   p.name = [[NSString string] retain]; // expected-warning {{leak}}
@@ -967,7 +967,7 @@ - (void)testAssignImplicitSynthOkay:(id)newValue {
 
 // rdar://problem/19862648
 - (void)establishIvarIsNilDuringLoops {
-  extern id getRandomObject();
+  extern id getRandomObject(void);
 
   int i = 4; // Must be at least 4 to trigger the bug.
   while (--i) {
@@ -998,7 +998,7 @@ @implementation Wrapper
 @synthesize value;
 @end
 
-void testNoCrashWhenAccessPropertyAndThereAreNoDirectBindingsAtAll() {
+void testNoCrashWhenAccessPropertyAndThereAreNoDirectBindingsAtAll(void) {
    union {
     Wrapper *wrapper;
    } u = { 0 };

diff  --git a/clang/test/Analysis/pthreadlock_state.c b/clang/test/Analysis/pthreadlock_state.c
index f6b26e4071b99..ffbb33f6beaf7 100644
--- a/clang/test/Analysis/pthreadlock_state.c
+++ b/clang/test/Analysis/pthreadlock_state.c
@@ -4,11 +4,11 @@
 
 #define NULL 0
 
-void clang_analyzer_printState();
+void clang_analyzer_printState(void);
 
 pthread_mutex_t mtx;
 
-void test() {
+void test(void) {
   clang_analyzer_printState();
   // CHECK:    "checker_messages": null
 

diff  --git a/clang/test/Analysis/pthreadlock_state_nottracked.c b/clang/test/Analysis/pthreadlock_state_nottracked.c
index e6281372e214f..44023e7fc15c4 100644
--- a/clang/test/Analysis/pthreadlock_state_nottracked.c
+++ b/clang/test/Analysis/pthreadlock_state_nottracked.c
@@ -4,7 +4,7 @@
 
 #define NULL 0
 
-void clang_analyzer_printState();
+void clang_analyzer_printState(void);
 
 void test(pthread_mutex_t *mtx) {
   int ret = pthread_mutex_destroy(mtx);

diff  --git a/clang/test/Analysis/ptr-arith.c b/clang/test/Analysis/ptr-arith.c
index 54347d3bd3748..0b7c1595aa699 100644
--- a/clang/test/Analysis/ptr-arith.c
+++ b/clang/test/Analysis/ptr-arith.c
@@ -4,15 +4,15 @@
 void clang_analyzer_eval(int);
 void clang_analyzer_dump(int);
 
-void f1() {
+void f1(void) {
   int a[10];
   int *p = a;
   ++p;
 }
 
-char* foo();
+char* foo(void);
 
-void f2() {
+void f2(void) {
   char *p = foo();
   ++p;
 }
@@ -20,7 +20,7 @@ void f2() {
 // This test case checks if we get the right rvalue type of a TypedViewRegion.
 // The ElementRegion's type depends on the array region's rvalue type. If it was
 // a pointer type, we would get a loc::SymbolVal for '*p'.
-void* memchr();
+void* memchr(const void *, int, __typeof__(sizeof(0)));
 static int
 domain_port (const char *domain_b, const char *domain_e,
              const char **domain_e_ptr)
@@ -35,7 +35,7 @@ domain_port (const char *domain_b, const char *domain_e,
   return port;
 }
 
-void f3() {
+void f3(void) {
   int x, y;
   int d = &y - &x; // expected-warning{{Subtraction of two pointers that do not point to the same memory chunk may cause incorrect result}}
 
@@ -45,12 +45,12 @@ void f3() {
   d = q-p; // no-warning
 }
 
-void f4() {
+void f4(void) {
   int *p;
   p = (int*) 0x10000; // expected-warning{{Using a fixed address is not portable because that address will probably not be valid in all environments or platforms}}
 }
 
-void f5() {
+void f5(void) {
   int x, y;
   int *p;
   p = &x + 1;  // expected-warning{{Pointer arithmetic on non-array variables relies on memory layout, which is dangerous}}
@@ -96,7 +96,7 @@ void null_operand(int *a) {
   clang_analyzer_eval(0 < a); // expected-warning{{UNKNOWN}}
 }
 
-void const_locs() {
+void const_locs(void) {
   char *a = (char*)0x1000;
   char *b = (char*)0x1100;
 start:
@@ -111,7 +111,7 @@ void const_locs() {
   clang_analyzer_eval((char**)a == &a); // expected-warning{{UNKNOWN}}
 }
 
-void array_matching_types() {
+void array_matching_types(void) {
   int array[10];
   int *a = &array[2];
   int *b = &array[5];
@@ -123,7 +123,7 @@ void array_matching_types() {
 }
 
 // This takes a 
diff erent code path than array_matching_types()
-void array_
diff erent_types() {
+void array_
diff erent_types(void) {
   int array[10];
   int *a = &array[2];
   char *b = (char*)&array[5];
@@ -134,7 +134,7 @@ void array_
diff erent_types() {
 }
 
 struct test { int x; int y; };
-void struct_fields() {
+void struct_fields(void) {
   struct test a, b;
 
   clang_analyzer_eval(&a.x != &a.y); // expected-warning{{TRUE}}
@@ -146,7 +146,7 @@ void struct_fields() {
   clang_analyzer_eval(&a.x >= &b.x); // expected-warning{{UNKNOWN}}
 }
 
-void mixed_region_types() {
+void mixed_region_types(void) {
   struct test s;
   int array[2];
   void *a = &array, *b = &s;
@@ -320,14 +320,14 @@ void negativeIndex(char *str) {
   clang_analyzer_eval(*ptr3 == 'a'); // expected-warning{{UNKNOWN}}
 }
 
-void test_no_crash_on_pointer_to_label() {
+void test_no_crash_on_pointer_to_label(void) {
   char *a = &&label;
   a[0] = 0;
 label:;
 }
 
 typedef __attribute__((__ext_vector_type__(2))) float simd_float2;
-float test_nowarning_on_vector_deref() {
+float test_nowarning_on_vector_deref(void) {
   simd_float2 x = {0, 1};
   return x[1]; // no-warning
 }

diff  --git a/clang/test/Analysis/range_casts.c b/clang/test/Analysis/range_casts.c
index a01ab5d520975..746aca974d7ec 100644
--- a/clang/test/Analysis/range_casts.c
+++ b/clang/test/Analysis/range_casts.c
@@ -1,7 +1,7 @@
 // This test checks that intersecting ranges does not cause 'system is over constrained' assertions in the case of eg: 32 bits unsigned integers getting their range from 64 bits signed integers.
 // RUN: %clang_analyze_cc1 -triple x86_64-pc-linux-gnu -analyzer-checker=core,debug.ExprInspection -analyzer-store=region -verify %s
 
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 
 void f1(long foo)
 {

diff  --git a/clang/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m b/clang/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m
index 72dbe422b63a9..f3659aa53ca66 100644
--- a/clang/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m
+++ b/clang/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m
@@ -13,12 +13,12 @@ - (Bar)foo {
 }
 @end
 
-void createFoo() {
+void createFoo(void) {
   MyClass *obj = 0;  
   Bar f = [obj foo]; // no-warning
 }
 
-void createFoo2() {
+void createFoo2(void) {
   MyClass *obj = 0;  
   [obj foo]; // no-warning
   Bar f = [obj foo]; // no-warning

diff  --git a/clang/test/Analysis/redefined_system.c b/clang/test/Analysis/redefined_system.c
index 4901b3ae616f7..0a55c36c6dd5b 100644
--- a/clang/test/Analysis/redefined_system.c
+++ b/clang/test/Analysis/redefined_system.c
@@ -3,16 +3,16 @@
 
 // Make sure we don't crash when someone redefines a system function we reason about.
 
-char memmove ();
-char malloc();
-char system();
-char stdin();
-char memccpy();
-char free();
-char strdup();
-char atoi();
+char memmove (void);
+char malloc(void);
+char system(void);
+char stdin(void);
+char memccpy(void);
+char free(void);
+char strdup(void);
+char atoi(void);
 
-int foo () {
+int foo (void) {
   return memmove() + malloc() + system() + stdin() + memccpy() + free() + strdup() + atoi();
 
 }

diff  --git a/clang/test/Analysis/region-store.c b/clang/test/Analysis/region-store.c
index f4b149d28207b..86b8c27991f80 100644
--- a/clang/test/Analysis/region-store.c
+++ b/clang/test/Analysis/region-store.c
@@ -4,7 +4,7 @@ int printf(const char *restrict,...);
 
 // Testing core functionality of the region store.
 // radar://10127782
-int compoundLiteralTest() {
+int compoundLiteralTest(void) {
     int index = 0;
     for (index = 0; index < 2; index++) {
         int thing = (int []){0, 1}[index];
@@ -13,7 +13,7 @@ int compoundLiteralTest() {
     return 0;
 }
 
-int compoundLiteralTest2() {
+int compoundLiteralTest2(void) {
     int index = 0;
     for (index = 0; index < 3; index++) {
         int thing = (int [][3]){{0,0,0}, {1,1,1}, {2,2,2}}[index][index];

diff  --git a/clang/test/Analysis/retain-release-arc.m b/clang/test/Analysis/retain-release-arc.m
index 31081e964abbc..e0f4c4d1da2a1 100644
--- a/clang/test/Analysis/retain-release-arc.m
+++ b/clang/test/Analysis/retain-release-arc.m
@@ -122,7 +122,7 @@ - (CFDictionaryRef)copyTestReturningCoreFoundation:(NSData *)plistData {
 
 int buf[1024];
 
-void libdispatch_leaked_data() {
+void libdispatch_leaked_data(void) {
   dispatch_data_t data = dispatch_data_create(buf, 1024,
                                               dispatch_get_main_queue(), ^{});
 }
@@ -132,7 +132,7 @@ void libdispatch_leaked_data() {
   // expected-note at -4{{Object leaked: object allocated and stored into 'data' is not referenced later in this execution path and has a retain count of +1}}
 #endif
 
-void libdispatch_dispatch_released_data() {
+void libdispatch_dispatch_released_data(void) {
   dispatch_data_t data = dispatch_data_create(buf, 1024,
                                               dispatch_get_main_queue(), ^{});
 #if !HAS_ARC
@@ -140,7 +140,7 @@ void libdispatch_dispatch_released_data() {
 #endif
 }
 
-void libdispatch_objc_released_data() {
+void libdispatch_objc_released_data(void) {
   dispatch_data_t data = dispatch_data_create(buf, 1024,
                                               dispatch_get_main_queue(), ^{});
 #if !HAS_ARC
@@ -148,7 +148,7 @@ void libdispatch_objc_released_data() {
 #endif
 }
 
-void libdispatch_leaked_retained_data() {
+void libdispatch_leaked_retained_data(void) {
   dispatch_data_t data = dispatch_data_create(buf, 1024,
                                               dispatch_get_main_queue(), ^{});
 #if !HAS_ARC

diff  --git a/clang/test/Analysis/retain-release-cf-audited.m b/clang/test/Analysis/retain-release-cf-audited.m
index 414ccd53b3097..643c4a24d413b 100644
--- a/clang/test/Analysis/retain-release-cf-audited.m
+++ b/clang/test/Analysis/retain-release-cf-audited.m
@@ -9,12 +9,12 @@
 extern CFTypeRef CFRetain(CFTypeRef cf);
 extern void CFRelease(CFTypeRef cf);
 
-extern CFTypeRef CFCreateSomethingAudited();
+extern CFTypeRef CFCreateSomethingAudited(void);
 #pragma clang arc_cf_code_audited end
 
-extern CFTypeRef CFCreateSomethingUnaudited();
+extern CFTypeRef CFCreateSomethingUnaudited(void);
 
-void testAudited() {
+void testAudited(void) {
   CFTypeRef obj = CFCreateSomethingAudited(); // no-warning
   CFRelease(obj); // no-warning
 
@@ -23,7 +23,7 @@ void testAudited() {
   CFRelease(obj2); // no-warning
 }
 
-void testUnaudited() {
+void testUnaudited(void) {
   CFTypeRef obj = CFCreateSomethingUnaudited(); // no-warning
   CFRelease(obj); // no-warning
 

diff  --git a/clang/test/Analysis/retain-release-compound-literal.m b/clang/test/Analysis/retain-release-compound-literal.m
index 29a125346363d..9f49ea37825f8 100644
--- a/clang/test/Analysis/retain-release-compound-literal.m
+++ b/clang/test/Analysis/retain-release-compound-literal.m
@@ -9,13 +9,13 @@
 
 typedef const void *CFTypeRef;
 
-extern CFTypeRef CFCreate() CF_RETURNS_RETAINED;
+extern CFTypeRef CFCreate(void) CF_RETURNS_RETAINED;
 extern CFTypeRef CFRetain(CFTypeRef cf);
 extern void CFRelease(CFTypeRef cf);
 
 void bar(CFTypeRef *v) {}
 
-void test1() {
+void test1(void) {
   CFTypeRef *values = (CFTypeRef[]){
       CFCreate(),  // no-warning
       CFCreate(),  // expected-warning{{leak}}

diff  --git a/clang/test/Analysis/retain-release-inline.m b/clang/test/Analysis/retain-release-inline.m
index 2df7f4e8b6421..695a0d06e03cc 100644
--- a/clang/test/Analysis/retain-release-inline.m
+++ b/clang/test/Analysis/retain-release-inline.m
@@ -286,14 +286,14 @@ void bar(id x) {
   [x release];
 }
 
-void test() {
+void test(void) {
   NSString *s = [[NSString alloc] init]; // expected-warning {{Potential leak}}
   foo(s);
   foo(s);
   bar(s);
 }
 
-void test_neg() {
+void test_neg(void) {
   NSString *s = [[NSString alloc] init]; // no-warning  
   foo(s);
   foo(s);
@@ -396,11 +396,11 @@ CFStringRef test_return_ratained_CF(char *bytes) {
 }
 
 // On return (intraprocedural), assume NSObjects are not leaked.
-id test_return_retained_NS() {
+id test_return_retained_NS(void) {
   return [[NSString alloc] init]; // no-warning
 }
 
-void test_test_return_retained() {
+void test_test_return_retained(void) {
   id x = test_return_retained_NS(); // expected-warning {{leak}}
   [x retain];
   [x release];
@@ -437,14 +437,14 @@ void test_test_return_inline_2(char *bytes) {
 extern CFStringRef getString(void);
 CFStringRef testCovariantReturnType(void) __attribute__((cf_returns_retained));
 
-void usetestCovariantReturnType() {
+void usetestCovariantReturnType(void) {
   CFStringRef S = ((void*)0);
   S = testCovariantReturnType();
   if (S)
     CFRelease(S);
 } 
 
-CFStringRef testCovariantReturnType() {
+CFStringRef testCovariantReturnType(void) {
   CFStringRef Str = ((void*)0);
   Str = getString();
   if (Str) {

diff  --git a/clang/test/Analysis/retain-release-path-notes.m b/clang/test/Analysis/retain-release-path-notes.m
index 25d40bc825266..df40761e9be9a 100644
--- a/clang/test/Analysis/retain-release-path-notes.m
+++ b/clang/test/Analysis/retain-release-path-notes.m
@@ -39,16 +39,16 @@ - (id)objectForKeyedSubscript:(id)key;
 id NSMakeCollectable(CFTypeRef);
 CFTypeRef CFMakeCollectable(CFTypeRef);
 
-CFTypeRef CFCreateSomething();
-CFTypeRef CFGetSomething();
+CFTypeRef CFCreateSomething(void);
+CFTypeRef CFGetSomething(void);
 
 
-void creationViaAlloc () {
+void creationViaAlloc (void) {
   id leaked = [[NSObject alloc] init]; // expected-note{{Method returns an instance of NSObject with a +1 retain count}}
   return; // expected-warning{{leak}} expected-note{{Object leaked: object allocated and stored into 'leaked' is not referenced later in this execution path and has a retain count of +1}}
 }
 
-void creationViaCFCreate () {
+void creationViaCFCreate (void) {
   CFTypeRef leaked = CFCreateSomething(); // expected-note{{Call to function 'CFCreateSomething' returns a Core Foundation object of type 'CFTypeRef' with a +1 retain count}}
   return; // expected-warning{{leak}} expected-note{{Object leaked: object allocated and stored into 'leaked' is not referenced later in this execution path and has a retain count of +1}}
 }
@@ -67,25 +67,25 @@ void acquisitionViaProperty (Foo *foo) {
   return; // expected-warning{{leak}} expected-note{{Object leaked: object allocated and stored into 'leaked' is not referenced later in this execution path and has a retain count of +1}}
 }
 
-void acquisitionViaCFFunction () {
+void acquisitionViaCFFunction (void) {
   CFTypeRef leaked = CFGetSomething(); // expected-note{{Call to function 'CFGetSomething' returns a Core Foundation object of type 'CFTypeRef' with a +0 retain count}}
   CFRetain(leaked); // expected-note{{Reference count incremented. The object now has a +1 retain count}}
   return; // expected-warning{{leak}} expected-note{{Object leaked: object allocated and stored into 'leaked' is not referenced later in this execution path and has a retain count of +1}}
 }
 
-void explicitDealloc () {
+void explicitDealloc (void) {
   id object = [[NSObject alloc] init]; // expected-note{{Method returns an instance of NSObject with a +1 retain count}}
   [object dealloc]; // expected-note{{Object released by directly sending the '-dealloc' message}}
   [object class]; // expected-warning{{Reference-counted object is used after it is released}} // expected-note{{Reference-counted object is used after it is released}}
 }
 
-void implicitDealloc () {
+void implicitDealloc (void) {
   id object = [[NSObject alloc] init]; // expected-note{{Method returns an instance of NSObject with a +1 retain count}}
   [object release]; // expected-note{{Object released}}
   [object class]; // expected-warning{{Reference-counted object is used after it is released}} // expected-note{{Reference-counted object is used after it is released}}
 }
 
-void overAutorelease () {
+void overAutorelease (void) {
   id object = [[NSObject alloc] init]; // expected-note{{Method returns an instance of NSObject with a +1 retain count}}
   [object autorelease]; // expected-note{{Object autoreleased}}
   [object autorelease]; // expected-note{{Object autoreleased}} 
@@ -98,19 +98,19 @@ void autoreleaseUnowned (Foo *foo) {
   return; // expected-warning{{Object autoreleased too many times}} expected-note{{Object was autoreleased but has a +0 retain count}}
 }
 
-void makeCollectableIgnored() {
+void makeCollectableIgnored(void) {
   CFTypeRef leaked = CFCreateSomething(); // expected-note{{Call to function 'CFCreateSomething' returns a Core Foundation object of type 'CFTypeRef' with a +1 retain count}}
   CFMakeCollectable(leaked);
   NSMakeCollectable(leaked);
   return; // expected-warning{{leak}} expected-note{{Object leaked: object allocated and stored into 'leaked' is not referenced later in this execution path and has a retain count of +1}}
 }
 
-CFTypeRef CFCopyRuleViolation () {
+CFTypeRef CFCopyRuleViolation (void) {
   CFTypeRef object = CFGetSomething(); // expected-note{{Call to function 'CFGetSomething' returns a Core Foundation object of type 'CFTypeRef' with a +0 retain count}}
   return object; // expected-warning{{Object with a +0 retain count returned to caller where a +1 (owning) retain count is expected}} expected-note{{Object with a +0 retain count returned to caller where a +1 (owning) retain count is expected}}
 }
 
-CFTypeRef CFGetRuleViolation () {
+CFTypeRef CFGetRuleViolation (void) {
   CFTypeRef object = CFCreateSomething(); // expected-note{{Call to function 'CFCreateSomething' returns a Core Foundation object of type 'CFTypeRef' with a +1 retain count}}
   return object; // expected-warning{{leak}} expected-note{{Object leaked: object allocated and stored into 'object' is returned from a function whose name ('CFGetRuleViolation') does not contain 'Copy' or 'Create'.  This violates the naming convention rules given in the Memory Management Guide for Core Foundation}}
 }
@@ -166,7 +166,7 @@ + (id)dictionaryWithObjects:(const id [])objects forKeys:(const id /* <NSCopying
 @end
 
 
-void testNumericLiteral() {
+void testNumericLiteral(void) {
   id result = @1; // expected-note{{NSNumber literal is an object with a +0 retain count}}
   [result release]; // expected-warning{{decrement}} expected-note{{Incorrect decrement of the reference count of an object that is not owned at this point by the caller}}
 }
@@ -243,20 +243,20 @@ +(void)test {
 @end
 
 
-void CFOverAutorelease() {
+void CFOverAutorelease(void) {
   CFTypeRef object = CFCreateSomething(); // expected-note{{Call to function 'CFCreateSomething' returns a Core Foundation object of type 'CFTypeRef' with a +1 retain count}}
   CFAutorelease(object); // expected-note{{Object autoreleased}}
   CFAutorelease(object); // expected-note{{Object autoreleased}}
   return; // expected-warning{{Object autoreleased too many times}} expected-note{{Object was autoreleased 2 times but the object has a +1 retain count}}
 }
 
-void CFAutoreleaseUnowned() {
+void CFAutoreleaseUnowned(void) {
   CFTypeRef object = CFGetSomething(); // expected-note{{Call to function 'CFGetSomething' returns a Core Foundation object of type 'CFTypeRef' with a +0 retain count}}
   CFAutorelease(object); // expected-note{{Object autoreleased}}
   return; // expected-warning{{Object autoreleased too many times}} expected-note{{Object was autoreleased but has a +0 retain count}}
 }
 
-void CFAutoreleaseUnownedMixed() {
+void CFAutoreleaseUnownedMixed(void) {
   CFTypeRef object = CFGetSomething(); // expected-note{{Call to function 'CFGetSomething' returns a Core Foundation object of type 'CFTypeRef' with a +0 retain count}}
   CFAutorelease(object); // expected-note{{Object autoreleased}}
   [(id)object autorelease]; // expected-note{{Object autoreleased}}
@@ -327,7 +327,7 @@ - (void)testOverreleaseIvarOnlyAutorelease {
 
 @end
 
-int seed();
+int seed(void);
 
 @interface LeakReassignmentTests : MyObj
 @end

diff  --git a/clang/test/Analysis/retain-release-region-store.m b/clang/test/Analysis/retain-release-region-store.m
index 65a31cc91ada9..6e63fdb0f06b5 100644
--- a/clang/test/Analysis/retain-release-region-store.m
+++ b/clang/test/Analysis/retain-release-region-store.m
@@ -104,7 +104,7 @@ -(id) initWithObjects:(const id *)objects count:(NSUInteger) cnt;
 // temporarily "escape" retain counted objects stored to structs very eagerly
 // until we can properly tell whether they have escaped via a return value
 // or not.
-CFAbsoluteTime f4() {
+CFAbsoluteTime f4(void) {
   struct foo x;
   
   CFAbsoluteTime t = CFAbsoluteTimeGetCurrent();

diff  --git a/clang/test/Analysis/retain-release-safe.c b/clang/test/Analysis/retain-release-safe.c
index 6cd150093679c..2fbc515818229 100644
--- a/clang/test/Analysis/retain-release-safe.c
+++ b/clang/test/Analysis/retain-release-safe.c
@@ -10,7 +10,7 @@ extern void CFRelease(CFTypeRef cf);
 #define CF_RETURNS_RETAINED __attribute__((cf_returns_retained))
 #define CF_CONSUMED __attribute__((cf_consumed))
 
-extern CFTypeRef CFCreate() CF_RETURNS_RETAINED;
+extern CFTypeRef CFCreate(void) CF_RETURNS_RETAINED;
 
 // A "safe" variant of CFRetain that doesn't crash when a null pointer is
 // retained. This is often defined by users in a similar manner. The
@@ -51,7 +51,7 @@ void releaseCFType(CFTypeRef CF_CONSUMED cf) {
 
 void escape(CFTypeRef cf);
 
-void makeSureTestsWork() {
+void makeSureTestsWork(void) {
   CFTypeRef cf = CFCreate();
   CFRelease(cf);
   CFRelease(cf); // expected-warning{{Reference-counted object is used after it is released}}

diff  --git a/clang/test/Analysis/retain-release.m b/clang/test/Analysis/retain-release.m
index c74908483249d..6dc7947d6776a 100644
--- a/clang/test/Analysis/retain-release.m
+++ b/clang/test/Analysis/retain-release.m
@@ -351,7 +351,7 @@ + (id)array;
 // Test cases.
 //===----------------------------------------------------------------------===//
 
-CFAbsoluteTime f1() {
+CFAbsoluteTime f1(void) {
   CFAbsoluteTime t = CFAbsoluteTimeGetCurrent();
   CFDateRef date = CFDateCreate(0, t);
   CFRetain(date);
@@ -362,7 +362,7 @@ CFAbsoluteTime f1() {
   return t;
 }
 
-CFAbsoluteTime f2() {
+CFAbsoluteTime f2(void) {
   CFAbsoluteTime t = CFAbsoluteTimeGetCurrent();
   CFDateRef date = CFDateCreate(0, t);  
   [((NSDate*) date) retain];
@@ -379,7 +379,7 @@ CFAbsoluteTime f2() {
 // Test to see if we suppress an error when we store the pointer
 // to a global.
 
-CFAbsoluteTime f3() {
+CFAbsoluteTime f3(void) {
   CFAbsoluteTime t = CFAbsoluteTimeGetCurrent();
   CFDateRef date = CFDateCreate(0, t);  
   [((NSDate*) date) retain];
@@ -418,7 +418,7 @@ CFDateRef f6(int x) {
 
 // Test a leak involving an overwrite.
 
-CFDateRef f7() {
+CFDateRef f7(void) {
   CFDateRef date = CFDateCreate(0, CFAbsoluteTimeGetCurrent());  //expected-warning{{leak}}
   CFRetain(date);
   date = CFDateCreate(0, CFAbsoluteTimeGetCurrent()); // expected-warning {{leak}}
@@ -427,15 +427,15 @@ CFDateRef f7() {
 
 // Generalization of Create rule.  MyDateCreate returns a CFXXXTypeRef, and
 // has the word create.
-CFDateRef MyDateCreate();
+CFDateRef MyDateCreate(void);
 
-CFDateRef f8() {
+CFDateRef f8(void) {
   CFDateRef date = MyDateCreate(); // expected-warning{{leak}}
   CFRetain(date);  
   return date;
 }
 
-__attribute__((cf_returns_retained)) CFDateRef f9() {
+__attribute__((cf_returns_retained)) CFDateRef f9(void) {
   CFDateRef date = CFDateCreate(0, CFAbsoluteTimeGetCurrent()); // no-warning
   int *p = 0;
   // When allocations fail, CFDateCreate can return null.
@@ -474,23 +474,23 @@ void f10(io_service_t media, DADiskRef d, CFStringRef s) {
 struct CMFoo;
 typedef struct CMFoo *CMFooRef;
 
-CMFooRef CMCreateFooRef();
-CMFooRef CMGetFooRef();
+CMFooRef CMCreateFooRef(void);
+CMFooRef CMGetFooRef(void);
 
 typedef signed long SInt32;
 typedef SInt32  OSStatus;
 OSStatus CMCreateFooAndReturnViaOutParameter(CMFooRef * CF_RETURNS_RETAINED fooOut);
 
-void testLeakCoreMediaReferenceType() {
+void testLeakCoreMediaReferenceType(void) {
   CMFooRef f = CMCreateFooRef(); // expected-warning{{leak}}
 }
 
-void testOverReleaseMediaReferenceType() {
+void testOverReleaseMediaReferenceType(void) {
   CMFooRef f = CMGetFooRef();
   CFRelease(f); // expected-warning{{Incorrect decrement of the reference count}}
 }
 
-void testOkToReleaseReturnsRetainedOutParameter() {
+void testOkToReleaseReturnsRetainedOutParameter(void) {
   CMFooRef foo = 0;
   OSStatus status = CMCreateFooAndReturnViaOutParameter(&foo);
 
@@ -500,7 +500,7 @@ void testOkToReleaseReturnsRetainedOutParameter() {
   CFRelease(foo); // no-warning
 }
 
-void testLeakWithReturnsRetainedOutParameter() {
+void testLeakWithReturnsRetainedOutParameter(void) {
   CMFooRef foo = 0;
   OSStatus status = CMCreateFooAndReturnViaOutParameter(&foo);
 
@@ -529,7 +529,7 @@ void testCMBufferQueueDequeueAndRetain(CMBufferQueueRef queue) {
 }
 
 // Test retain/release checker with CFString and CFMutableArray.
-void f11() {
+void f11(void) {
   // Create the array.
   CFMutableArrayRef A = CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks);
 
@@ -554,32 +554,32 @@ void f11() {
 }
 
 // PR 3337: Handle functions declared using typedefs.
-typedef CFTypeRef CREATEFUN();
+typedef CFTypeRef CREATEFUN(void);
 CREATEFUN MyCreateFun;
 
-void f12() {
+void f12(void) {
   CFTypeRef o = MyCreateFun(); // expected-warning {{leak}}
 }
 
-void f13_autorelease() {
+void f13_autorelease(void) {
   CFMutableArrayRef A = CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // no-warning
   [(id) A autorelease]; // no-warning
 }
 
-void f13_autorelease_b() {
+void f13_autorelease_b(void) {
   CFMutableArrayRef A = CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks);
   [(id) A autorelease];
   [(id) A autorelease];
 } // expected-warning{{Object autoreleased too many times}}
 
-CFMutableArrayRef f13_autorelease_c() {
+CFMutableArrayRef f13_autorelease_c(void) {
   CFMutableArrayRef A = CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks);
   [(id) A autorelease];
   [(id) A autorelease]; 
   return A; // expected-warning{{Object autoreleased too many times}}
 }
 
-CFMutableArrayRef f13_autorelease_d() {
+CFMutableArrayRef f13_autorelease_d(void) {
   CFMutableArrayRef A = CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks);
   [(id) A autorelease];
   [(id) A autorelease]; 
@@ -590,13 +590,13 @@ CFMutableArrayRef f13_autorelease_d() {
 
 
 // This case exercises the logic where the leak site is the same as the allocation site.
-void f14_leakimmediately() {
+void f14_leakimmediately(void) {
   CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // expected-warning{{leak}}
 }
 
 // Test that we track an allocated object beyond the point where the *name*
 // of the variable storing the reference is no longer live.
-void f15() {
+void f15(void) {
   // Create the array.
   CFMutableArrayRef A = CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks);
   CFMutableArrayRef *B = &A;
@@ -857,7 +857,7 @@ - (void)radar10102244 {
 // <rdar://problem/6257780> clang checker fails to catch use-after-release
 //===----------------------------------------------------------------------===//
 
-int rdar_6257780_Case1() {
+int rdar_6257780_Case1(void) {
   NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
   NSArray *array = [NSArray array];
   [array release]; // expected-warning{{Incorrect decrement of the reference count of an object that is not owned at this point by the caller}}
@@ -869,7 +869,7 @@ int rdar_6257780_Case1() {
 // <rdar://problem/10640253> Analyzer is confused about NSAutoreleasePool -allocWithZone:.
 //===----------------------------------------------------------------------===//
 
-void rdar_10640253_autorelease_allocWithZone() {
+void rdar_10640253_autorelease_allocWithZone(void) {
     NSAutoreleasePool *pool = [[NSAutoreleasePool allocWithZone:(NSZone*)0] init];
     (void) pool;
 }
@@ -878,7 +878,7 @@ void rdar_10640253_autorelease_allocWithZone() {
 // <rdar://problem/6866843> Checker should understand new/setObject:/release constructs
 //===----------------------------------------------------------------------===//
 
-void rdar_6866843() {
+void rdar_6866843(void) {
  NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
  NSMutableDictionary* dictionary = [[NSMutableDictionary alloc] init];
  NSArray* array = [[NSArray alloc] init];
@@ -950,7 +950,7 @@ - (id)initReturningNewClassBad2 {
 @implementation RDar6320065Subclass
 @end
 
-int RDar6320065_test() {
+int RDar6320065_test(void) {
   RDar6320065 *test = [[RDar6320065 alloc] init]; // no-warning
   [test release];
   return 0;
@@ -1082,7 +1082,7 @@ void IOServiceNameMatching_wrapper(const char * name) {
   IOServiceNameMatching(name); // expected-warning{{leak}}
 }
 
-CF_RETURNS_RETAINED CFDictionaryRef CreateDict();
+CF_RETURNS_RETAINED CFDictionaryRef CreateDict(void);
 
 void IOServiceAddNotification_wrapper(mach_port_t mainPort, const io_name_t notificationType,
   mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) {
@@ -1575,25 +1575,25 @@ void test_attr1c(TestOwnershipAttr *X) {
   NSString *str4 = [[X newString_auto] retain]; // expected-warning {{leak}}
 }
 
-void testattr2_a() {
+void testattr2_a(void) {
   TestOwnershipAttr *x = [TestOwnershipAttr alloc]; // expected-warning{{leak}}
 }
 
-void testattr2_b() {
+void testattr2_b(void) {
   TestOwnershipAttr *x = [[TestOwnershipAttr alloc] pseudoInit];  // expected-warning{{leak}}
 }
 
-void testattr2_b_11358224_self_assign_looses_the_leak() {
+void testattr2_b_11358224_self_assign_looses_the_leak(void) {
   TestOwnershipAttr *x = [[TestOwnershipAttr alloc] pseudoInit];// expected-warning{{leak}}
   x = x;
 }
 
-void testattr2_c() {
+void testattr2_c(void) {
   TestOwnershipAttr *x = [[TestOwnershipAttr alloc] pseudoInit]; // no-warning
   [x release];
 }
 
-void testattr3() {
+void testattr3(void) {
   TestOwnershipAttr *x = [TestOwnershipAttr alloc]; // no-warning
   [TestOwnershipAttr consume:x];
   TestOwnershipAttr *y = [TestOwnershipAttr alloc]; // no-warning
@@ -1603,7 +1603,7 @@ void testattr3() {
 void consume_ns(id NS_CONSUMED x);
 void consume_cf(id CF_CONSUMED x);
 
-void testattr4() {
+void testattr4(void) {
   TestOwnershipAttr *x = [TestOwnershipAttr alloc]; // no-warning
   consume_ns(x);
   TestOwnershipAttr *y = [TestOwnershipAttr alloc]; // no-warning
@@ -1631,7 +1631,7 @@ - (NSDate*) returnsNSRetained NS_RETURNS_RETAINED;
 @end
 
 CF_RETURNS_RETAINED
-CFDateRef returnsRetainedCFDate()  {
+CFDateRef returnsRetainedCFDate(void)  {
   return CFDateCreate(0, CFAbsoluteTimeGetCurrent());
 }
 
@@ -1673,15 +1673,15 @@ - (NSDate*) returnsNSRetained {
 // to a noreturn or panic function
 //===----------------------------------------------------------------------===//
 
-void panic() __attribute__((noreturn));
-void panic_not_in_hardcoded_list() __attribute__((noreturn));
+void panic(void) __attribute__((noreturn));
+void panic_not_in_hardcoded_list(void) __attribute__((noreturn));
 
-void test_panic_negative() {
+void test_panic_negative(void) {
   signed z = 1;
   CFNumberRef value = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &z);  // expected-warning{{leak}}
 }
 
-void test_panic_positive() {
+void test_panic_positive(void) {
   signed z = 1;
   CFNumberRef value = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &z); // no-warning
   panic();
@@ -1753,8 +1753,8 @@ - (id)retain {
 // detector.
 
 @protocol Prot_R8272168 @end
-Class <Prot_R8272168> GetAClassThatImplementsProt_R8272168();
-void r8272168() {
+Class <Prot_R8272168> GetAClassThatImplementsProt_R8272168(void);
+void r8272168(void) {
   GetAClassThatImplementsProt_R8272168();
 }
 
@@ -1804,7 +1804,7 @@ static void rdar_8724287(CFErrorRef error)
 // correctly in argument positions besides the first.
 extern void *CFStringCreate(void);
 extern void rdar_9234108_helper(void *key, void * CF_CONSUMED value);
-void rdar_9234108() {
+void rdar_9234108(void) {
   rdar_9234108_helper(0, CFStringCreate());
 }
 
@@ -1827,7 +1827,7 @@ - (id)_prefix_initWithTwoDoubles:(TwoDoubles)twoDoubles
 }
 @end
 
-void rdar9726279() {
+void rdar9726279(void) {
   TwoDoubles twoDoubles = { 0.0, 0.0 };
   NSValue *value = [[NSValue alloc] _prefix_initWithTwoDoubles:twoDoubles];
   [value release];
@@ -1836,52 +1836,52 @@ void rdar9726279() {
 // <rdar://problem/9732321>
 // Test camelcase support for CF conventions.  While Core Foundation APIs
 // don't use camel casing, other code is allowed to use it.
-CFArrayRef camelcase_create_1() {
+CFArrayRef camelcase_create_1(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // no-warning
 }
 
-CFArrayRef camelcase_createno() {
+CFArrayRef camelcase_createno(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // expected-warning {{leak}}
 }
 
-CFArrayRef camelcase_copy() {
+CFArrayRef camelcase_copy(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // no-warning
 }
 
-CFArrayRef camelcase_copying() {
+CFArrayRef camelcase_copying(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // expected-warning {{leak}}
 }
 
-CFArrayRef copyCamelCase() {
+CFArrayRef copyCamelCase(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // no-warning
 }
 
-CFArrayRef __copyCamelCase() {
+CFArrayRef __copyCamelCase(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // no-warning
 }
 
-CFArrayRef __createCamelCase() {
+CFArrayRef __createCamelCase(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // no-warning
 }
 
-CFArrayRef camel_create() {
+CFArrayRef camel_create(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // no-warning
 }
 
 
-CFArrayRef camel_creat() {
+CFArrayRef camel_creat(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // expected-warning {{leak}}
 }
 
-CFArrayRef camel_copy() {
+CFArrayRef camel_copy(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // no-warning
 }
 
-CFArrayRef camel_copyMachine() {
+CFArrayRef camel_copyMachine(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // no-warning
 }
 
-CFArrayRef camel_copymachine() {
+CFArrayRef camel_copymachine(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // expected-warning {{leak}}
 }
 
@@ -1916,7 +1916,7 @@ void rdar6582778_2(void) {
 // <rdar://problem/10232019> - Test that objects passed to containers
 // are marked "escaped".
 
-void rdar10232019() {
+void rdar10232019(void) {
   NSMutableArray *array = [NSMutableArray array];
 
   NSString *string = [[NSString alloc] initWithUTF8String:"foo"];
@@ -1927,7 +1927,7 @@ void rdar10232019() {
   NSLog(@"%@", otherString);
 }
 
-void rdar10232019_positive() {
+void rdar10232019_positive(void) {
   NSMutableArray *array = [NSMutableArray array];
 
   NSString *string = [[NSString alloc] initWithUTF8String:"foo"];
@@ -1943,7 +1943,7 @@ void rdar10232019_positive() {
 xpc_object_t _CFXPCCreateXPCObjectFromCFObject(CFTypeRef cf);
 void xpc_release(xpc_object_t object);
 
-void rdar9658496() {
+void rdar9658496(void) {
   CFStringRef cf;
   xpc_object_t xpc;
   cf = CFStringCreateWithCString( ((CFAllocatorRef)0), "test", kCFStringEncodingUTF8 ); // no-warning
@@ -1964,7 +1964,7 @@ - (id)initWithObj:(id)obj {
 }
 @end
 
-void rdar_10824732() {
+void rdar_10824732(void) {
   @autoreleasepool {
     NSString *obj = @"test";
     RDar10824732 *foo = [[RDar10824732 alloc] initWithObj:obj]; // no-warning
@@ -2040,14 +2040,14 @@ - (id)copyAutoreleaseRadar13081402 {
 //===----------------------------------------------------------------------===//
 void *malloc(size_t);
 struct rdar11104566 { CFStringRef myStr; };
-struct rdar11104566 test_rdar11104566() {
+struct rdar11104566 test_rdar11104566(void) {
   CFStringRef cf = CFStringCreateWithCString( ((CFAllocatorRef)0), "test", kCFStringEncodingUTF8 ); // no-warning
   struct rdar11104566 V;
   V.myStr = cf;
   return V; // no-warning
 }
 
-struct rdar11104566 *test_2_rdar11104566() {
+struct rdar11104566 *test_2_rdar11104566(void) {
   CFStringRef cf = CFStringCreateWithCString( ((CFAllocatorRef)0), "test", kCFStringEncodingUTF8 ); // no-warning
   struct rdar11104566 *V = (struct rdar11104566 *) malloc(sizeof(*V));
   V->myStr = cf;
@@ -2058,7 +2058,7 @@ struct rdar11104566 test_rdar11104566() {
 // ObjC literals support.
 //===----------------------------------------------------------------------===//
 
-void test_objc_arrays() {
+void test_objc_arrays(void) {
     { // CASE ONE -- OBJECT IN ARRAY CREATED DIRECTLY
         NSObject *o = [[NSObject alloc] init];
         NSArray *a = [[NSArray alloc] initWithObjects:o, (void*)0]; // expected-warning {{leak}}
@@ -2103,7 +2103,7 @@ void test_objc_arrays() {
     }
 }
 
-void test_objc_integer_literals() {
+void test_objc_integer_literals(void) {
   id value = [@1 retain]; // expected-warning {{leak}}
   [value description];
 }
@@ -2131,8 +2131,8 @@ void rdar11400885(int y)
   }
 }
 
-id makeCollectableNonLeak() {
-  extern CFTypeRef CFCreateSomething();
+id makeCollectableNonLeak(void) {
+  extern CFTypeRef CFCreateSomething(void);
 
   CFTypeRef object = CFCreateSomething(); // +1
   CFRetain(object); // +2
@@ -2144,7 +2144,7 @@ id makeCollectableNonLeak() {
 void consumeAndStopTracking(id NS_CONSUMED obj, void (^callback)(void));
 void CFConsumeAndStopTracking(CFTypeRef CF_CONSUMED obj, void (^callback)(void));
 
-void testConsumeAndStopTracking() {
+void testConsumeAndStopTracking(void) {
   id retained = [@[] retain]; // +1
   consumeAndStopTracking(retained, ^{}); // no-warning
 
@@ -2157,7 +2157,7 @@ void testConsumeAndStopTracking() {
   consumeAndStopTracking(unretained, ^{}); // expected-warning {{Incorrect decrement of the reference count of an object that is not owned at this point by the caller}}
 }
 
-void testCFConsumeAndStopTracking() {
+void testCFConsumeAndStopTracking(void) {
   id retained = [@[] retain]; // +1
   CFConsumeAndStopTracking((CFTypeRef)retained, ^{}); // no-warning
 
@@ -2175,10 +2175,10 @@ void testCFConsumeAndStopTracking() {
 
 typedef void *MyCFType;
 #pragma clang arc_cf_code_audited begin
-MyCFType CreateMyCFType();
+MyCFType CreateMyCFType(void);
 #pragma clang arc_cf_code_audited end 
     
-void test_custom_cf() {
+void test_custom_cf(void) {
   MyCFType x = CreateMyCFType(); // expected-warning {{leak of an object stored into 'x'}}
 }
 
@@ -2199,7 +2199,7 @@ @interface PR14927 : NSObject
 - (void)drain;
 @end
 
-void test_drain() {
+void test_drain(void) {
   PR14927 *obj = [[PR14927 alloc] init];
   [obj drain];
   [obj release]; // no-warning
@@ -2210,14 +2210,14 @@ void test_drain() {
 // value as tracked, even if the object isn't a known CF type.
 //===----------------------------------------------------------------------===//
 
-MyCFType getCustom() __attribute__((cf_returns_not_retained));
-MyCFType makeCustom() __attribute__((cf_returns_retained));
+MyCFType getCustom(void) __attribute__((cf_returns_not_retained));
+MyCFType makeCustom(void) __attribute__((cf_returns_retained));
 
-void testCustomReturnsRetained() {
+void testCustomReturnsRetained(void) {
   MyCFType obj = makeCustom(); // expected-warning {{leak of an object stored into 'obj'}}
 }
 
-void testCustomReturnsNotRetained() {
+void testCustomReturnsNotRetained(void) {
   CFRelease(getCustom()); // expected-warning {{Incorrect decrement of the reference count of an object that is not owned at this point by the caller}}
 }
 
@@ -2246,23 +2246,23 @@ +(void)test12706177 {
 // CFAutorelease
 //===----------------------------------------------------------------------===//
 
-CFTypeRef getAutoreleasedCFType() {
-  extern CFTypeRef CFCreateSomething();
+CFTypeRef getAutoreleasedCFType(void) {
+  extern CFTypeRef CFCreateSomething(void);
   return CFAutorelease(CFCreateSomething()); // no-warning
 }
 
-CFTypeRef getIncorrectlyAutoreleasedCFType() {
-  extern CFTypeRef CFGetSomething();
+CFTypeRef getIncorrectlyAutoreleasedCFType(void) {
+  extern CFTypeRef CFGetSomething(void);
   return CFAutorelease(CFGetSomething()); // expected-warning{{Object autoreleased too many times}}
 }
 
-CFTypeRef createIncorrectlyAutoreleasedCFType() {
-  extern CFTypeRef CFCreateSomething();
+CFTypeRef createIncorrectlyAutoreleasedCFType(void) {
+  extern CFTypeRef CFCreateSomething(void);
   return CFAutorelease(CFCreateSomething()); // expected-warning{{Object with a +0 retain count returned to caller where a +1 (owning) retain count is expected}}
 }
 
-void useAfterAutorelease() {
-  extern CFTypeRef CFCreateSomething();
+void useAfterAutorelease(void) {
+  extern CFTypeRef CFCreateSomething(void);
   CFTypeRef obj = CFCreateSomething();
   CFAutorelease(obj);
 
@@ -2270,9 +2270,9 @@ void useAfterAutorelease() {
   useCF(obj); // no-warning
 }
 
-void useAfterRelease() {
+void useAfterRelease(void) {
   // Verify that the previous example would have warned with CFRelease.
-  extern CFTypeRef CFCreateSomething();
+  extern CFTypeRef CFCreateSomething(void);
   CFTypeRef obj = CFCreateSomething();
   CFRelease(obj);
 
@@ -2280,15 +2280,15 @@ void useAfterRelease() {
   useCF(obj); // expected-warning{{Reference-counted object is used after it is released}}
 }
 
-void testAutoreleaseReturnsInput() {
-  extern CFTypeRef CFCreateSomething();
+void testAutoreleaseReturnsInput(void) {
+  extern CFTypeRef CFCreateSomething(void);
   CFTypeRef obj = CFCreateSomething(); // expected-warning{{Potential leak of an object stored into 'second'}}
   CFTypeRef second = CFAutorelease(obj);
   CFRetain(second);
 }
 
-CFTypeRef testAutoreleaseReturnsInputSilent() {
-  extern CFTypeRef CFCreateSomething();
+CFTypeRef testAutoreleaseReturnsInputSilent(void) {
+  extern CFTypeRef CFCreateSomething(void);
   CFTypeRef obj = CFCreateSomething();
   CFTypeRef alias = CFAutorelease(obj);
   CFRetain(alias);
@@ -2296,18 +2296,18 @@ CFTypeRef testAutoreleaseReturnsInputSilent() {
   return obj; // no-warning
 }
 
-void autoreleaseTypedObject() {
+void autoreleaseTypedObject(void) {
   CFArrayRef arr = CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks);
   CFAutorelease((CFTypeRef)arr); // no-warning
 }
 
-void autoreleaseReturningTypedObject() {
+void autoreleaseReturningTypedObject(void) {
   CFArrayRef arr = CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // expected-warning{{Potential leak of an object stored into 'alias'}}
   CFArrayRef alias = (CFArrayRef)CFAutorelease((CFTypeRef)arr);
   CFRetain(alias);
 }
 
-CFArrayRef autoreleaseReturningTypedObjectSilent() {
+CFArrayRef autoreleaseReturningTypedObjectSilent(void) {
   CFArrayRef arr = CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks);
   CFArrayRef alias = (CFArrayRef)CFAutorelease((CFTypeRef)arr);
   CFRetain(alias);
@@ -2315,7 +2315,7 @@ CFArrayRef autoreleaseReturningTypedObjectSilent() {
   return alias; // no-warning
 }
 
-void autoreleaseObjC() {
+void autoreleaseObjC(void) {
   id obj = [@1 retain];
   CFAutorelease(obj); // no-warning
 
@@ -2349,7 +2349,7 @@ inline static void cleanupFunction(void *tp) {
     }
 }
 #define ADDCLEANUP __attribute__((cleanup(cleanupFunction)))
-void foo() {
+void foo(void) {
   ADDCLEANUP CFStringRef myString;
   myString = CFStringCreateWithCString(0, "hello world", kCFStringEncodingUTF8);
   ADDCLEANUP CFStringRef myString2 = 
@@ -2361,7 +2361,7 @@ void foo() {
 //===----------------------------------------------------------------------===//
 
 __attribute__((ns_returns_retained))
-id returnNSNull() {
+id returnNSNull(void) {
   return [NSNull null]; // no-warning
 }
 
@@ -2369,21 +2369,21 @@ id returnNSNull() {
 // cf_returns_[not_]retained on parameters
 //===----------------------------------------------------------------------===//
 
-void testCFReturnsNotRetained() {
+void testCFReturnsNotRetained(void) {
   extern void getViaParam(CFTypeRef * CF_RETURNS_NOT_RETAINED outObj);
   CFTypeRef obj;
   getViaParam(&obj);
   CFRelease(obj); // // expected-warning {{Incorrect decrement of the reference count of an object that is not owned at this point by the caller}}
 }
 
-void testCFReturnsNotRetainedAnnotated() {
+void testCFReturnsNotRetainedAnnotated(void) {
   extern void getViaParam2(CFTypeRef * _Nonnull CF_RETURNS_NOT_RETAINED outObj);
   CFTypeRef obj;
   getViaParam2(&obj);
   CFRelease(obj); // // expected-warning {{Incorrect decrement of the reference count of an object that is not owned at this point by the caller}}
 }
 
-void testCFReturnsRetained() {
+void testCFReturnsRetained(void) {
   extern int copyViaParam(CFTypeRef * CF_RETURNS_RETAINED outObj);
   CFTypeRef obj;
   copyViaParam(&obj);
@@ -2391,7 +2391,7 @@ void testCFReturnsRetained() {
   CFRelease(obj); // // FIXME-warning {{Incorrect decrement of the reference count of an object that is not owned at this point by the caller}}
 }
 
-void testCFReturnsRetainedError() {
+void testCFReturnsRetainedError(void) {
   extern int copyViaParam(CFTypeRef * CF_RETURNS_RETAINED outObj);
   CFTypeRef obj;
   if (copyViaParam(&obj) == -42)

diff  --git a/clang/test/Analysis/security-syntax-checks-no-emit.c b/clang/test/Analysis/security-syntax-checks-no-emit.c
index 746b7595ef1fe..1fdc5dc74e4a7 100644
--- a/clang/test/Analysis/security-syntax-checks-no-emit.c
+++ b/clang/test/Analysis/security-syntax-checks-no-emit.c
@@ -19,7 +19,7 @@ long     nrand48(unsigned short[3]);
 long     random(void);
 int      rand_r(unsigned *);
 
-void test_rand()
+void test_rand(void)
 {
   unsigned short a[7];
   unsigned b;

diff  --git a/clang/test/Analysis/security-syntax-checks.m b/clang/test/Analysis/security-syntax-checks.m
index d14a3d2fddee3..5b4f35055f510 100644
--- a/clang/test/Analysis/security-syntax-checks.m
+++ b/clang/test/Analysis/security-syntax-checks.m
@@ -53,7 +53,7 @@
 //
 // For reference: https://www.securecoding.cert.org/confluence/display/seccode/FLP30-C.+Do+not+use+floating+point+variables+as+loop+counters
 //
-void test_float_condition() {
+void test_float_condition(void) {
   for (float x = 0.1f; x <= 1.0f; x += 0.1f) {} // expected-warning{{Variable 'x' with floating point type 'float'}}
   for (float x = 100000001.0f; x <= 100000010.0f; x += 1.0f) {} // expected-warning{{Variable 'x' with floating point type 'float'}}
   for (float x = 100000001.0f; x <= 100000010.0f; x++ ) {} // expected-warning{{Variable 'x' with floating point type 'float'}}
@@ -94,14 +94,14 @@ void test_bzero(void *a, size_t n) {
 // Part of recommendation: 300-BSI (buildsecurityin.us-cert.gov)
 char* gets(char *buf);
 
-void test_gets() {
+void test_gets(void) {
   char buff[1024];
   gets(buff); // expected-warning{{Call to function 'gets' is extremely insecure as it can always result in a buffer overflow}}
 }
 
 int getpw(unsigned int uid, char *buf);
 
-void test_getpw() {
+void test_getpw(void) {
   char buff[1024];
   getpw(2, buff); // expected-warning{{The getpw() function is dangerous as it may overflow the provided buffer. It is obsoleted by getpwuid()}}
 }
@@ -119,7 +119,7 @@ void test_getpw() {
 extern void check(int);
 void abort(void);
 
-void test_setuid() 
+void test_setuid(void) 
 {
   setuid(2); // expected-warning{{The return value from the call to 'setuid' is not checked.  If an error occurs in 'setuid', the following code may execute with unexpected privileges}}
   setuid(0); // expected-warning{{The return value from the call to 'setuid' is not checked.  If an error occurs in 'setuid', the following code may execute with unexpected privileges}}
@@ -151,7 +151,7 @@ void test_setuid()
 long     random(void);
 int      rand_r(unsigned *);
 
-void test_rand()
+void test_rand(void)
 {
   unsigned short a[7];
   unsigned b;
@@ -170,7 +170,7 @@ void test_rand()
 
 char *mktemp(char *buf);
 
-void test_mktemp() {
+void test_mktemp(void) {
   char *x = mktemp("/tmp/zxcv"); // expected-warning{{Call to function 'mktemp' is insecure as it always creates or uses insecure temporary file}}
 }
 
@@ -192,24 +192,24 @@ void test_mktemp() {
 
 #endif /* VARIANT */
 
-void test_strcpy() {
+void test_strcpy(void) {
   char x[4];
   char *y;
 
   strcpy(x, y); //expected-warning{{Call to function 'strcpy' is insecure as it does not provide bounding of the memory buffer. Replace unbounded copy functions with analogous functions that support length arguments such as 'strlcpy'. CWE-119}}
 }
 
-void test_strcpy_2() {
+void test_strcpy_2(void) {
   char x[4];
   strcpy(x, "abcd"); //expected-warning{{Call to function 'strcpy' is insecure as it does not provide bounding of the memory buffer. Replace unbounded copy functions with analogous functions that support length arguments such as 'strlcpy'. CWE-119}}
 }
 
-void test_strcpy_safe() {
+void test_strcpy_safe(void) {
   char x[5];
   strcpy(x, "abcd");
 }
 
-void test_strcpy_safe_2() {
+void test_strcpy_safe_2(void) {
   struct {char s1[100];} s;
   strcpy(s.s1, "hello");
 }
@@ -231,7 +231,7 @@ void test_strcpy_safe_2() {
 
 #endif /* VARIANT */
 
-void test_strcat() {
+void test_strcat(void) {
   char x[4];
   char *y;
 
@@ -245,7 +245,7 @@ void test_strcat() {
 typedef __int32_t pid_t;
 pid_t vfork(void);
 
-void test_vfork() {
+void test_vfork(void) {
   vfork(); //expected-warning{{Call to function 'vfork' is insecure as it can lead to denial of service situations in the parent process}}
 }
 
@@ -258,7 +258,7 @@ void test_vfork() {
 int mkstemp(char *template);
 char *mktemp(char *template);
 
-void test_mkstemp() {
+void test_mkstemp(void) {
   mkstemp("XX"); // expected-warning {{Call to 'mkstemp' should have at least 6 'X's in the format string to be secure (2 'X's seen)}}
   mkstemp("XXXXXX");
   mkstemp("XXXXXXX");
@@ -300,7 +300,7 @@ void test_mkstemp() {
 char *strncat(char *destination, const char *source, size_t num);
 void *memset(void *ptr, int value, size_t num);
 
-void test_deprecated_or_unsafe_buffer_handling_1() {
+void test_deprecated_or_unsafe_buffer_handling_1(void) {
   char buf [5];
   wchar_t wbuf [5];
   int a;

diff  --git a/clang/test/Analysis/simple-stream-checks.c b/clang/test/Analysis/simple-stream-checks.c
index f37a7039f5e3b..767ffaf53fcbf 100644
--- a/clang/test/Analysis/simple-stream-checks.c
+++ b/clang/test/Analysis/simple-stream-checks.c
@@ -36,7 +36,7 @@ void checkLeakFollowedByAssert(int *Data) {
   }
 }
 
-void CloseOnlyOnValidFileHandle() {
+void CloseOnlyOnValidFileHandle(void) {
   FILE *F = fopen("myfile.txt", "w");
   if (F)
     fclose(F);
@@ -58,14 +58,14 @@ FILE *leakOnEnfOfPath3(int *Data) {
 }
 
 void myfclose(FILE *F);
-void SymbolEscapedThroughFunctionCall() {
+void SymbolEscapedThroughFunctionCall(void) {
   FILE *F = fopen("myfile.txt", "w");
   myfclose(F);
   return; // no warning
 }
 
 FILE *GlobalF;
-void SymbolEscapedThroughAssignmentToGlobal() {
+void SymbolEscapedThroughAssignmentToGlobal(void) {
   FILE *F = fopen("myfile.txt", "w");
   GlobalF = F;
   return; // no warning
@@ -78,19 +78,19 @@ void SymbolDoesNotEscapeThoughStringAPIs(char *Data) {
 }
 
 void passConstPointer(const FILE * F);
-void testPassConstPointer() {
+void testPassConstPointer(void) {
   FILE *F = fopen("myfile.txt", "w");
   passConstPointer(F);
   return; // expected-warning {{Opened file is never closed; potential resource leak}}
 }
 
-void testPassToSystemHeaderFunctionIndirectly() {
+void testPassToSystemHeaderFunctionIndirectly(void) {
   FileStruct fs;
   fs.p = fopen("myfile.txt", "w");
   fakeSystemHeaderCall(&fs); // invalidates fs, making fs.p unreachable
 }  // no-warning
 
-void testOverwrite() {
+void testOverwrite(void) {
   FILE *fp = fopen("myfile.txt", "w");
   fp = 0;
 } // expected-warning {{Opened file is never closed; potential resource leak}}

diff  --git a/clang/test/Analysis/solver-sym-simplification-adjustment.c b/clang/test/Analysis/solver-sym-simplification-adjustment.c
index f83e9a4f1fcd1..0df0f146fc44d 100644
--- a/clang/test/Analysis/solver-sym-simplification-adjustment.c
+++ b/clang/test/Analysis/solver-sym-simplification-adjustment.c
@@ -4,8 +4,8 @@
 // RUN:   -analyzer-config eagerly-assume=false \
 // RUN:   -verify
 
-void clang_analyzer_warnIfReached();
-void clang_analyzer_eval();
+void clang_analyzer_warnIfReached(void);
+void clang_analyzer_eval(_Bool);
 
 void test_simplification_adjustment_concrete_int(int b, int c) {
   if (b < 0 || b > 1)  // b: [0,1]

diff  --git a/clang/test/Analysis/solver-sym-simplification-concreteint.c b/clang/test/Analysis/solver-sym-simplification-concreteint.c
index bfd25eb4f59e5..2239b37e35fa8 100644
--- a/clang/test/Analysis/solver-sym-simplification-concreteint.c
+++ b/clang/test/Analysis/solver-sym-simplification-concreteint.c
@@ -4,8 +4,8 @@
 // RUN:   -analyzer-config eagerly-assume=false \
 // RUN:   -verify
 
-void clang_analyzer_warnIfReached();
-void clang_analyzer_eval();
+void clang_analyzer_warnIfReached(void);
+void clang_analyzer_eval(_Bool);
 
 void test_simplification_to_concrete_int_infeasible(int b, int c) {
   if (c + b != 0)     // c + b == 0

diff  --git a/clang/test/Analysis/solver-sym-simplification-no-crash2.c b/clang/test/Analysis/solver-sym-simplification-no-crash2.c
index 7963c1462e324..da07ec0e5e683 100644
--- a/clang/test/Analysis/solver-sym-simplification-no-crash2.c
+++ b/clang/test/Analysis/solver-sym-simplification-no-crash2.c
@@ -10,7 +10,7 @@
 // expected-no-diagnostics
 
 int a, b, c, d;
-void f() {
+void f(void) {
   a = -1;
   d = b * a;
   a = d / c;

diff  --git a/clang/test/Analysis/solver-sym-simplification-with-proper-range-type.c b/clang/test/Analysis/solver-sym-simplification-with-proper-range-type.c
index 248742e96b6b4..c76e0acd3d52c 100644
--- a/clang/test/Analysis/solver-sym-simplification-with-proper-range-type.c
+++ b/clang/test/Analysis/solver-sym-simplification-with-proper-range-type.c
@@ -6,7 +6,7 @@
 // Here we test that the range based solver equivalency tracking mechanism
 // assigns a properly typed range to the simplified symbol.
 
-void clang_analyzer_printState();
+void clang_analyzer_printState(void);
 void clang_analyzer_eval(int);
 
 void f(int a0, int b0, int c)

diff  --git a/clang/test/Analysis/stack-addr-ps.c b/clang/test/Analysis/stack-addr-ps.c
index 721051ffaf11d..efb57eb79aa2d 100644
--- a/clang/test/Analysis/stack-addr-ps.c
+++ b/clang/test/Analysis/stack-addr-ps.c
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-store=region -fblocks -verify %s
 
-int* f1() {
+int* f1(void) {
   int x = 0;
   return &x; // expected-warning{{Address of stack memory associated with local variable 'x' returned}} expected-warning{{address of stack memory associated with local variable 'x' returned}}
 }
@@ -33,7 +33,7 @@ void* compound_literal(int x, int y) {
   return p; // expected-warning{{Address of stack memory}}
 }
 
-void* alloca_test() {
+void* alloca_test(void) {
   void* p = __builtin_alloca(10);
   return p; // expected-warning{{Address of stack memory}}
 }
@@ -75,7 +75,7 @@ ComparatorBlock test_return_block_neg(void) {
 }
 
 // <rdar://problem/7523821>
-int *rdar_7523821_f2() {
+int *rdar_7523821_f2(void) {
   int a[3];
   return a; // expected-warning 2 {{ddress of stack memory associated with local variable 'a' returned}}
 };
@@ -93,7 +93,7 @@ RDar10348049 test_rdar10348049(void) {
 void testRegister(register const char *reg) {
     if (reg) (void)reg[0];
 }
-void callTestRegister() {
+void callTestRegister(void) {
     char buf[20];
     testRegister(buf); // no-warning
 }

diff  --git a/clang/test/Analysis/stackaddrleak.c b/clang/test/Analysis/stackaddrleak.c
index 8a1519e7874f0..0583bfc18711c 100644
--- a/clang/test/Analysis/stackaddrleak.c
+++ b/clang/test/Analysis/stackaddrleak.c
@@ -4,18 +4,18 @@
 typedef __INTPTR_TYPE__ intptr_t;
 char const *p;
 
-void f0() {
+void f0(void) {
   char const str[] = "This will change";
   p = str;
 }  // expected-warning{{Address of stack memory associated with local variable 'str' is still referred to by the global variable 'p' upon returning to the caller.  This will be a dangling reference}}
 
-void f1() {
+void f1(void) {
   char const str[] = "This will change";
   p = str; 
   p = 0; // no-warning
 }
 
-void f2() {
+void f2(void) {
   p = (const char *) __builtin_alloca(12);
 } // expected-warning{{Address of stack memory allocated by call to alloca() on line 19 is still referred to by the global variable 'p' upon returning to the caller.  This will be a dangling reference}}
 
@@ -28,30 +28,30 @@ static int pr7383(__const char *__)
 extern __const char *__const pr7383_list[];
 
 // Test that we catch multiple returns via globals when analyzing a function.
-void test_multi_return() {
+void test_multi_return(void) {
   static int *a, *b;
   int x;
   a = &x;
   b = &x;
 } // expected-warning{{Address of stack memory associated with local variable 'x' is still referred to by the static variable 'a' upon returning}} expected-warning{{Address of stack memory associated with local variable 'x' is still referred to by the static variable 'b' upon returning}}
 
-intptr_t returnAsNonLoc() {
+intptr_t returnAsNonLoc(void) {
   int x;
   return (intptr_t)&x; // expected-warning{{Address of stack memory associated with local variable 'x' returned to caller}} expected-warning{{address of stack memory associated with local variable 'x' returned}}
 }
 
-bool returnAsBool() {
+bool returnAsBool(void) {
   int x;
   return &x; // no-warning
 }
 
-void assignAsNonLoc() {
+void assignAsNonLoc(void) {
   extern intptr_t ip;
   int x;
   ip = (intptr_t)&x;
 } // expected-warning{{Address of stack memory associated with local variable 'x' is still referred to by the global variable 'ip' upon returning}}
 
-void assignAsBool() {
+void assignAsBool(void) {
   extern bool b;
   int x;
   b = &x;

diff  --git a/clang/test/Analysis/static_local.m b/clang/test/Analysis/static_local.m
index daa7ef54c9f8a..4d4f2b27b63cd 100644
--- a/clang/test/Analysis/static_local.m
+++ b/clang/test/Analysis/static_local.m
@@ -2,7 +2,7 @@
 // expected-no-diagnostics
 
 // Test reasoning about static locals in ObjCMethods. 
-int *getValidPtr();
+int *getValidPtr(void);
 @interface Radar11275803
 - (int) useStaticInMethod;
 @end

diff  --git a/clang/test/Analysis/stats.c b/clang/test/Analysis/stats.c
index eca83c0ad96e2..886daa38bd8c1 100644
--- a/clang/test/Analysis/stats.c
+++ b/clang/test/Analysis/stats.c
@@ -1,7 +1,7 @@
 // REQUIRES: asserts
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-stats %s 2>&1 | FileCheck %s
 
-void foo() {
+void foo(void) {
   int x;
 }
 // CHECK: ... Statistics Collected ...

diff  --git a/clang/test/Analysis/std-c-library-functions-POSIX-lookup.c b/clang/test/Analysis/std-c-library-functions-POSIX-lookup.c
index fe495642f21f4..09e481574827a 100644
--- a/clang/test/Analysis/std-c-library-functions-POSIX-lookup.c
+++ b/clang/test/Analysis/std-c-library-functions-POSIX-lookup.c
@@ -15,7 +15,7 @@
 
 // Must have at least one call expression to initialize the summary map.
 int bar(void);
-void foo() {
+void foo(void) {
   bar();
 }
 

diff  --git a/clang/test/Analysis/std-c-library-functions-POSIX.c b/clang/test/Analysis/std-c-library-functions-POSIX.c
index 9285aee6178bc..a837cc9b0b349 100644
--- a/clang/test/Analysis/std-c-library-functions-POSIX.c
+++ b/clang/test/Analysis/std-c-library-functions-POSIX.c
@@ -299,6 +299,6 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex);
 
 // Must have at least one call expression to initialize the summary map.
 int bar(void);
-void foo() {
+void foo(void) {
   bar();
 }

diff  --git a/clang/test/Analysis/std-c-library-functions-arg-constraints-tracking-notes.c b/clang/test/Analysis/std-c-library-functions-arg-constraints-tracking-notes.c
index a6d61a5ad242f..afdff5b2ffac0 100644
--- a/clang/test/Analysis/std-c-library-functions-arg-constraints-tracking-notes.c
+++ b/clang/test/Analysis/std-c-library-functions-arg-constraints-tracking-notes.c
@@ -12,7 +12,7 @@
 typedef typeof(sizeof(int)) size_t;
 
 int __buf_size_arg_constraint(const void *, size_t);
-void test_buf_size_concrete() {
+void test_buf_size_concrete(void) {
   char buf[3];                       // bugpath-note{{'buf' initialized here}}
   int s = 4;                         // bugpath-note{{'s' initialized to 4}}
   __buf_size_arg_constraint(buf, s); // \
@@ -22,7 +22,7 @@ void test_buf_size_concrete() {
 }
 
 int __buf_size_arg_constraint_mul(const void *, size_t, size_t);
-void test_buf_size_concrete_with_multiplication() {
+void test_buf_size_concrete_with_multiplication(void) {
   short buf[3];                               // bugpath-note{{'buf' initialized here}}
   int s1 = 4;                                 // bugpath-note{{'s1' initialized to 4}}
   int s2 = sizeof(short);                     // bugpath-note{{'s2' initialized to}}

diff  --git a/clang/test/Analysis/std-c-library-functions-arg-constraints.c b/clang/test/Analysis/std-c-library-functions-arg-constraints.c
index 42cd18eebe925..7d1d5d85d6333 100644
--- a/clang/test/Analysis/std-c-library-functions-arg-constraints.c
+++ b/clang/test/Analysis/std-c-library-functions-arg-constraints.c
@@ -261,7 +261,7 @@ void test_multiple_constraints_on_same_arg(int x) {
 }
 
 int __variadic(void *stream, const char *format, ...);
-void test_arg_constraint_on_variadic_fun() {
+void test_arg_constraint_on_variadic_fun(void) {
   __variadic(0, "%d%d", 1, 2); // \
   // report-warning{{Function argument constraint is not satisfied}} \
   // report-note{{}} \
@@ -271,7 +271,7 @@ void test_arg_constraint_on_variadic_fun() {
 }
 
 int __buf_size_arg_constraint(const void *, size_t);
-void test_buf_size_concrete() {
+void test_buf_size_concrete(void) {
   char buf[3];                       // bugpath-note{{'buf' initialized here}}
   __buf_size_arg_constraint(buf, 4); // \
   // report-warning{{Function argument constraint is not satisfied}} \
@@ -300,7 +300,7 @@ void test_buf_size_symbolic_and_offset(int s) {
 }
 
 int __buf_size_arg_constraint_mul(const void *, size_t, size_t);
-void test_buf_size_concrete_with_multiplication() {
+void test_buf_size_concrete_with_multiplication(void) {
   short buf[3];                                         // bugpath-note{{'buf' initialized here}}
   __buf_size_arg_constraint_mul(buf, 4, sizeof(short)); // \
   // report-warning{{Function argument constraint is not satisfied}} \
@@ -328,7 +328,7 @@ void test_buf_size_symbolic_and_offset_with_multiplication(size_t s) {
 
 // The minimum buffer size for this function is set to 10.
 int __buf_size_arg_constraint_concrete(const void *);
-void test_min_buf_size() {
+void test_min_buf_size(void) {
   char buf[9];// bugpath-note{{'buf' initialized here}}
   __buf_size_arg_constraint_concrete(buf); // \
   // report-warning{{Function argument constraint is not satisfied}} \

diff  --git a/clang/test/Analysis/std-c-library-functions-arg-weakdeps.c b/clang/test/Analysis/std-c-library-functions-arg-weakdeps.c
index 0ad3c277dfd7d..1dead7327604f 100644
--- a/clang/test/Analysis/std-c-library-functions-arg-weakdeps.c
+++ b/clang/test/Analysis/std-c-library-functions-arg-weakdeps.c
@@ -26,14 +26,14 @@
 // CHECK: Loaded summary for: unsigned long fread(void *restrict, size_t, size_t, FILE *restrict) __attribute__((nonnull(1)))
 // CHECK: Loaded summary for: int fileno(FILE *stream)
 
-void initializeSummaryMap();
+void initializeSummaryMap(void);
 // We analyze this function first, and the call expression inside initializes
 // the summary map. This way we force the loading of the summaries. The
 // summaries would not be loaded without this because during the first bug
 // report in WeakDependency::checkPreCall we stop further evaluation. And
 // StdLibraryFunctionsChecker lazily initializes its summary map from its
 // checkPreCall.
-void analyzeThisFirst() {
+void analyzeThisFirst(void) {
   initializeSummaryMap();
 }
 
@@ -45,7 +45,7 @@ int isalnum(int);
 size_t fread(void *restrict, size_t, size_t, FILE *restrict) __attribute__((nonnull(1)));
 int fileno(FILE *stream);
 
-void test_uninit_arg() {
+void test_uninit_arg(void) {
   int v;
   int r = isalnum(v); // \
   // expected-warning{{1st function call argument is an uninitialized value [core.CallAndMessage]}}
@@ -58,7 +58,7 @@ void test_notnull_arg(FILE *F) {
   expected-warning{{Null pointer passed to 1st parameter expecting 'nonnull' [core.NonNullParamChecker]}}
 }
 
-void test_notnull_stream_arg() {
+void test_notnull_stream_arg(void) {
   fileno(0); // \
   // expected-warning{{Stream pointer might be NULL [alpha.unix.Stream]}}
 }

diff  --git a/clang/test/Analysis/std-c-library-functions-lookup.c b/clang/test/Analysis/std-c-library-functions-lookup.c
index 495562a2a5a47..df40b1af015da 100644
--- a/clang/test/Analysis/std-c-library-functions-lookup.c
+++ b/clang/test/Analysis/std-c-library-functions-lookup.c
@@ -14,6 +14,6 @@ size_t fread(void *restrict, size_t, size_t, FILE *restrict);
 
 // Must have at least one call expression to initialize the summary map.
 int bar(void);
-void foo() {
+void foo(void) {
   bar();
 }

diff  --git a/clang/test/Analysis/std-c-library-functions-restrict.c b/clang/test/Analysis/std-c-library-functions-restrict.c
index 7cf5f2bc630a3..865fa0b06f86f 100644
--- a/clang/test/Analysis/std-c-library-functions-restrict.c
+++ b/clang/test/Analysis/std-c-library-functions-restrict.c
@@ -19,6 +19,6 @@ void __test_restrict_param_2(void *restrict p);
 
 // Must have at least one call expression to initialize the summary map.
 int bar(void);
-void foo() {
+void foo(void) {
   bar();
 }

diff  --git a/clang/test/Analysis/std-c-library-functions.c b/clang/test/Analysis/std-c-library-functions.c
index e1800ed390a86..50b36dc84e68b 100644
--- a/clang/test/Analysis/std-c-library-functions.c
+++ b/clang/test/Analysis/std-c-library-functions.c
@@ -166,7 +166,7 @@ void test_islower(int x) {
 }
 
 int getchar(void);
-void test_getchar() {
+void test_getchar(void) {
   int x = getchar();
   if (x == EOF)
     return;
@@ -175,20 +175,20 @@ void test_getchar() {
 }
 
 int isalpha(int);
-void test_isalpha() {
+void test_isalpha(void) {
   clang_analyzer_eval(isalpha(']')); // expected-warning{{FALSE}}
   clang_analyzer_eval(isalpha('Q')); // expected-warning{{TRUE}}
   clang_analyzer_eval(isalpha(128)); // expected-warning{{UNKNOWN}}
 }
 
 int isalnum(int);
-void test_alnum() {
+void test_alnum(void) {
   clang_analyzer_eval(isalnum('1')); // expected-warning{{TRUE}}
   clang_analyzer_eval(isalnum(')')); // expected-warning{{FALSE}}
 }
 
 int isblank(int);
-void test_isblank() {
+void test_isblank(void) {
   clang_analyzer_eval(isblank('\t')); // expected-warning{{TRUE}}
   clang_analyzer_eval(isblank(' ')); // expected-warning{{TRUE}}
   clang_analyzer_eval(isblank('\n')); // expected-warning{{FALSE}}
@@ -247,7 +247,7 @@ void test_isxdigit(int x) {
   }
 }
 
-void test_call_by_pointer() {
+void test_call_by_pointer(void) {
   typedef int (*func)(int);
   func f = isascii;
   clang_analyzer_eval(f('A')); // expected-warning{{TRUE}}
@@ -256,7 +256,7 @@ void test_call_by_pointer() {
 }
 
 char *getenv(const char *name);
-void test_getenv() {
+void test_getenv(void) {
   // getenv() bifurcates here.
   clang_analyzer_eval(getenv("FOO") == 0);
   // expected-warning at -1 {{TRUE}}

diff  --git a/clang/test/Analysis/stream-error.c b/clang/test/Analysis/stream-error.c
index e91ab2c6c28cc..201627d996732 100644
--- a/clang/test/Analysis/stream-error.c
+++ b/clang/test/Analysis/stream-error.c
@@ -7,11 +7,11 @@
 #include "Inputs/system-header-simulator.h"
 
 void clang_analyzer_eval(int);
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 void StreamTesterChecker_make_feof_stream(FILE *);
 void StreamTesterChecker_make_ferror_stream(FILE *);
 
-void error_fopen() {
+void error_fopen(void) {
   FILE *F = fopen("file", "r");
   if (!F)
     return;
@@ -20,7 +20,7 @@ void error_fopen() {
   fclose(F);
 }
 
-void error_freopen() {
+void error_freopen(void) {
   FILE *F = fopen("file", "r");
   if (!F)
     return;
@@ -32,7 +32,7 @@ void error_freopen() {
   fclose(F);
 }
 
-void stream_error_feof() {
+void stream_error_feof(void) {
   FILE *F = fopen("file", "r");
   if (!F)
     return;
@@ -45,7 +45,7 @@ void stream_error_feof() {
   fclose(F);
 }
 
-void stream_error_ferror() {
+void stream_error_ferror(void) {
   FILE *F = fopen("file", "r");
   if (!F)
     return;
@@ -58,7 +58,7 @@ void stream_error_ferror() {
   fclose(F);
 }
 
-void error_fread() {
+void error_fread(void) {
   FILE *F = tmpfile();
   if (!F)
     return;
@@ -83,7 +83,7 @@ void error_fread() {
   Ret = fread(Buf, 1, 10, F); // expected-warning {{Stream might be already closed}}
 }
 
-void error_fwrite() {
+void error_fwrite(void) {
   FILE *F = tmpfile();
   if (!F)
     return;
@@ -114,7 +114,7 @@ void freadwrite_zerosize_eofstate(FILE *F) {
   fread(0, 0, 1, F); // expected-warning {{Read function called when stream is in EOF state}}
 }
 
-void error_fread_fwrite_zerosize() {
+void error_fread_fwrite_zerosize(void) {
   FILE *F = fopen("file", "r");
   if (!F)
     return;
@@ -136,7 +136,7 @@ void error_fread_fwrite_zerosize() {
   fclose(F);
 }
 
-void error_fseek() {
+void error_fseek(void) {
   FILE *F = fopen("file", "r");
   if (!F)
     return;
@@ -167,7 +167,7 @@ void error_fseek() {
   fclose(F);
 }
 
-void error_indeterminate() {
+void error_indeterminate(void) {
   FILE *F = fopen("file", "r+");
   if (!F)
     return;
@@ -185,7 +185,7 @@ void error_indeterminate() {
   fclose(F);
 }
 
-void error_indeterminate_clearerr() {
+void error_indeterminate_clearerr(void) {
   FILE *F = fopen("file", "r+");
   if (!F)
     return;
@@ -206,7 +206,7 @@ void error_indeterminate_clearerr() {
   fclose(F);
 }
 
-void error_indeterminate_feof1() {
+void error_indeterminate_feof1(void) {
   FILE *F = fopen("file", "r+");
   if (!F)
     return;
@@ -220,7 +220,7 @@ void error_indeterminate_feof1() {
   fclose(F);
 }
 
-void error_indeterminate_feof2() {
+void error_indeterminate_feof2(void) {
   FILE *F = fopen("file", "r+");
   if (!F)
     return;

diff  --git a/clang/test/Analysis/stream-note.c b/clang/test/Analysis/stream-note.c
index 2a2928486e5bc..1ed9bda0a9757 100644
--- a/clang/test/Analysis/stream-note.c
+++ b/clang/test/Analysis/stream-note.c
@@ -2,7 +2,7 @@
 
 #include "Inputs/system-header-simulator.h"
 
-void check_note_at_correct_open() {
+void check_note_at_correct_open(void) {
   FILE *F1 = tmpfile(); // expected-note {{Stream opened here}}
   if (!F1)
     // expected-note at -1 {{'F1' is non-null}}
@@ -22,7 +22,7 @@ void check_note_at_correct_open() {
 // expected-warning at -1 {{Opened stream never closed. Potential resource leak}}
 // expected-note at -2 {{Opened stream never closed. Potential resource leak}}
 
-void check_note_fopen() {
+void check_note_fopen(void) {
   FILE *F = fopen("file", "r"); // expected-note {{Stream opened here}}
   if (!F)
     // expected-note at -1 {{'F' is non-null}}
@@ -32,7 +32,7 @@ void check_note_fopen() {
 // expected-warning at -1 {{Opened stream never closed. Potential resource leak}}
 // expected-note at -2 {{Opened stream never closed. Potential resource leak}}
 
-void check_note_freopen() {
+void check_note_freopen(void) {
   FILE *F = fopen("file", "r"); // expected-note {{Stream opened here}}
   if (!F)
     // expected-note at -1 {{'F' is non-null}}
@@ -78,7 +78,7 @@ void check_note_leak_2(int c) {
   fclose(F2);
 }
 
-void check_track_null() {
+void check_track_null(void) {
   FILE *F;
   F = fopen("foo1.c", "r"); // expected-note {{Value assigned to 'F'}} expected-note {{Assuming pointer value is null}}
   if (F != NULL) {          // expected-note {{Taking false branch}} expected-note {{'F' is equal to NULL}}
@@ -89,7 +89,7 @@ void check_track_null() {
   // expected-note at -1 {{Stream pointer might be NULL}}
 }
 
-void check_eof_notes_feof_after_feof() {
+void check_eof_notes_feof_after_feof(void) {
   FILE *F;
   char Buf[10];
   F = fopen("foo1.c", "r");
@@ -108,7 +108,7 @@ void check_eof_notes_feof_after_feof() {
   fclose(F);
 }
 
-void check_eof_notes_feof_after_no_feof() {
+void check_eof_notes_feof_after_no_feof(void) {
   FILE *F;
   char Buf[10];
   F = fopen("foo1.c", "r");
@@ -131,7 +131,7 @@ void check_eof_notes_feof_after_no_feof() {
   fclose(F);
 }
 
-void check_eof_notes_feof_or_no_error() {
+void check_eof_notes_feof_or_no_error(void) {
   FILE *F;
   char Buf[10];
   F = fopen("foo1.c", "r");

diff  --git a/clang/test/Analysis/stream.c b/clang/test/Analysis/stream.c
index c57f3159fcc7d..a01310cfef5dd 100644
--- a/clang/test/Analysis/stream.c
+++ b/clang/test/Analysis/stream.c
@@ -2,69 +2,69 @@
 
 #include "Inputs/system-header-simulator.h"
 
-void check_fread() {
+void check_fread(void) {
   FILE *fp = tmpfile();
   fread(0, 0, 0, fp); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
 }
 
-void check_fwrite() {
+void check_fwrite(void) {
   FILE *fp = tmpfile();
   fwrite(0, 0, 0, fp); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
 }
 
-void check_fseek() {
+void check_fseek(void) {
   FILE *fp = tmpfile();
   fseek(fp, 0, 0); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
 }
 
-void check_ftell() {
+void check_ftell(void) {
   FILE *fp = tmpfile();
   ftell(fp); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
 }
 
-void check_rewind() {
+void check_rewind(void) {
   FILE *fp = tmpfile();
   rewind(fp); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
 }
 
-void check_fgetpos() {
+void check_fgetpos(void) {
   FILE *fp = tmpfile();
   fpos_t pos;
   fgetpos(fp, &pos); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
 }
 
-void check_fsetpos() {
+void check_fsetpos(void) {
   FILE *fp = tmpfile();
   fpos_t pos;
   fsetpos(fp, &pos); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
 }
 
-void check_clearerr() {
+void check_clearerr(void) {
   FILE *fp = tmpfile();
   clearerr(fp); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
 }
 
-void check_feof() {
+void check_feof(void) {
   FILE *fp = tmpfile();
   feof(fp); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
 }
 
-void check_ferror() {
+void check_ferror(void) {
   FILE *fp = tmpfile();
   ferror(fp); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
 }
 
-void check_fileno() {
+void check_fileno(void) {
   FILE *fp = tmpfile();
   fileno(fp); // expected-warning {{Stream pointer might be NULL}}
   fclose(fp);
@@ -160,12 +160,12 @@ void pr8081(FILE *stream, long offset, int whence) {
   fseek(stream, offset, whence);
 }
 
-void check_freopen_1() {
+void check_freopen_1(void) {
   FILE *f1 = freopen("foo.c", "r", (FILE *)0); // expected-warning {{Stream pointer might be NULL}}
   f1 = freopen(0, "w", (FILE *)0x123456);      // Do not report this as error.
 }
 
-void check_freopen_2() {
+void check_freopen_2(void) {
   FILE *f1 = fopen("foo.c", "r");
   if (f1) {
     FILE *f2 = freopen(0, "w", f1);
@@ -183,7 +183,7 @@ void check_freopen_2() {
   }
 }
 
-void check_freopen_3() {
+void check_freopen_3(void) {
   FILE *f1 = fopen("foo.c", "r");
   if (f1) {
     // Unchecked result of freopen.
@@ -197,7 +197,7 @@ void check_freopen_3() {
 extern FILE *GlobalF;
 extern void takeFile(FILE *);
 
-void check_escape1() {
+void check_escape1(void) {
   FILE *F = tmpfile();
   if (!F)
     return;
@@ -206,7 +206,7 @@ void check_escape1() {
   fwrite("1", 1, 1, F); // no warning
 }
 
-void check_escape2() {
+void check_escape2(void) {
   FILE *F = tmpfile();
   if (!F)
     return;
@@ -215,7 +215,7 @@ void check_escape2() {
   fwrite("1", 1, 1, F); // no warning
 }
 
-void check_escape3() {
+void check_escape3(void) {
   FILE *F = tmpfile();
   if (!F)
     return;
@@ -227,7 +227,7 @@ void check_escape3() {
   fwrite("1", 1, 1, F); // no warning
 }
 
-void check_escape4() {
+void check_escape4(void) {
   FILE *F = tmpfile();
   if (!F)
     return;
@@ -242,9 +242,9 @@ void check_escape4() {
 }
 
 int Test;
-_Noreturn void handle_error();
+_Noreturn void handle_error(void);
 
-void check_leak_noreturn_1() {
+void check_leak_noreturn_1(void) {
   FILE *F1 = tmpfile();
   if (!F1)
     return;
@@ -256,7 +256,7 @@ void check_leak_noreturn_1() {
 
 // Check that "location uniqueing" works.
 // This results in reporting only one occurence of resource leak for a stream.
-void check_leak_noreturn_2() {
+void check_leak_noreturn_2(void) {
   FILE *F1 = tmpfile();
   if (!F1)
     return;

diff  --git a/clang/test/Analysis/string-with-signedness.c b/clang/test/Analysis/string-with-signedness.c
index 1b00971a834cf..c8e4fe55ff21b 100644
--- a/clang/test/Analysis/string-with-signedness.c
+++ b/clang/test/Analysis/string-with-signedness.c
@@ -5,6 +5,6 @@
 void *strcpy(unsigned char *, unsigned char *);
 
 unsigned char a, b;
-void testUnsignedStrcpy() {
+void testUnsignedStrcpy(void) {
   strcpy(&a, &b);
 }

diff  --git a/clang/test/Analysis/string.c b/clang/test/Analysis/string.c
index 2bf34ca757e77..d1fcd92e73270 100644
--- a/clang/test/Analysis/string.c
+++ b/clang/test/Analysis/string.c
@@ -79,11 +79,11 @@ void free(void *);
 #define strlen BUILTIN(strlen)
 size_t strlen(const char *s);
 
-void strlen_constant0() {
+void strlen_constant0(void) {
   clang_analyzer_eval(strlen("123") == 3); // expected-warning{{TRUE}}
 }
 
-void strlen_constant1() {
+void strlen_constant1(void) {
   const char *a = "123";
   clang_analyzer_eval(strlen(a) == 3); // expected-warning{{TRUE}}
 }
@@ -96,20 +96,20 @@ void strlen_constant2(char x) {
   clang_analyzer_eval(strlen(a) == 3); // expected-warning{{UNKNOWN}}
 }
 
-size_t strlen_null() {
+size_t strlen_null(void) {
   return strlen(0); // expected-warning{{Null pointer passed as 1st argument to string length function}}
 }
 
-size_t strlen_fn() {
+size_t strlen_fn(void) {
   return strlen((char*)&strlen_fn); // expected-warning{{Argument to string length function is the address of the function 'strlen_fn', which is not a null-terminated string}}
 }
 
-size_t strlen_nonloc() {
+size_t strlen_nonloc(void) {
 label:
   return strlen((char*)&&label); // expected-warning{{Argument to string length function is the address of the label 'label', which is not a null-terminated string}}
 }
 
-void strlen_subregion() {
+void strlen_subregion(void) {
   struct two_strings { char a[2], b[2]; };
   extern void use_two_strings(struct two_strings *);
 
@@ -144,7 +144,7 @@ void strlen_argument(char *x) {
 }
 
 extern char global_str[];
-void strlen_global() {
+void strlen_global(void) {
   size_t a = strlen(global_str);
   size_t b = strlen(global_str);
   if (a == 0) {
@@ -202,7 +202,7 @@ size_t strlenWrapper(const char *str) {
 
 extern void invalidate(char *s);
 
-void testStrlenCallee() {
+void testStrlenCallee(void) {
   char str[42];
   invalidate(str);
   size_t lenBefore = strlenWrapper(str);
@@ -218,11 +218,11 @@ void testStrlenCallee() {
 
 size_t strnlen(const char *s, size_t maxlen);
 
-void strnlen_constant0() {
+void strnlen_constant0(void) {
   clang_analyzer_eval(strnlen("123", 10) == 3); // expected-warning{{TRUE}}
 }
 
-void strnlen_constant1() {
+void strnlen_constant1(void) {
   const char *a = "123";
   clang_analyzer_eval(strnlen(a, 10) == 3); // expected-warning{{TRUE}}
 }
@@ -234,11 +234,11 @@ void strnlen_constant2(char x) {
   clang_analyzer_eval(strnlen(a, 10) == 3); // expected-warning{{UNKNOWN}}
 }
 
-void strnlen_constant4() {
+void strnlen_constant4(void) {
   clang_analyzer_eval(strnlen("123456", 3) == 3); // expected-warning{{TRUE}}
 }
 
-void strnlen_constant5() {
+void strnlen_constant5(void) {
   const char *a = "123456";
   clang_analyzer_eval(strnlen(a, 3) == 3); // expected-warning{{TRUE}}
 }
@@ -250,25 +250,25 @@ void strnlen_constant6(char x) {
   clang_analyzer_eval(strnlen(a, 3) == 3); // expected-warning{{UNKNOWN}}
 }
 
-size_t strnlen_null() {
+size_t strnlen_null(void) {
   return strnlen(0, 3); // expected-warning{{Null pointer passed as 1st argument to string length function}}
 }
 
-size_t strnlen_fn() {
+size_t strnlen_fn(void) {
   return strnlen((char*)&strlen_fn, 3); // expected-warning{{Argument to string length function is the address of the function 'strlen_fn', which is not a null-terminated string}}
 }
 
-size_t strnlen_nonloc() {
+size_t strnlen_nonloc(void) {
 label:
   return strnlen((char*)&&label, 3); // expected-warning{{Argument to string length function is the address of the label 'label', which is not a null-terminated string}}
 }
 
-void strnlen_zero() {
+void strnlen_zero(void) {
   clang_analyzer_eval(strnlen("abc", 0) == 0); // expected-warning{{TRUE}}
   clang_analyzer_eval(strnlen(NULL, 0) == 0); // expected-warning{{TRUE}}
 }
 
-size_t strnlen_compound_literal() {
+size_t strnlen_compound_literal(void) {
   // This used to crash because we don't model the string lengths of
   // compound literals.
   return strnlen((char[]) { 'a', 'b', 0 }, 1);
@@ -364,7 +364,7 @@ void strcpy_no_overflow(char *y) {
 }
 
 // PR37503
-void *get_void_ptr();
+void *get_void_ptr(void);
 char ***type_punned_ptr;
 void strcpy_no_assertion(char c) {
   *(unsigned char **)type_punned_ptr = (unsigned char *)(get_void_ptr());
@@ -559,7 +559,7 @@ void strncpy_effects(char *x, char *y) {
 #ifndef SUPPRESS_OUT_OF_BOUND
 // Enabling the malloc checker enables some of the buffer-checking portions
 // of the C-string checker.
-void cstringchecker_bounds_nocrash() {
+void cstringchecker_bounds_nocrash(void) {
   char *p = malloc(2);
   strncpy(p, "AAA", sizeof("AAA"));
   // expected-warning at -1 {{String copy function overflows the destination buffer}}
@@ -623,7 +623,7 @@ void strncpy_zero(char *src) {
   strncpy(dst, src, 0); // no-warning
 }
 
-void strncpy_empty() {
+void strncpy_empty(void) {
   char dst[] = "123";
   char src[] = "";
   strncpy(dst, src, 4); // no-warning
@@ -776,7 +776,7 @@ void strncat_zero(char *src) {
   strncat(dst, src, 0); // no-warning
 }
 
-void strncat_empty() {
+void strncat_empty(void) {
   char dst[8] = "123";
   char src[] = "";
   strncat(dst, src, 4); // no-warning
@@ -789,7 +789,7 @@ void strncat_empty() {
 #define strcmp BUILTIN(strcmp)
 int strcmp(const char * s1, const char * s2);
 
-void strcmp_check_modelling() {
+void strcmp_check_modelling(void) {
   char *x = "aa";
   char *y = "a";
   clang_analyzer_eval(strcmp(x, y) > 0); // expected-warning{{TRUE}}
@@ -801,75 +801,75 @@ void strcmp_check_modelling() {
   clang_analyzer_eval(strcmp(y, x) < -1); // expected-warning{{UNKNOWN}}
 }
 
-void strcmp_constant0() {
+void strcmp_constant0(void) {
   clang_analyzer_eval(strcmp("123", "123") == 0); // expected-warning{{TRUE}}
 }
 
-void strcmp_constant_and_var_0() {
+void strcmp_constant_and_var_0(void) {
   char *x = "123";
   clang_analyzer_eval(strcmp(x, "123") == 0); // expected-warning{{TRUE}}
 }
 
-void strcmp_constant_and_var_1() {
+void strcmp_constant_and_var_1(void) {
   char *x = "123";
   clang_analyzer_eval(strcmp("123", x) == 0); // expected-warning{{TRUE}}
 }
 
-void strcmp_0() {
+void strcmp_0(void) {
   char *x = "123";
   char *y = "123";
   clang_analyzer_eval(strcmp(x, y) == 0); // expected-warning{{TRUE}}
 }
 
-void strcmp_1() {
+void strcmp_1(void) {
   char *x = "234";
   char *y = "123";
   clang_analyzer_eval(strcmp(x, y) > 0); // expected-warning{{TRUE}}
 }
 
-void strcmp_2() {
+void strcmp_2(void) {
   char *x = "123";
   char *y = "234";
   clang_analyzer_eval(strcmp(x, y) < 0); // expected-warning{{TRUE}}
 }
 
-void strcmp_null_0() {
+void strcmp_null_0(void) {
   char *x = NULL;
   char *y = "123";
   strcmp(x, y); // expected-warning{{Null pointer passed as 1st argument to string comparison function}}
 }
 
-void strcmp_null_1() {
+void strcmp_null_1(void) {
   char *x = "123";
   char *y = NULL;
   strcmp(x, y); // expected-warning{{Null pointer passed as 2nd argument to string comparison function}}
 }
 
-void strcmp_
diff _length_0() {
+void strcmp_
diff _length_0(void) {
   char *x = "12345";
   char *y = "234";
   clang_analyzer_eval(strcmp(x, y) < 0); // expected-warning{{TRUE}}
 }
 
-void strcmp_
diff _length_1() {
+void strcmp_
diff _length_1(void) {
   char *x = "123";
   char *y = "23456";
   clang_analyzer_eval(strcmp(x, y) < 0); // expected-warning{{TRUE}}
 }
 
-void strcmp_
diff _length_2() {
+void strcmp_
diff _length_2(void) {
   char *x = "12345";
   char *y = "123";
   clang_analyzer_eval(strcmp(x, y) > 0); // expected-warning{{TRUE}}
 }
 
-void strcmp_
diff _length_3() {
+void strcmp_
diff _length_3(void) {
   char *x = "123";
   char *y = "12345";
   clang_analyzer_eval(strcmp(x, y) < 0); // expected-warning{{TRUE}}
 }
 
-void strcmp_embedded_null () {
+void strcmp_embedded_null (void) {
 	clang_analyzer_eval(strcmp("\0z", "\0y") == 0); // expected-warning{{TRUE}}
 }
 
@@ -904,7 +904,7 @@ int strcmp_null_argument(char *a) {
 #define strncmp BUILTIN(strncmp)
 int strncmp(const char *s1, const char *s2, size_t n);
 
-void strncmp_check_modelling() {
+void strncmp_check_modelling(void) {
   char *x = "aa";
   char *y = "a";
   clang_analyzer_eval(strncmp(x, y, 2) > 0); // expected-warning{{TRUE}}
@@ -916,93 +916,93 @@ void strncmp_check_modelling() {
   clang_analyzer_eval(strncmp(y, x, 2) < -1); // expected-warning{{UNKNOWN}}
 }
 
-void strncmp_constant0() {
+void strncmp_constant0(void) {
   clang_analyzer_eval(strncmp("123", "123", 3) == 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_constant_and_var_0() {
+void strncmp_constant_and_var_0(void) {
   char *x = "123";
   clang_analyzer_eval(strncmp(x, "123", 3) == 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_constant_and_var_1() {
+void strncmp_constant_and_var_1(void) {
   char *x = "123";
   clang_analyzer_eval(strncmp("123", x, 3) == 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_0() {
+void strncmp_0(void) {
   char *x = "123";
   char *y = "123";
   clang_analyzer_eval(strncmp(x, y, 3) == 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_1() {
+void strncmp_1(void) {
   char *x = "234";
   char *y = "123";
   clang_analyzer_eval(strncmp(x, y, 3) > 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_2() {
+void strncmp_2(void) {
   char *x = "123";
   char *y = "234";
   clang_analyzer_eval(strncmp(x, y, 3) < 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_null_0() {
+void strncmp_null_0(void) {
   char *x = NULL;
   char *y = "123";
   strncmp(x, y, 3); // expected-warning{{Null pointer passed as 1st argument to string comparison function}}
 }
 
-void strncmp_null_1() {
+void strncmp_null_1(void) {
   char *x = "123";
   char *y = NULL;
   strncmp(x, y, 3); // expected-warning{{Null pointer passed as 2nd argument to string comparison function}}
 }
 
-void strncmp_
diff _length_0() {
+void strncmp_
diff _length_0(void) {
   char *x = "12345";
   char *y = "234";
   clang_analyzer_eval(strncmp(x, y, 5) < 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_
diff _length_1() {
+void strncmp_
diff _length_1(void) {
   char *x = "123";
   char *y = "23456";
   clang_analyzer_eval(strncmp(x, y, 5) < 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_
diff _length_2() {
+void strncmp_
diff _length_2(void) {
   char *x = "12345";
   char *y = "123";
   clang_analyzer_eval(strncmp(x, y, 5) > 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_
diff _length_3() {
+void strncmp_
diff _length_3(void) {
   char *x = "123";
   char *y = "12345";
   clang_analyzer_eval(strncmp(x, y, 5) < 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_
diff _length_4() {
+void strncmp_
diff _length_4(void) {
   char *x = "123";
   char *y = "12345";
   clang_analyzer_eval(strncmp(x, y, 3) == 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_
diff _length_5() {
+void strncmp_
diff _length_5(void) {
   char *x = "012";
   char *y = "12345";
   clang_analyzer_eval(strncmp(x, y, 3) < 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_
diff _length_6() {
+void strncmp_
diff _length_6(void) {
   char *x = "234";
   char *y = "12345";
   clang_analyzer_eval(strncmp(x, y, 3) > 0); // expected-warning{{TRUE}}
 }
 
-void strncmp_embedded_null () {
+void strncmp_embedded_null (void) {
 	clang_analyzer_eval(strncmp("ab\0zz", "ab\0yy", 4) == 0); // expected-warning{{TRUE}}
 }
 
@@ -1019,7 +1019,7 @@ int strncmp_null_argument(char *a, size_t n) {
 #define strcasecmp BUILTIN(strcasecmp)
 int strcasecmp(const char *s1, const char *s2);
 
-void strcasecmp_check_modelling() {
+void strcasecmp_check_modelling(void) {
   char *x = "aa";
   char *y = "a";
   clang_analyzer_eval(strcasecmp(x, y) > 0); // expected-warning{{TRUE}}
@@ -1031,75 +1031,75 @@ void strcasecmp_check_modelling() {
   clang_analyzer_eval(strcasecmp(y, x) < -1); // expected-warning{{UNKNOWN}}
 }
 
-void strcasecmp_constant0() {
+void strcasecmp_constant0(void) {
   clang_analyzer_eval(strcasecmp("abc", "Abc") == 0); // expected-warning{{TRUE}}
 }
 
-void strcasecmp_constant_and_var_0() {
+void strcasecmp_constant_and_var_0(void) {
   char *x = "abc";
   clang_analyzer_eval(strcasecmp(x, "Abc") == 0); // expected-warning{{TRUE}}
 }
 
-void strcasecmp_constant_and_var_1() {
+void strcasecmp_constant_and_var_1(void) {
   char *x = "abc";
   clang_analyzer_eval(strcasecmp("Abc", x) == 0); // expected-warning{{TRUE}}
 }
 
-void strcasecmp_0() {
+void strcasecmp_0(void) {
   char *x = "abc";
   char *y = "Abc";
   clang_analyzer_eval(strcasecmp(x, y) == 0); // expected-warning{{TRUE}}
 }
 
-void strcasecmp_1() {
+void strcasecmp_1(void) {
   char *x = "Bcd";
   char *y = "abc";
   clang_analyzer_eval(strcasecmp(x, y) > 0); // expected-warning{{TRUE}}
 }
 
-void strcasecmp_2() {
+void strcasecmp_2(void) {
   char *x = "abc";
   char *y = "Bcd";
   clang_analyzer_eval(strcasecmp(x, y) < 0); // expected-warning{{TRUE}}
 }
 
-void strcasecmp_null_0() {
+void strcasecmp_null_0(void) {
   char *x = NULL;
   char *y = "123";
   strcasecmp(x, y); // expected-warning{{Null pointer passed as 1st argument to string comparison function}}
 }
 
-void strcasecmp_null_1() {
+void strcasecmp_null_1(void) {
   char *x = "123";
   char *y = NULL;
   strcasecmp(x, y); // expected-warning{{Null pointer passed as 2nd argument to string comparison function}}
 }
 
-void strcasecmp_
diff _length_0() {
+void strcasecmp_
diff _length_0(void) {
   char *x = "abcde";
   char *y = "aBd";
   clang_analyzer_eval(strcasecmp(x, y) < 0); // expected-warning{{TRUE}}
 }
 
-void strcasecmp_
diff _length_1() {
+void strcasecmp_
diff _length_1(void) {
   char *x = "abc";
   char *y = "aBdef";
   clang_analyzer_eval(strcasecmp(x, y) < 0); // expected-warning{{TRUE}}
 }
 
-void strcasecmp_
diff _length_2() {
+void strcasecmp_
diff _length_2(void) {
   char *x = "aBcDe";
   char *y = "abc";
   clang_analyzer_eval(strcasecmp(x, y) > 0); // expected-warning{{TRUE}}
 }
 
-void strcasecmp_
diff _length_3() {
+void strcasecmp_
diff _length_3(void) {
   char *x = "aBc";
   char *y = "abcde";
   clang_analyzer_eval(strcasecmp(x, y) < 0); // expected-warning{{TRUE}}
 }
 
-void strcasecmp_embedded_null () {
+void strcasecmp_embedded_null (void) {
 	clang_analyzer_eval(strcasecmp("ab\0zz", "ab\0yy") == 0); // expected-warning{{TRUE}}
 }
 
@@ -1116,7 +1116,7 @@ int strcasecmp_null_argument(char *a) {
 #define strncasecmp BUILTIN(strncasecmp)
 int strncasecmp(const char *s1, const char *s2, size_t n);
 
-void strncasecmp_check_modelling() {
+void strncasecmp_check_modelling(void) {
   char *x = "aa";
   char *y = "a";
   clang_analyzer_eval(strncasecmp(x, y, 2) > 0); // expected-warning{{TRUE}}
@@ -1128,93 +1128,93 @@ void strncasecmp_check_modelling() {
   clang_analyzer_eval(strncasecmp(y, x, 2) < -1); // expected-warning{{UNKNOWN}}
 }
 
-void strncasecmp_constant0() {
+void strncasecmp_constant0(void) {
   clang_analyzer_eval(strncasecmp("abc", "Abc", 3) == 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_constant_and_var_0() {
+void strncasecmp_constant_and_var_0(void) {
   char *x = "abc";
   clang_analyzer_eval(strncasecmp(x, "Abc", 3) == 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_constant_and_var_1() {
+void strncasecmp_constant_and_var_1(void) {
   char *x = "abc";
   clang_analyzer_eval(strncasecmp("Abc", x, 3) == 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_0() {
+void strncasecmp_0(void) {
   char *x = "abc";
   char *y = "Abc";
   clang_analyzer_eval(strncasecmp(x, y, 3) == 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_1() {
+void strncasecmp_1(void) {
   char *x = "Bcd";
   char *y = "abc";
   clang_analyzer_eval(strncasecmp(x, y, 3) > 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_2() {
+void strncasecmp_2(void) {
   char *x = "abc";
   char *y = "Bcd";
   clang_analyzer_eval(strncasecmp(x, y, 3) < 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_null_0() {
+void strncasecmp_null_0(void) {
   char *x = NULL;
   char *y = "123";
   strncasecmp(x, y, 3); // expected-warning{{Null pointer passed as 1st argument to string comparison function}}
 }
 
-void strncasecmp_null_1() {
+void strncasecmp_null_1(void) {
   char *x = "123";
   char *y = NULL;
   strncasecmp(x, y, 3); // expected-warning{{Null pointer passed as 2nd argument to string comparison function}}
 }
 
-void strncasecmp_
diff _length_0() {
+void strncasecmp_
diff _length_0(void) {
   char *x = "abcde";
   char *y = "aBd";
   clang_analyzer_eval(strncasecmp(x, y, 5) < 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_
diff _length_1() {
+void strncasecmp_
diff _length_1(void) {
   char *x = "abc";
   char *y = "aBdef";
   clang_analyzer_eval(strncasecmp(x, y, 5) < 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_
diff _length_2() {
+void strncasecmp_
diff _length_2(void) {
   char *x = "aBcDe";
   char *y = "abc";
   clang_analyzer_eval(strncasecmp(x, y, 5) > 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_
diff _length_3() {
+void strncasecmp_
diff _length_3(void) {
   char *x = "aBc";
   char *y = "abcde";
   clang_analyzer_eval(strncasecmp(x, y, 5) < 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_
diff _length_4() {
+void strncasecmp_
diff _length_4(void) {
   char *x = "abcde";
   char *y = "aBc";
   clang_analyzer_eval(strncasecmp(x, y, 3) == 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_
diff _length_5() {
+void strncasecmp_
diff _length_5(void) {
   char *x = "abcde";
   char *y = "aBd";
   clang_analyzer_eval(strncasecmp(x, y, 3) < 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_
diff _length_6() {
+void strncasecmp_
diff _length_6(void) {
   char *x = "aBDe";
   char *y = "abc";
   clang_analyzer_eval(strncasecmp(x, y, 3) > 0); // expected-warning{{TRUE}}
 }
 
-void strncasecmp_embedded_null () {
+void strncasecmp_embedded_null (void) {
 	clang_analyzer_eval(strncasecmp("ab\0zz", "ab\0yy", 4) == 0); // expected-warning{{TRUE}}
 }
 
@@ -1234,7 +1234,7 @@ void strsep_null_delim(char *s) {
   strsep(&s, NULL); // expected-warning{{Null pointer passed as 2nd argument to strsep()}}
 }
 
-void strsep_null_search() {
+void strsep_null_search(void) {
   strsep(NULL, ""); // expected-warning{{Null pointer passed as 1st argument to strsep()}}
 }
 
@@ -1244,7 +1244,7 @@ void strsep_return_original_pointer(char *s) {
   clang_analyzer_eval(original == result); // expected-warning{{TRUE}}
 }
 
-void strsep_null_string() {
+void strsep_null_string(void) {
   char *s = NULL;
   char *result = strsep(&s, ""); // no-warning
   clang_analyzer_eval(result == NULL); // expected-warning{{TRUE}}
@@ -1262,7 +1262,7 @@ void strsep_changes_input_pointer(char *s) {
   }
 }
 
-void strsep_changes_input_string() {
+void strsep_changes_input_string(void) {
   char str[] = "abc";
 
   clang_analyzer_eval(str[1] == 'b'); // expected-warning{{TRUE}}
@@ -1287,14 +1287,14 @@ void explicit_bzero(void *dest, size_t count);
 void *malloc(size_t size);
 void free(void *);
 
-void memset1_char_array_null() {
+void memset1_char_array_null(void) {
   char str[] = "abcd";
   clang_analyzer_eval(strlen(str) == 4); // expected-warning{{TRUE}}
   memset(str, '\0', 2);
   clang_analyzer_eval(strlen(str) == 0); // expected-warning{{TRUE}}
 }
 
-void memset2_char_array_null() {
+void memset2_char_array_null(void) {
   char str[] = "abcd";
   clang_analyzer_eval(strlen(str) == 4); // expected-warning{{TRUE}}
   memset(str, '\0', strlen(str) + 1);
@@ -1302,14 +1302,14 @@ void memset2_char_array_null() {
   clang_analyzer_eval(str[2] == 0);      // expected-warning{{TRUE}}
 }
 
-void memset3_char_malloc_null() {
+void memset3_char_malloc_null(void) {
   char *str = (char *)malloc(10 * sizeof(char));
   memset(str + 1, '\0', 8);
   clang_analyzer_eval(str[1] == 0); // expected-warning{{UNKNOWN}}
   free(str);
 }
 
-void memset4_char_malloc_null() {
+void memset4_char_malloc_null(void) {
   char *str = (char *)malloc(10 * sizeof(char));
   //void *str = malloc(10 * sizeof(char));
   memset(str, '\0', 10);
@@ -1319,7 +1319,7 @@ void memset4_char_malloc_null() {
 }
 
 #ifdef SUPPRESS_OUT_OF_BOUND
-void memset5_char_malloc_overflow_null() {
+void memset5_char_malloc_overflow_null(void) {
   char *str = (char *)malloc(10 * sizeof(char));
   memset(str, '\0', 12);
   clang_analyzer_eval(str[1] == 0); // expected-warning{{UNKNOWN}}
@@ -1327,7 +1327,7 @@ void memset5_char_malloc_overflow_null() {
 }
 #endif
 
-void memset6_char_array_nonnull() {
+void memset6_char_array_nonnull(void) {
   char str[] = "abcd";
   clang_analyzer_eval(strlen(str) == 4); // expected-warning{{TRUE}}
   memset(str, '0', 2);
@@ -1336,7 +1336,7 @@ void memset6_char_array_nonnull() {
 }
 
 #ifdef SUPPRESS_OUT_OF_BOUND
-void memset8_char_array_nonnull() {
+void memset8_char_array_nonnull(void) {
   char str[5] = "abcd";
   clang_analyzer_eval(strlen(str) == 4); // expected-warning{{TRUE}}
   memset(str, '0', 10); // expected-warning{{'memset' will always overflow; destination buffer has size 5, but size argument is 10}}
@@ -1351,7 +1351,7 @@ struct POD_memset {
   char c;
 };
 
-void memset10_struct() {
+void memset10_struct(void) {
   struct POD_memset pod;
   char *str = (char *)&pod;
   pod.num = 1;
@@ -1362,7 +1362,7 @@ void memset10_struct() {
 }
 
 #ifdef SUPPRESS_OUT_OF_BOUND
-void memset11_struct_field() {
+void memset11_struct_field(void) {
   struct POD_memset pod;
   pod.num = 1;
   pod.c = '1';
@@ -1372,7 +1372,7 @@ void memset11_struct_field() {
   clang_analyzer_eval(pod.c == '\0'); // expected-warning{{TRUE}}
 }
 
-void memset12_struct_field() {
+void memset12_struct_field(void) {
   struct POD_memset pod;
   pod.num = 1;
   pod.c = '1';
@@ -1387,7 +1387,7 @@ union U_memset {
   char c;
 };
 
-void memset13_union_field() {
+void memset13_union_field(void) {
   union U_memset u;
   u.i = 5;
   memset(&u.i, '\0', sizeof(union U_memset));
@@ -1396,7 +1396,7 @@ void memset13_union_field() {
 }
 #endif
 
-void memset14_region_cast() {
+void memset14_region_cast(void) {
   char *str = (char *)malloc(10 * sizeof(int));
   int *array = (int *)str;
   memset(array, 0, 10 * sizeof(int));
@@ -1406,7 +1406,7 @@ void memset14_region_cast() {
   free(str);
 }
 
-void memset15_region_cast() {
+void memset15_region_cast(void) {
   char *str = (char *)malloc(10 * sizeof(int));
   int *array = (int *)str;
   memset(array, 0, 5 * sizeof(int));
@@ -1416,7 +1416,7 @@ void memset15_region_cast() {
   free(str);
 }
 
-int memset20_scalar() {
+int memset20_scalar(void) {
   int *x = malloc(sizeof(int));
   *x = 10;
   memset(x, 0, sizeof(int));
@@ -1425,7 +1425,7 @@ int memset20_scalar() {
   return num;
 }
 
-int memset21_scalar() {
+int memset21_scalar(void) {
   int *x = malloc(sizeof(int));
   memset(x, 0, 1);
   int num = 1 / *x;
@@ -1433,14 +1433,14 @@ int memset21_scalar() {
   return num;
 }
 
-void memset22_array() {
+void memset22_array(void) {
   int array[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
   clang_analyzer_eval(array[1] == 2); // expected-warning{{TRUE}}
   memset(array, 0, sizeof(array));
   clang_analyzer_eval(array[1] == 0); // expected-warning{{TRUE}}
 }
 
-void memset23_array_pod_object() {
+void memset23_array_pod_object(void) {
   struct POD_memset array[10];
   array[1].num = 10;
   array[1].c = 'c';
@@ -1449,7 +1449,7 @@ void memset23_array_pod_object() {
   clang_analyzer_eval(array[1].num == 0); // expected-warning{{UNKNOWN}}
 }
 
-void memset24_array_pod_object() {
+void memset24_array_pod_object(void) {
   struct POD_memset array[10];
   array[1].num = 10;
   array[1].c = 'c';
@@ -1469,7 +1469,7 @@ void memset25_symbol(char c) {
   clang_analyzer_eval(array[4] == 0); // expected-warning{{TRUE}}
 }
 
-void memset26_upper_UCHAR_MAX() {
+void memset26_upper_UCHAR_MAX(void) {
   char array[10] = {1};
 
   memset(array, 1024, 10);
@@ -1478,33 +1478,33 @@ void memset26_upper_UCHAR_MAX() {
   clang_analyzer_eval(array[4] == 0); // expected-warning{{TRUE}}
 }
 
-void bzero1_null() {
+void bzero1_null(void) {
   char *a = NULL;
 
   bzero(a, 10); // expected-warning{{Null pointer passed as 1st argument to memory clearance function}}
 }
 
-void bzero2_char_array_null() {
+void bzero2_char_array_null(void) {
   char str[] = "abcd";
   clang_analyzer_eval(strlen(str) == 4); // expected-warning{{TRUE}}
   bzero(str, 2);
   clang_analyzer_eval(strlen(str) == 0); // expected-warning{{TRUE}}
 }
 
-void bzero3_char_ptr_null() {
+void bzero3_char_ptr_null(void) {
   char *str = "abcd";
   clang_analyzer_eval(strlen(str) == 4); // expected-warning{{TRUE}}
   bzero(str + 2, 2);
   clang_analyzer_eval(strlen(str) == 0); // expected-warning{{FALSE}}
 }
 
-void explicit_bzero1_null() {
+void explicit_bzero1_null(void) {
   char *a = NULL;
 
   explicit_bzero(a, 10); // expected-warning{{Null pointer passed as 1st argument to memory clearance function}}
 }
 
-void explicit_bzero2_clear_mypassword() {
+void explicit_bzero2_clear_mypassword(void) {
   char passwd[7] = "passwd";
 
   explicit_bzero(passwd, sizeof(passwd)); // no-warning
@@ -1513,7 +1513,7 @@ void explicit_bzero2_clear_mypassword() {
   clang_analyzer_eval(passwd[0] == '\0'); // expected-warning{{TRUE}}
 }
 
-void explicit_bzero3_out_ofbound() {
+void explicit_bzero3_out_ofbound(void) {
   char *privkey = (char *)malloc(7);
   const char newprivkey[10] = "mysafekey";
 
@@ -1557,7 +1557,7 @@ void strncpy_exactly_matching_buffer2(char *y) {
   clang_analyzer_eval(strlen(x) <= 3); // expected-warning{{UNKNOWN}}
 }
 
-void memset7_char_array_nonnull() {
+void memset7_char_array_nonnull(void) {
   char str[5] = "abcd";
   clang_analyzer_eval(strlen(str) == 4); // expected-warning{{TRUE}}
   memset(str, '0', 5);
@@ -1566,7 +1566,7 @@ void memset7_char_array_nonnull() {
   clang_analyzer_eval(strlen(str) >= 5); // expected-warning{{TRUE}}
 }
 
-void memset16_region_cast() {
+void memset16_region_cast(void) {
   char *str = (char *)malloc(10 * sizeof(int));
   int *array = (int *)str;
   memset(array, '0', 10 * sizeof(int));
@@ -1578,7 +1578,7 @@ void memset16_region_cast() {
 }
 
 #ifdef SUPPRESS_OUT_OF_BOUND
-void memset17_region_cast() {
+void memset17_region_cast(void) {
   char *str = (char *)malloc(10 * sizeof(int));
   int *array = (int *)str;
   memset(array, '0', 12 * sizeof(int));
@@ -1588,7 +1588,7 @@ void memset17_region_cast() {
   free(str);
 }
 
-void memset18_memset_multiple_times() {
+void memset18_memset_multiple_times(void) {
   char *str = (char *)malloc(10 * sizeof(char));
   clang_analyzer_eval(strlen(str) == 0); // expected-warning{{UNKNOWN}}
 
@@ -1604,7 +1604,7 @@ void memset18_memset_multiple_times() {
   free(str);
 }
 
-void memset19_memset_multiple_times() {
+void memset19_memset_multiple_times(void) {
   char *str = (char *)malloc(10 * sizeof(char));
   clang_analyzer_eval(strlen(str) == 0); // expected-warning{{UNKNOWN}}
 
@@ -1634,20 +1634,20 @@ void memset27_symbol(char c) {
   clang_analyzer_eval(array[4] >= 10); // expected-warning{{UNKNOWN}}
 }
 
-void memset28() {
+void memset28(void) {
   short x;
   memset(&x, 1, sizeof(short));
   // This should be true.
   clang_analyzer_eval(x == 0x101); // expected-warning{{UNKNOWN}}
 }
 
-void memset29_plain_int_zero() {
+void memset29_plain_int_zero(void) {
   short x;
   memset(&x, 0, sizeof(short));
   clang_analyzer_eval(x == 0); // expected-warning{{TRUE}}
 }
 
-void test_memset_chk() {
+void test_memset_chk(void) {
   int x;
   __builtin___memset_chk(&x, 0, sizeof(x), __builtin_object_size(&x, 0));
   clang_analyzer_eval(x == 0); // expected-warning{{TRUE}}

diff  --git a/clang/test/Analysis/sval-dump-int128.c b/clang/test/Analysis/sval-dump-int128.c
index 82f2fe37c2e87..2433eb679f5b1 100644
--- a/clang/test/Analysis/sval-dump-int128.c
+++ b/clang/test/Analysis/sval-dump-int128.c
@@ -3,6 +3,6 @@
 
 void clang_analyzer_dump(unsigned __int128 x);
 
-void testDumpInt128() {
+void testDumpInt128(void) {
   clang_analyzer_dump((unsigned __int128)5 << 64); // expected-warning{{92233720368547758080 U128b}}
 }

diff  --git a/clang/test/Analysis/svalbuilder-float-cast.c b/clang/test/Analysis/svalbuilder-float-cast.c
index 0f5760cbfca08..07b28f88594b7 100644
--- a/clang/test/Analysis/svalbuilder-float-cast.c
+++ b/clang/test/Analysis/svalbuilder-float-cast.c
@@ -13,7 +13,7 @@ void SymbolCast_of_float_type_aux(int *p) {
   clang_analyzer_express(*p); // expected-warning{{Not a symbol}}
 }
 
-void SymbolCast_of_float_type() {
+void SymbolCast_of_float_type(void) {
   extern float x;
   void (*f)() = SymbolCast_of_float_type_aux;
   f(&x);

diff  --git a/clang/test/Analysis/svalbuilder-logic.c b/clang/test/Analysis/svalbuilder-logic.c
index 33607e80e0104..ad0347c3f8b7b 100644
--- a/clang/test/Analysis/svalbuilder-logic.c
+++ b/clang/test/Analysis/svalbuilder-logic.c
@@ -9,8 +9,8 @@ int SValBuilderLogicNoCrash(int *x) {
 
 // http://llvm.org/bugs/show_bug.cgi?id=15863
 // Don't crash when mixing 'bool' and 'int' in implicit comparisons to 0.
-void pr15863() {
-  extern int getBool();
+void pr15863(void) {
+  extern int getBool(void);
   _Bool a = getBool();
   (void)!a; // no-warning
 }

diff  --git a/clang/test/Analysis/svalbuilder-rearrange-comparisons.c b/clang/test/Analysis/svalbuilder-rearrange-comparisons.c
index 9e9bf0a9db9b4..32af8dde71c92 100644
--- a/clang/test/Analysis/svalbuilder-rearrange-comparisons.c
+++ b/clang/test/Analysis/svalbuilder-rearrange-comparisons.c
@@ -15,8 +15,8 @@ extern void __assert_fail (__const char *__assertion, __const char *__file,
 #define assert(expr) \
   ((expr)  ? (void)(0)  : __assert_fail (#expr, __FILE__, __LINE__, __func__))
 
-int g();
-int f() {
+int g(void);
+int f(void) {
   int x = g();
   // Assert that no overflows occur in this test file.
   // Assuming that concrete integers are also within that range.
@@ -25,14 +25,14 @@ int f() {
   return x;
 }
 
-void compare_
diff erent_symbol_equal() {
+void compare_
diff erent_symbol_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
   clang_analyzer_express(x == y); // expected-warning {{$x - $y == 0}}
 }
 
-void compare_
diff erent_symbol_plus_left_int_equal() {
+void compare_
diff erent_symbol_plus_left_int_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -40,7 +40,7 @@ void compare_
diff erent_symbol_plus_left_int_equal() {
   clang_analyzer_express(x == y); // expected-warning {{$y - $x == 1}}
 }
 
-void compare_
diff erent_symbol_minus_left_int_equal() {
+void compare_
diff erent_symbol_minus_left_int_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -48,7 +48,7 @@ void compare_
diff erent_symbol_minus_left_int_equal() {
   clang_analyzer_express(x == y); // expected-warning {{$x - $y == 1}}
 }
 
-void compare_
diff erent_symbol_plus_right_int_equal() {
+void compare_
diff erent_symbol_plus_right_int_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -57,7 +57,7 @@ void compare_
diff erent_symbol_plus_right_int_equal() {
   clang_analyzer_express(x == y); // expected-warning {{$x - $y == 2}}
 }
 
-void compare_
diff erent_symbol_minus_right_int_equal() {
+void compare_
diff erent_symbol_minus_right_int_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -66,7 +66,7 @@ void compare_
diff erent_symbol_minus_right_int_equal() {
   clang_analyzer_express(x == y); // expected-warning {{$y - $x == 2}}
 }
 
-void compare_
diff erent_symbol_plus_left_plus_right_int_equal() {
+void compare_
diff erent_symbol_plus_left_plus_right_int_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -77,7 +77,7 @@ void compare_
diff erent_symbol_plus_left_plus_right_int_equal() {
   clang_analyzer_express(x == y); // expected-warning {{$y - $x == 1}}
 }
 
-void compare_
diff erent_symbol_plus_left_minus_right_int_equal() {
+void compare_
diff erent_symbol_plus_left_minus_right_int_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -88,7 +88,7 @@ void compare_
diff erent_symbol_plus_left_minus_right_int_equal() {
   clang_analyzer_express(x == y); // expected-warning {{$y - $x == 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_plus_right_int_equal() {
+void compare_
diff erent_symbol_minus_left_plus_right_int_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -99,7 +99,7 @@ void compare_
diff erent_symbol_minus_left_plus_right_int_equal() {
   clang_analyzer_express(x == y); // expected-warning {{$x - $y == 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_minus_right_int_equal() {
+void compare_
diff erent_symbol_minus_left_minus_right_int_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -110,14 +110,14 @@ void compare_
diff erent_symbol_minus_left_minus_right_int_equal() {
   clang_analyzer_express(x == y); // expected-warning {{$x - $y == 1}}
 }
 
-void compare_same_symbol_equal() {
+void compare_same_symbol_equal(void) {
   int x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x}}
   clang_analyzer_eval(x == y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_plus_left_int_equal() {
+void compare_same_symbol_plus_left_int_equal(void) {
   int x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -126,7 +126,7 @@ void compare_same_symbol_plus_left_int_equal() {
   clang_analyzer_eval(x == y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_minus_left_int_equal() {
+void compare_same_symbol_minus_left_int_equal(void) {
   int x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -135,21 +135,21 @@ void compare_same_symbol_minus_left_int_equal() {
   clang_analyzer_eval(x == y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_plus_right_int_equal() {
+void compare_same_symbol_plus_right_int_equal(void) {
   int x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x + 1}}
   clang_analyzer_eval(x == y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_minus_right_int_equal() {
+void compare_same_symbol_minus_right_int_equal(void) {
   int x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x - 1}}
   clang_analyzer_eval(x == y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_plus_left_plus_right_int_equal() {
+void compare_same_symbol_plus_left_plus_right_int_equal(void) {
   int x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -158,7 +158,7 @@ void compare_same_symbol_plus_left_plus_right_int_equal() {
   clang_analyzer_eval(x == y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_plus_left_minus_right_int_equal() {
+void compare_same_symbol_plus_left_minus_right_int_equal(void) {
   int x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -167,7 +167,7 @@ void compare_same_symbol_plus_left_minus_right_int_equal() {
   clang_analyzer_eval(x == y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_minus_left_plus_right_int_equal() {
+void compare_same_symbol_minus_left_plus_right_int_equal(void) {
   int x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -176,7 +176,7 @@ void compare_same_symbol_minus_left_plus_right_int_equal() {
   clang_analyzer_eval(x == y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_minus_left_minus_right_int_equal() {
+void compare_same_symbol_minus_left_minus_right_int_equal(void) {
   int x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -185,14 +185,14 @@ void compare_same_symbol_minus_left_minus_right_int_equal() {
   clang_analyzer_eval(x == y); // expected-warning {{TRUE}}
 }
 
-void compare_
diff erent_symbol_less_or_equal() {
+void compare_
diff erent_symbol_less_or_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
   clang_analyzer_express(x <= y); // expected-warning {{$x - $y <= 0}}
 }
 
-void compare_
diff erent_symbol_plus_left_int_less_or_equal() {
+void compare_
diff erent_symbol_plus_left_int_less_or_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -201,7 +201,7 @@ void compare_
diff erent_symbol_plus_left_int_less_or_equal() {
   clang_analyzer_express(x <= y); // expected-warning {{$y - $x >= 1}}
 }
 
-void compare_
diff erent_symbol_minus_left_int_less_or_equal() {
+void compare_
diff erent_symbol_minus_left_int_less_or_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -209,7 +209,7 @@ void compare_
diff erent_symbol_minus_left_int_less_or_equal() {
   clang_analyzer_express(x <= y); // expected-warning {{$x - $y <= 1}}
 }
 
-void compare_
diff erent_symbol_plus_right_int_less_or_equal() {
+void compare_
diff erent_symbol_plus_right_int_less_or_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -217,7 +217,7 @@ void compare_
diff erent_symbol_plus_right_int_less_or_equal() {
   clang_analyzer_express(x <= y); // expected-warning {{$x - $y <= 2}}
 }
 
-void compare_
diff erent_symbol_minus_right_int_less_or_equal() {
+void compare_
diff erent_symbol_minus_right_int_less_or_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -226,7 +226,7 @@ void compare_
diff erent_symbol_minus_right_int_less_or_equal() {
   clang_analyzer_express(x <= y); // expected-warning {{$y - $x >= 2}}
 }
 
-void compare_
diff erent_symbol_plus_left_plus_right_int_less_or_equal() {
+void compare_
diff erent_symbol_plus_left_plus_right_int_less_or_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -237,7 +237,7 @@ void compare_
diff erent_symbol_plus_left_plus_right_int_less_or_equal() {
   clang_analyzer_express(x <= y); // expected-warning {{$y - $x >= 1}}
 }
 
-void compare_
diff erent_symbol_plus_left_minus_right_int_less_or_equal() {
+void compare_
diff erent_symbol_plus_left_minus_right_int_less_or_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -248,7 +248,7 @@ void compare_
diff erent_symbol_plus_left_minus_right_int_less_or_equal() {
   clang_analyzer_express(x <= y); // expected-warning {{$y - $x >= 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_plus_right_int_less_or_equal() {
+void compare_
diff erent_symbol_minus_left_plus_right_int_less_or_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -259,7 +259,7 @@ void compare_
diff erent_symbol_minus_left_plus_right_int_less_or_equal() {
   clang_analyzer_express(x <= y); // expected-warning {{$x - $y <= 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_minus_right_int_less_or_equal() {
+void compare_
diff erent_symbol_minus_left_minus_right_int_less_or_equal(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -270,14 +270,14 @@ void compare_
diff erent_symbol_minus_left_minus_right_int_less_or_equal() {
   clang_analyzer_express(x <= y); // expected-warning {{$x - $y <= 1}}
 }
 
-void compare_same_symbol_less_or_equal() {
+void compare_same_symbol_less_or_equal(void) {
   int x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x}}
   clang_analyzer_eval(x <= y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_plus_left_int_less_or_equal() {
+void compare_same_symbol_plus_left_int_less_or_equal(void) {
   int x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -286,7 +286,7 @@ void compare_same_symbol_plus_left_int_less_or_equal() {
   clang_analyzer_eval(x <= y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_minus_left_int_less_or_equal() {
+void compare_same_symbol_minus_left_int_less_or_equal(void) {
   int x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -295,21 +295,21 @@ void compare_same_symbol_minus_left_int_less_or_equal() {
   clang_analyzer_eval(x <= y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_plus_right_int_less_or_equal() {
+void compare_same_symbol_plus_right_int_less_or_equal(void) {
   int x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x + 1}}
   clang_analyzer_eval(x <= y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_minus_right_int_less_or_equal() {
+void compare_same_symbol_minus_right_int_less_or_equal(void) {
   int x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x - 1}}
   clang_analyzer_eval(x <= y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_plus_left_plus_right_int_less_or_equal() {
+void compare_same_symbol_plus_left_plus_right_int_less_or_equal(void) {
   int x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -318,7 +318,7 @@ void compare_same_symbol_plus_left_plus_right_int_less_or_equal() {
   clang_analyzer_eval(x <= y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_plus_left_minus_right_int_less_or_equal() {
+void compare_same_symbol_plus_left_minus_right_int_less_or_equal(void) {
   int x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -327,7 +327,7 @@ void compare_same_symbol_plus_left_minus_right_int_less_or_equal() {
   clang_analyzer_eval(x <= y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_minus_left_plus_right_int_less_or_equal() {
+void compare_same_symbol_minus_left_plus_right_int_less_or_equal(void) {
   int x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -336,7 +336,7 @@ void compare_same_symbol_minus_left_plus_right_int_less_or_equal() {
   clang_analyzer_eval(x <= y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_minus_left_minus_right_int_less_or_equal() {
+void compare_same_symbol_minus_left_minus_right_int_less_or_equal(void) {
   int x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -345,7 +345,7 @@ void compare_same_symbol_minus_left_minus_right_int_less_or_equal() {
   clang_analyzer_eval(x <= y); // expected-warning {{TRUE}}
 }
 
-void compare_
diff erent_symbol_less() {
+void compare_
diff erent_symbol_less(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -353,7 +353,7 @@ void compare_
diff erent_symbol_less() {
   clang_analyzer_express(x < y); // expected-warning {{$x - $y < 0}}
 }
 
-void compare_
diff erent_symbol_plus_left_int_less() {
+void compare_
diff erent_symbol_plus_left_int_less(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -363,7 +363,7 @@ void compare_
diff erent_symbol_plus_left_int_less() {
   clang_analyzer_express(x < y); // expected-warning {{$y - $x > 1}}
 }
 
-void compare_
diff erent_symbol_minus_left_int_less() {
+void compare_
diff erent_symbol_minus_left_int_less(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -373,7 +373,7 @@ void compare_
diff erent_symbol_minus_left_int_less() {
   clang_analyzer_express(x < y); // expected-warning {{$x - $y < 1}}
 }
 
-void compare_
diff erent_symbol_plus_right_int_less() {
+void compare_
diff erent_symbol_plus_right_int_less(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -382,7 +382,7 @@ void compare_
diff erent_symbol_plus_right_int_less() {
   clang_analyzer_express(x < y); // expected-warning {{$x - $y < 2}}
 }
 
-void compare_
diff erent_symbol_minus_right_int_less() {
+void compare_
diff erent_symbol_minus_right_int_less(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -391,7 +391,7 @@ void compare_
diff erent_symbol_minus_right_int_less() {
   clang_analyzer_express(x < y); // expected-warning {{$y - $x > 2}}
 }
 
-void compare_
diff erent_symbol_plus_left_plus_right_int_less() {
+void compare_
diff erent_symbol_plus_left_plus_right_int_less(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -402,7 +402,7 @@ void compare_
diff erent_symbol_plus_left_plus_right_int_less() {
   clang_analyzer_express(x < y); // expected-warning {{$y - $x > 1}}
 }
 
-void compare_
diff erent_symbol_plus_left_minus_right_int_less() {
+void compare_
diff erent_symbol_plus_left_minus_right_int_less(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -413,7 +413,7 @@ void compare_
diff erent_symbol_plus_left_minus_right_int_less() {
   clang_analyzer_express(x < y); // expected-warning {{$y - $x > 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_plus_right_int_less() {
+void compare_
diff erent_symbol_minus_left_plus_right_int_less(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -424,7 +424,7 @@ void compare_
diff erent_symbol_minus_left_plus_right_int_less() {
   clang_analyzer_express(x < y); // expected-warning {{$x - $y < 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_minus_right_int_less() {
+void compare_
diff erent_symbol_minus_left_minus_right_int_less(void) {
   int x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -435,14 +435,14 @@ void compare_
diff erent_symbol_minus_left_minus_right_int_less() {
   clang_analyzer_express(x < y); // expected-warning {{$x - $y < 1}}
 }
 
-void compare_same_symbol_less() {
+void compare_same_symbol_less(void) {
   int x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x}}
   clang_analyzer_eval(x < y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_plus_left_int_less() {
+void compare_same_symbol_plus_left_int_less(void) {
   int x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -451,7 +451,7 @@ void compare_same_symbol_plus_left_int_less() {
   clang_analyzer_eval(x < y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_minus_left_int_less() {
+void compare_same_symbol_minus_left_int_less(void) {
   int x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -460,21 +460,21 @@ void compare_same_symbol_minus_left_int_less() {
   clang_analyzer_eval(x < y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_plus_right_int_less() {
+void compare_same_symbol_plus_right_int_less(void) {
   int x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x + 1}}
   clang_analyzer_eval(x < y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_minus_right_int_less() {
+void compare_same_symbol_minus_right_int_less(void) {
   int x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x - 1}}
   clang_analyzer_eval(x < y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_plus_left_plus_right_int_less() {
+void compare_same_symbol_plus_left_plus_right_int_less(void) {
   int x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -483,7 +483,7 @@ void compare_same_symbol_plus_left_plus_right_int_less() {
   clang_analyzer_eval(x < y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_plus_left_minus_right_int_less() {
+void compare_same_symbol_plus_left_minus_right_int_less(void) {
   int x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -492,7 +492,7 @@ void compare_same_symbol_plus_left_minus_right_int_less() {
   clang_analyzer_eval(x < y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_minus_left_plus_right_int_less() {
+void compare_same_symbol_minus_left_plus_right_int_less(void) {
   int x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -501,7 +501,7 @@ void compare_same_symbol_minus_left_plus_right_int_less() {
   clang_analyzer_eval(x < y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_minus_left_minus_right_int_less() {
+void compare_same_symbol_minus_left_minus_right_int_less(void) {
   int x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -510,7 +510,7 @@ void compare_same_symbol_minus_left_minus_right_int_less() {
   clang_analyzer_eval(x < y); // expected-warning {{FALSE}}
 }
 
-void compare_
diff erent_symbol_equal_unsigned() {
+void compare_
diff erent_symbol_equal_unsigned(void) {
   unsigned x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -518,7 +518,7 @@ void compare_
diff erent_symbol_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$x - $y == 0}}
 }
 
-void compare_
diff erent_symbol_plus_left_int_equal_unsigned() {
+void compare_
diff erent_symbol_plus_left_int_equal_unsigned(void) {
   unsigned x = f() + 1, y = f();
   clang_analyzer_denote(x - 1, "$x");
   clang_analyzer_denote(y, "$y");
@@ -527,7 +527,7 @@ void compare_
diff erent_symbol_plus_left_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$y - $x == 1}}
 }
 
-void compare_
diff erent_symbol_minus_left_int_equal_unsigned() {
+void compare_
diff erent_symbol_minus_left_int_equal_unsigned(void) {
   unsigned x = f() - 1, y = f();
   clang_analyzer_denote(x + 1, "$x");
   clang_analyzer_denote(y, "$y");
@@ -536,7 +536,7 @@ void compare_
diff erent_symbol_minus_left_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$x - $y == 1}}
 }
 
-void compare_
diff erent_symbol_plus_right_int_equal_unsigned() {
+void compare_
diff erent_symbol_plus_right_int_equal_unsigned(void) {
   unsigned x = f(), y = f() + 2;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y - 2, "$y");
@@ -544,7 +544,7 @@ void compare_
diff erent_symbol_plus_right_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$x - $y == 2}}
 }
 
-void compare_
diff erent_symbol_minus_right_int_equal_unsigned() {
+void compare_
diff erent_symbol_minus_right_int_equal_unsigned(void) {
   unsigned x = f(), y = f() - 2;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y + 2, "$y");
@@ -552,7 +552,7 @@ void compare_
diff erent_symbol_minus_right_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$y - $x == 2}}
 }
 
-void compare_
diff erent_symbol_plus_left_plus_right_int_equal_unsigned() {
+void compare_
diff erent_symbol_plus_left_plus_right_int_equal_unsigned(void) {
   unsigned x = f() + 2, y = f() + 1;
   clang_analyzer_denote(x - 2, "$x");
   clang_analyzer_denote(y - 1, "$y");
@@ -561,7 +561,7 @@ void compare_
diff erent_symbol_plus_left_plus_right_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$y - $x == 1}}
 }
 
-void compare_
diff erent_symbol_plus_left_minus_right_int_equal_unsigned() {
+void compare_
diff erent_symbol_plus_left_minus_right_int_equal_unsigned(void) {
   unsigned x = f() + 2, y = f() - 1;
   clang_analyzer_denote(x - 2, "$x");
   clang_analyzer_denote(y + 1, "$y");
@@ -570,7 +570,7 @@ void compare_
diff erent_symbol_plus_left_minus_right_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$y - $x == 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_plus_right_int_equal_unsigned() {
+void compare_
diff erent_symbol_minus_left_plus_right_int_equal_unsigned(void) {
   unsigned x = f() - 2, y = f() + 1;
   clang_analyzer_denote(x + 2, "$x");
   clang_analyzer_denote(y - 1, "$y");
@@ -579,7 +579,7 @@ void compare_
diff erent_symbol_minus_left_plus_right_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$x - $y == 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_minus_right_int_equal_unsigned() {
+void compare_
diff erent_symbol_minus_left_minus_right_int_equal_unsigned(void) {
   unsigned x = f() - 2, y = f() - 1;
   clang_analyzer_denote(x + 2, "$x");
   clang_analyzer_denote(y + 1, "$y");
@@ -588,14 +588,14 @@ void compare_
diff erent_symbol_minus_left_minus_right_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$x - $y == 1}}
 }
 
-void compare_same_symbol_equal_unsigned() {
+void compare_same_symbol_equal_unsigned(void) {
   unsigned x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x}}
   clang_analyzer_eval(x == y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_plus_left_int_equal_unsigned() {
+void compare_same_symbol_plus_left_int_equal_unsigned(void) {
   unsigned x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -604,7 +604,7 @@ void compare_same_symbol_plus_left_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$x + 1U == $x}}
 }
 
-void compare_same_symbol_minus_left_int_equal_unsigned() {
+void compare_same_symbol_minus_left_int_equal_unsigned(void) {
   unsigned x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -613,21 +613,21 @@ void compare_same_symbol_minus_left_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$x - 1U == $x}}
 }
 
-void compare_same_symbol_plus_right_int_equal_unsigned() {
+void compare_same_symbol_plus_right_int_equal_unsigned(void) {
   unsigned x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x + 1}}
   clang_analyzer_express(x == y); // expected-warning {{$x == $x + 1U}}
 }
 
-void compare_same_symbol_minus_right_int_equal_unsigned() {
+void compare_same_symbol_minus_right_int_equal_unsigned(void) {
   unsigned x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x - 1}}
   clang_analyzer_express(x == y); // expected-warning {{$x == $x - 1U}}
 }
 
-void compare_same_symbol_plus_left_plus_right_int_equal_unsigned() {
+void compare_same_symbol_plus_left_plus_right_int_equal_unsigned(void) {
   unsigned x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -636,7 +636,7 @@ void compare_same_symbol_plus_left_plus_right_int_equal_unsigned() {
   clang_analyzer_eval(x == y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_plus_left_minus_right_int_equal_unsigned() {
+void compare_same_symbol_plus_left_minus_right_int_equal_unsigned(void) {
   unsigned x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -645,7 +645,7 @@ void compare_same_symbol_plus_left_minus_right_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$x + 1U == $x - 1U}}
 }
 
-void compare_same_symbol_minus_left_plus_right_int_equal_unsigned() {
+void compare_same_symbol_minus_left_plus_right_int_equal_unsigned(void) {
   unsigned x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -654,7 +654,7 @@ void compare_same_symbol_minus_left_plus_right_int_equal_unsigned() {
   clang_analyzer_express(x == y); // expected-warning {{$x - 1U == $x + 1U}}
 }
 
-void compare_same_symbol_minus_left_minus_right_int_equal_unsigned() {
+void compare_same_symbol_minus_left_minus_right_int_equal_unsigned(void) {
   unsigned x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -663,7 +663,7 @@ void compare_same_symbol_minus_left_minus_right_int_equal_unsigned() {
   clang_analyzer_eval(x == y); // expected-warning {{TRUE}}
 }
 
-void compare_
diff erent_symbol_less_or_equal_unsigned() {
+void compare_
diff erent_symbol_less_or_equal_unsigned(void) {
   unsigned x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -671,7 +671,7 @@ void compare_
diff erent_symbol_less_or_equal_unsigned() {
   clang_analyzer_express(x <= y); // expected-warning {{$x - $y <= 0}}
 }
 
-void compare_
diff erent_symbol_plus_left_int_less_or_equal_unsigned() {
+void compare_
diff erent_symbol_plus_left_int_less_or_equal_unsigned(void) {
   unsigned x = f() + 1, y = f();
   clang_analyzer_denote(x - 1, "$x");
   clang_analyzer_denote(y, "$y");
@@ -680,7 +680,7 @@ void compare_
diff erent_symbol_plus_left_int_less_or_equal_unsigned() {
   clang_analyzer_express(x <= y); // expected-warning {{$y - $x >= 1}}
 }
 
-void compare_
diff erent_symbol_minus_left_int_less_or_equal_unsigned() {
+void compare_
diff erent_symbol_minus_left_int_less_or_equal_unsigned(void) {
   unsigned x = f() - 1, y = f();
   clang_analyzer_denote(x + 1, "$x");
   clang_analyzer_denote(y, "$y");
@@ -689,7 +689,7 @@ void compare_
diff erent_symbol_minus_left_int_less_or_equal_unsigned() {
   clang_analyzer_express(x <= y); // expected-warning {{$x - $y <= 1}}
 }
 
-void compare_
diff erent_symbol_plus_right_int_less_or_equal_unsigned() {
+void compare_
diff erent_symbol_plus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f(), y = f() + 2;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y - 2, "$y");
@@ -697,7 +697,7 @@ void compare_
diff erent_symbol_plus_right_int_less_or_equal_unsigned() {
   clang_analyzer_express(x <= y); // expected-warning {{$x - $y <= 2}}
 }
 
-void compare_
diff erent_symbol_minus_right_int_less_or_equal_unsigned() {
+void compare_
diff erent_symbol_minus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f(), y = f() - 2;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y + 2, "$y");
@@ -705,7 +705,7 @@ void compare_
diff erent_symbol_minus_right_int_less_or_equal_unsigned() {
   clang_analyzer_express(x <= y); // expected-warning {{$y - $x >= 2}}
 }
 
-void compare_
diff erent_symbol_plus_left_plus_right_int_less_or_equal_unsigned() {
+void compare_
diff erent_symbol_plus_left_plus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f() + 2, y = f() + 1;
   clang_analyzer_denote(x - 2, "$x");
   clang_analyzer_denote(y - 1, "$y");
@@ -714,7 +714,7 @@ void compare_
diff erent_symbol_plus_left_plus_right_int_less_or_equal_unsigned()
   clang_analyzer_express(x <= y); // expected-warning {{$y - $x >= 1}}
 }
 
-void compare_
diff erent_symbol_plus_left_minus_right_int_less_or_equal_unsigned() {
+void compare_
diff erent_symbol_plus_left_minus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f() + 2, y = f() - 1;
   clang_analyzer_denote(x - 2, "$x");
   clang_analyzer_denote(y + 1, "$y");
@@ -723,7 +723,7 @@ void compare_
diff erent_symbol_plus_left_minus_right_int_less_or_equal_unsigned()
   clang_analyzer_express(x <= y); // expected-warning {{$y - $x >= 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_plus_right_int_less_or_equal_unsigned() {
+void compare_
diff erent_symbol_minus_left_plus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f() - 2, y = f() + 1;
   clang_analyzer_denote(x + 2, "$x");
   clang_analyzer_denote(y - 1, "$y");
@@ -732,7 +732,7 @@ void compare_
diff erent_symbol_minus_left_plus_right_int_less_or_equal_unsigned()
   clang_analyzer_express(x <= y); // expected-warning {{$x - $y <= 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_minus_right_int_less_or_equal_unsigned() {
+void compare_
diff erent_symbol_minus_left_minus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f() - 2, y = f() - 1;
   clang_analyzer_denote(x + 2, "$x");
   clang_analyzer_denote(y + 1, "$y");
@@ -741,14 +741,14 @@ void compare_
diff erent_symbol_minus_left_minus_right_int_less_or_equal_unsigned(
   clang_analyzer_express(x <= y); // expected-warning {{$x - $y <= 1}}
 }
 
-void compare_same_symbol_less_or_equal_unsigned() {
+void compare_same_symbol_less_or_equal_unsigned(void) {
   unsigned x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x}}
   clang_analyzer_eval(x <= y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_plus_left_int_less_or_equal_unsigned() {
+void compare_same_symbol_plus_left_int_less_or_equal_unsigned(void) {
   unsigned x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -757,7 +757,7 @@ void compare_same_symbol_plus_left_int_less_or_equal_unsigned() {
   clang_analyzer_express(x <= y); // expected-warning {{$x + 1U <= $x}}
 }
 
-void compare_same_symbol_minus_left_int_less_or_equal_unsigned() {
+void compare_same_symbol_minus_left_int_less_or_equal_unsigned(void) {
   unsigned x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -766,21 +766,21 @@ void compare_same_symbol_minus_left_int_less_or_equal_unsigned() {
   clang_analyzer_express(x <= y); // expected-warning {{$x - 1U <= $x}}
 }
 
-void compare_same_symbol_plus_right_int_less_or_equal_unsigned() {
+void compare_same_symbol_plus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x + 1}}
   clang_analyzer_express(x <= y); // expected-warning {{$x <= $x + 1U}}
 }
 
-void compare_same_symbol_minus_right_int_less_or_equal_unsigned() {
+void compare_same_symbol_minus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x - 1}}
   clang_analyzer_express(x <= y); // expected-warning {{$x <= $x - 1U}}
 }
 
-void compare_same_symbol_plus_left_plus_right_int_less_or_equal_unsigned() {
+void compare_same_symbol_plus_left_plus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -789,7 +789,7 @@ void compare_same_symbol_plus_left_plus_right_int_less_or_equal_unsigned() {
   clang_analyzer_eval(x <= y); // expected-warning {{TRUE}}
 }
 
-void compare_same_symbol_plus_left_minus_right_int_less_or_equal_unsigned() {
+void compare_same_symbol_plus_left_minus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -798,7 +798,7 @@ void compare_same_symbol_plus_left_minus_right_int_less_or_equal_unsigned() {
   clang_analyzer_express(x <= y); // expected-warning {{$x + 1U <= $x - 1U}}
 }
 
-void compare_same_symbol_minus_left_plus_right_int_less_or_equal_unsigned() {
+void compare_same_symbol_minus_left_plus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -807,7 +807,7 @@ void compare_same_symbol_minus_left_plus_right_int_less_or_equal_unsigned() {
   clang_analyzer_express(x <= y); // expected-warning {{$x - 1U <= $x + 1U}}
 }
 
-void compare_same_symbol_minus_left_minus_right_int_less_or_equal_unsigned() {
+void compare_same_symbol_minus_left_minus_right_int_less_or_equal_unsigned(void) {
   unsigned x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -816,7 +816,7 @@ void compare_same_symbol_minus_left_minus_right_int_less_or_equal_unsigned() {
   clang_analyzer_eval(x <= y); // expected-warning {{TRUE}}
 }
 
-void compare_
diff erent_symbol_less_unsigned() {
+void compare_
diff erent_symbol_less_unsigned(void) {
   unsigned x = f(), y = f();
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y, "$y");
@@ -824,7 +824,7 @@ void compare_
diff erent_symbol_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$x - $y < 0}}
 }
 
-void compare_
diff erent_symbol_plus_left_int_less_unsigned() {
+void compare_
diff erent_symbol_plus_left_int_less_unsigned(void) {
   unsigned x = f() + 1, y = f();
   clang_analyzer_denote(x - 1, "$x");
   clang_analyzer_denote(y, "$y");
@@ -833,7 +833,7 @@ void compare_
diff erent_symbol_plus_left_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$y - $x > 1}}
 }
 
-void compare_
diff erent_symbol_minus_left_int_less_unsigned() {
+void compare_
diff erent_symbol_minus_left_int_less_unsigned(void) {
   unsigned x = f() - 1, y = f();
   clang_analyzer_denote(x + 1, "$x");
   clang_analyzer_denote(y, "$y");
@@ -842,7 +842,7 @@ void compare_
diff erent_symbol_minus_left_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$x - $y < 1}}
 }
 
-void compare_
diff erent_symbol_plus_right_int_less_unsigned() {
+void compare_
diff erent_symbol_plus_right_int_less_unsigned(void) {
   unsigned x = f(), y = f() + 2;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y - 2, "$y");
@@ -850,7 +850,7 @@ void compare_
diff erent_symbol_plus_right_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$x - $y < 2}}
 }
 
-void compare_
diff erent_symbol_minus_right_int_less_unsigned() {
+void compare_
diff erent_symbol_minus_right_int_less_unsigned(void) {
   unsigned x = f(), y = f() - 2;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_denote(y + 2, "$y");
@@ -858,7 +858,7 @@ void compare_
diff erent_symbol_minus_right_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$y - $x > 2}}
 }
 
-void compare_
diff erent_symbol_plus_left_plus_right_int_less_unsigned() {
+void compare_
diff erent_symbol_plus_left_plus_right_int_less_unsigned(void) {
   unsigned x = f() + 2, y = f() + 1;
   clang_analyzer_denote(x - 2, "$x");
   clang_analyzer_denote(y - 1, "$y");
@@ -867,7 +867,7 @@ void compare_
diff erent_symbol_plus_left_plus_right_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$y - $x > 1}}
 }
 
-void compare_
diff erent_symbol_plus_left_minus_right_int_less_unsigned() {
+void compare_
diff erent_symbol_plus_left_minus_right_int_less_unsigned(void) {
   unsigned x = f() + 2, y = f() - 1;
   clang_analyzer_denote(x - 2, "$x");
   clang_analyzer_denote(y + 1, "$y");
@@ -876,7 +876,7 @@ void compare_
diff erent_symbol_plus_left_minus_right_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$y - $x > 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_plus_right_int_less_unsigned() {
+void compare_
diff erent_symbol_minus_left_plus_right_int_less_unsigned(void) {
   unsigned x = f() - 2, y = f() + 1;
   clang_analyzer_denote(x + 2, "$x");
   clang_analyzer_denote(y - 1, "$y");
@@ -885,7 +885,7 @@ void compare_
diff erent_symbol_minus_left_plus_right_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$x - $y < 3}}
 }
 
-void compare_
diff erent_symbol_minus_left_minus_right_int_less_unsigned() {
+void compare_
diff erent_symbol_minus_left_minus_right_int_less_unsigned(void) {
   unsigned x = f() - 2, y = f() - 1;
   clang_analyzer_denote(x + 2, "$x");
   clang_analyzer_denote(y + 1, "$y");
@@ -894,14 +894,14 @@ void compare_
diff erent_symbol_minus_left_minus_right_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$x - $y < 1}}
 }
 
-void compare_same_symbol_less_unsigned() {
+void compare_same_symbol_less_unsigned(void) {
   unsigned x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x}}
   clang_analyzer_eval(x < y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_plus_left_int_less_unsigned() {
+void compare_same_symbol_plus_left_int_less_unsigned(void) {
   unsigned x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -910,7 +910,7 @@ void compare_same_symbol_plus_left_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$x + 1U < $x}}
 }
 
-void compare_same_symbol_minus_left_int_less_unsigned() {
+void compare_same_symbol_minus_left_int_less_unsigned(void) {
   unsigned x = f(), y = x;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -919,21 +919,21 @@ void compare_same_symbol_minus_left_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$x - 1U < $x}}
 }
 
-void compare_same_symbol_plus_right_int_less_unsigned() {
+void compare_same_symbol_plus_right_int_less_unsigned(void) {
   unsigned x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x + 1}}
   clang_analyzer_express(x < y); // expected-warning {{$x < $x + 1U}}
 }
 
-void compare_same_symbol_minus_right_int_less_unsigned() {
+void compare_same_symbol_minus_right_int_less_unsigned(void) {
   unsigned x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   clang_analyzer_express(y); // expected-warning {{$x - 1}}
   clang_analyzer_express(x < y); // expected-warning {{$x < $x - 1U}}
 }
 
-void compare_same_symbol_plus_left_plus_right_int_less_unsigned() {
+void compare_same_symbol_plus_left_plus_right_int_less_unsigned(void) {
   unsigned x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -942,7 +942,7 @@ void compare_same_symbol_plus_left_plus_right_int_less_unsigned() {
   clang_analyzer_eval(x < y); // expected-warning {{FALSE}}
 }
 
-void compare_same_symbol_plus_left_minus_right_int_less_unsigned() {
+void compare_same_symbol_plus_left_minus_right_int_less_unsigned(void) {
   unsigned x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   ++x;
@@ -951,7 +951,7 @@ void compare_same_symbol_plus_left_minus_right_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$x + 1U < $x - 1U}}
 }
 
-void compare_same_symbol_minus_left_plus_right_int_less_unsigned() {
+void compare_same_symbol_minus_left_plus_right_int_less_unsigned(void) {
   unsigned x = f(), y = x + 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -960,7 +960,7 @@ void compare_same_symbol_minus_left_plus_right_int_less_unsigned() {
   clang_analyzer_express(x < y); // expected-warning {{$x - 1U < $x + 1U}}
 }
 
-void compare_same_symbol_minus_left_minus_right_int_less_unsigned() {
+void compare_same_symbol_minus_left_minus_right_int_less_unsigned(void) {
   unsigned x = f(), y = x - 1;
   clang_analyzer_denote(x, "$x");
   --x;
@@ -980,8 +980,8 @@ int mixed_integer_types(int x, int y) {
   return a - y;
 }
 
-unsigned gu();
-unsigned fu() {
+unsigned gu(void);
+unsigned fu(void) {
   unsigned x = gu();
   // Assert that no overflows occur in this test file.
   // Assuming that concrete integers are also within that range.
@@ -989,7 +989,7 @@ unsigned fu() {
   return x;
 }
 
-void unsigned_concrete_int_no_crash() {
+void unsigned_concrete_int_no_crash(void) {
   unsigned x = fu() + 1U, y = fu() + 1U;
   clang_analyzer_denote(x - 1U, "$x");
   clang_analyzer_denote(y - 1U, "$y");

diff  --git a/clang/test/Analysis/switch-case.c b/clang/test/Analysis/switch-case.c
index a9f566160f1ba..a0d54dde605ae 100644
--- a/clang/test/Analysis/switch-case.c
+++ b/clang/test/Analysis/switch-case.c
@@ -1,7 +1,7 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,debug.ExprInspection -verify -analyzer-config eagerly-assume=false %s
 
 void clang_analyzer_eval(int);
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 
 #define INT_MIN 0x80000000
 #define INT_MAX 0x7fffffff
@@ -208,7 +208,7 @@ void testDifferentTypes3(int arg) {
   }
 }
 
-void testConstant() {
+void testConstant(void) {
   switch (3) {
   case 1 ... 5:
     clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}

diff  --git a/clang/test/Analysis/symbol-reaper.c b/clang/test/Analysis/symbol-reaper.c
index 57eaeb1a338cc..e8ea1b58a0148 100644
--- a/clang/test/Analysis/symbol-reaper.c
+++ b/clang/test/Analysis/symbol-reaper.c
@@ -2,14 +2,14 @@
 
 void clang_analyzer_eval(int);
 void clang_analyzer_warnOnDeadSymbol(int);
-void clang_analyzer_numTimesReached();
-void clang_analyzer_warnIfReached();
+void clang_analyzer_numTimesReached(void);
+void clang_analyzer_warnIfReached(void);
 
 void exit(int);
 
-int conjure_index();
+int conjure_index(void);
 
-void test_that_expr_inspection_works() {
+void test_that_expr_inspection_works(void) {
   do {
     int x = conjure_index();
     clang_analyzer_warnOnDeadSymbol(x);
@@ -27,7 +27,7 @@ void test_that_expr_inspection_works() {
 
 int arr[3];
 
-int *test_element_index_lifetime_in_environment_values() {
+int *test_element_index_lifetime_in_environment_values(void) {
   int *ptr;
   do {
     int x = conjure_index();
@@ -37,7 +37,7 @@ int *test_element_index_lifetime_in_environment_values() {
   return ptr;
 }
 
-void test_element_index_lifetime_in_store_keys() {
+void test_element_index_lifetime_in_store_keys(void) {
   do {
     int x = conjure_index();
     clang_analyzer_warnOnDeadSymbol(x);
@@ -47,7 +47,7 @@ void test_element_index_lifetime_in_store_keys() {
 }
 
 int *ptr;
-void test_element_index_lifetime_in_store_values() {
+void test_element_index_lifetime_in_store_values(void) {
   do {
     int x = conjure_index();
     clang_analyzer_warnOnDeadSymbol(x);
@@ -65,10 +65,10 @@ struct S3 {
   void *field;
 };
 
-struct S1 *conjure_S1();
-struct S3 *conjure_S3();
+struct S1 *conjure_S1(void);
+struct S3 *conjure_S3(void);
 
-void test_element_index_lifetime_with_complicated_hierarchy_of_regions() {
+void test_element_index_lifetime_with_complicated_hierarchy_of_regions(void) {
   do {
     int x = conjure_index();
     clang_analyzer_warnOnDeadSymbol(x);
@@ -77,7 +77,7 @@ void test_element_index_lifetime_with_complicated_hierarchy_of_regions() {
   } while (0); // no-warning
 }
 
-void test_loc_as_integer_element_index_lifetime() {
+void test_loc_as_integer_element_index_lifetime(void) {
   do {
     int x;
     struct S3 *s = conjure_S3();
@@ -99,18 +99,18 @@ void test_region_lifetime_as_store_value(int *x) {
   clang_analyzer_eval(**ptrptr); // expected-warning{{TRUE}}
 } // no-warning
 
-int *produce_region_referenced_only_through_field_in_environment_value() {
+int *produce_region_referenced_only_through_field_in_environment_value(void) {
   struct S1 *s = conjure_S1();
   clang_analyzer_warnOnDeadSymbol((int) s);
   int *x = &s->field;
   return x;
 }
 
-void test_region_referenced_only_through_field_in_environment_value() {
+void test_region_referenced_only_through_field_in_environment_value(void) {
   produce_region_referenced_only_through_field_in_environment_value();
 } // expected-warning{{SYMBOL DEAD}}
 
-void test_region_referenced_only_through_field_in_store_value() {
+void test_region_referenced_only_through_field_in_store_value(void) {
   struct S1 *s = conjure_S1();
   clang_analyzer_warnOnDeadSymbol((int) s);
   ptr = &s->field; // Write the symbol into a global. It should live forever.
@@ -128,7 +128,7 @@ void test_region_referenced_only_through_field_in_store_value() {
   // to put the diagnostic on.
 } // expected-warning{{SYMBOL DEAD}}
 
-void test_zombie_referenced_only_through_field_in_store_value() {
+void test_zombie_referenced_only_through_field_in_store_value(void) {
   struct S1 *s = conjure_S1();
   clang_analyzer_warnOnDeadSymbol((int) s);
   int *x = &s->field;

diff  --git a/clang/test/Analysis/taint-diagnostic-visitor.c b/clang/test/Analysis/taint-diagnostic-visitor.c
index 6533cd7625caa..34414a209817a 100644
--- a/clang/test/Analysis/taint-diagnostic-visitor.c
+++ b/clang/test/Analysis/taint-diagnostic-visitor.c
@@ -5,14 +5,14 @@
 int scanf(const char *restrict format, ...);
 int system(const char *command);
 
-void taintDiagnostic()
+void taintDiagnostic(void)
 {
   char buf[128];
   scanf("%s", buf); // expected-note {{Taint originated here}}
   system(buf); // expected-warning {{Untrusted data is passed to a system call}} // expected-note {{Untrusted data is passed to a system call (CERT/STR02-C. Sanitize data passed to complex subsystems)}}
 }
 
-int taintDiagnosticOutOfBound() {
+int taintDiagnosticOutOfBound(void) {
   int index;
   int Array[] = {1, 2, 3, 4, 5};
   scanf("%d", &index); // expected-note {{Taint originated here}}
@@ -27,7 +27,7 @@ int taintDiagnosticDivZero(int operand) {
                        // expected-note at -1 {{Division by a tainted value, possibly zero}}
 }
 
-void taintDiagnosticVLA() {
+void taintDiagnosticVLA(void) {
   int x;
   scanf("%d", &x); // expected-note {{Value assigned to 'x'}}
                    // expected-note at -1 {{Taint originated here}}

diff  --git a/clang/test/Analysis/taint-dumps.c b/clang/test/Analysis/taint-dumps.c
index 305e4e9888fcf..37fb6c2f2adf7 100644
--- a/clang/test/Analysis/taint-dumps.c
+++ b/clang/test/Analysis/taint-dumps.c
@@ -2,12 +2,12 @@
 // RUN:                    -analyzer-checker=debug.ExprInspection %s\
 // RUN:                                          2>&1 | FileCheck %s
 
-void clang_analyzer_printState();
-int getchar();
+void clang_analyzer_printState(void);
+int getchar(void);
 
 // CHECK: Tainted symbols:
 // CHECK-NEXT: conj_$2{{.*}} : 0
-int test_taint_dumps() {
+int test_taint_dumps(void) {
   int x = getchar();
   clang_analyzer_printState();
   return x;

diff  --git a/clang/test/Analysis/taint-generic.c b/clang/test/Analysis/taint-generic.c
index 90ab454ff7e8f..6979c06677646 100644
--- a/clang/test/Analysis/taint-generic.c
+++ b/clang/test/Analysis/taint-generic.c
@@ -116,7 +116,7 @@ void bufferScanfAssignment(int x) {
   }
 }
 
-void scanfArg() {
+void scanfArg(void) {
   int t = 0;
   scanf("%d", t); // expected-warning {{format specifies type 'int *' but the argument has type 'int'}}
 }
@@ -160,7 +160,7 @@ void testUncontrolledFormatString(char **p) {
 }
 
 int system(const char *command);
-void testTaintSystemCall() {
+void testTaintSystemCall(void) {
   char buffer[156];
   char addr[128];
   scanf("%s", addr);
@@ -171,7 +171,7 @@ void testTaintSystemCall() {
   system(buffer); // expected-warning {{Untrusted data is passed to a system call}}
 }
 
-void testTaintSystemCall2() {
+void testTaintSystemCall2(void) {
   // Test that snpintf transfers taint.
   char buffern[156];
   char addr[128];
@@ -180,7 +180,7 @@ void testTaintSystemCall2() {
   system(buffern); // expected-warning {{Untrusted data is passed to a system call}}
 }
 
-void testTaintSystemCall3() {
+void testTaintSystemCall3(void) {
   char buffern2[156];
   int numt;
   char addr[128];
@@ -189,13 +189,13 @@ void testTaintSystemCall3() {
   system(buffern2); // expected-warning {{Untrusted data is passed to a system call}}
 }
 
-void testGets() {
+void testGets(void) {
   char str[50];
   gets(str);
   system(str); // expected-warning {{Untrusted data is passed to a system call}}
 }
 
-void testTaintedBufferSize() {
+void testTaintedBufferSize(void) {
   size_t ts;
   scanf("%zd", &ts);
 
@@ -217,7 +217,7 @@ int socket(int, int, int);
 size_t read(int, void *, size_t);
 int  execl(const char *, const char *, ...);
 
-void testSocket() {
+void testSocket(void) {
   int sock;
   char buffer[100];
 
@@ -235,7 +235,7 @@ void testSocket() {
   execl(buffer, "filename", 0); // expected-warning {{Untrusted data is passed to a system call}}
 }
 
-void testStruct() {
+void testStruct(void) {
   struct {
     char buf[16];
     int length;
@@ -249,7 +249,7 @@ void testStruct() {
   __builtin_memcpy(buffer, tainted.buf, tainted.length); // expected-warning {{Untrusted data is used to specify the buffer size}}
 }
 
-void testStructArray() {
+void testStructArray(void) {
   struct {
     int length;
   } tainted[4];
@@ -274,7 +274,7 @@ void testStructArray() {
   __builtin_memcpy(dstbuf, srcbuf, tainted[2].length); // no-warning
 }
 
-void testUnion() {
+void testUnion(void) {
   union {
     int x;
     char y[4];
@@ -288,14 +288,14 @@ void testUnion() {
   __builtin_memcpy(buffer, tainted.y, tainted.x);
 }
 
-int testDivByZero() {
+int testDivByZero(void) {
   int x;
   scanf("%d", &x);
   return 5/x; // expected-warning {{Division by a tainted value, possibly zero}}
 }
 
 // Zero-sized VLAs.
-void testTaintedVLASize() {
+void testTaintedVLASize(void) {
   int x;
   scanf("%d", &x);
   int vla[x]; // expected-warning{{Declared variable-length array (VLA) has tainted size}}
@@ -353,7 +353,7 @@ int sprintf_propagates_taint(char *buf, char *msg) {
 }
 
 // Test configuration
-int mySource1();
+int mySource1(void);
 void mySource2(int*);
 void myScanf(const char*, ...);
 int myPropagator(int, int*);
@@ -361,38 +361,38 @@ int mySnprintf(char*, size_t, const char*, ...);
 bool isOutOfRange(const int*);
 void mySink(int, int, int);
 
-void testConfigurationSources1() {
+void testConfigurationSources1(void) {
   int x = mySource1();
   Buffer[x] = 1; // expected-warning {{Out of bound memory access }}
 }
 
-void testConfigurationSources2() {
+void testConfigurationSources2(void) {
   int x;
   mySource2(&x);
   Buffer[x] = 1; // expected-warning {{Out of bound memory access }}
 }
 
-void testConfigurationSources3() {
+void testConfigurationSources3(void) {
   int x, y;
   myScanf("%d %d", &x, &y);
   Buffer[y] = 1; // expected-warning {{Out of bound memory access }}
 }
 
-void testConfigurationPropagation() {
+void testConfigurationPropagation(void) {
   int x = mySource1();
   int y;
   myPropagator(x, &y);
   Buffer[y] = 1; // expected-warning {{Out of bound memory access }}
 }
 
-void testConfigurationFilter() {
+void testConfigurationFilter(void) {
   int x = mySource1();
   if (isOutOfRange(&x)) // the filter function
     return;
   Buffer[x] = 1; // no-warning
 }
 
-void testConfigurationSinks() {
+void testConfigurationSinks(void) {
   int x = mySource1();
   mySink(x, 1, 2);
   // expected-warning at -1 {{Untrusted data is passed to a user-defined sink}}

diff  --git a/clang/test/Analysis/taint-tester.c b/clang/test/Analysis/taint-tester.c
index cbb2ad6c97447..800a771452bef 100644
--- a/clang/test/Analysis/taint-tester.c
+++ b/clang/test/Analysis/taint-tester.c
@@ -109,7 +109,7 @@ int fscanfTest(void) {
 }
 
 // Check if we propagate taint from stdin when it's used in an assignment.
-void stdinTest1() {
+void stdinTest1(void) {
   int i;
   fscanf(stdin, "%d", &i);
   int j = i; // expected-warning + {{tainted}}
@@ -133,7 +133,7 @@ void stdinTest2(FILE *pIn) {
   int jj4 = ii;// no warning
 }
 
-void stdinTest3() {
+void stdinTest3(void) {
   FILE **ppp = &stdin;
   int iii;
   fscanf(*ppp, "%d", &iii);
@@ -141,8 +141,8 @@ void stdinTest3() {
 }
 
 // Test that stdin does not get invalidated by calls.
-void foo();
-void stdinTest4() {
+void foo(void);
+void stdinTest4(void) {
   int i;
   fscanf(stdin, "%d", &i);
   foo();
@@ -150,7 +150,7 @@ void stdinTest4() {
 }
 
 int getw(FILE *);
-void getwTest() {
+void getwTest(void) {
   int i = getw(stdin); // expected-warning + {{tainted}}
 }
 
@@ -176,7 +176,7 @@ int atoi(const char *nptr);
 long atol(const char *nptr);
 long long atoll(const char *nptr);
 
-void atoiTest() {
+void atoiTest(void) {
   char s[80];
   scanf("%s", s);
   int d = atoi(s); // expected-warning + {{tainted}}
@@ -192,7 +192,7 @@ void atoiTest() {
 
 char *pointer1;
 void *pointer2;
-void noCrashTest() {
+void noCrashTest(void) {
   if (!*pointer1) {
     __builtin___memcpy_chk(pointer2, pointer1, 0, 0); // no-crash
   }

diff  --git a/clang/test/Analysis/test-after-div-zero.c b/clang/test/Analysis/test-after-div-zero.c
index 451c9adfee236..ea1fd786d1543 100644
--- a/clang/test/Analysis/test-after-div-zero.c
+++ b/clang/test/Analysis/test-after-div-zero.c
@@ -136,7 +136,7 @@ void ok_pif(int x) {
 
 int getValue(bool *isPositive);
 void use(int a);
-void foo() {
+void foo(void) {
   bool isPositive;
   int x = getValue(&isPositive);
   if (isPositive) {
@@ -147,8 +147,8 @@ void foo() {
   }
 }
 
-int getValue2();
-void foo2() {
+int getValue2(void);
+void foo2(void) {
   int x = getValue2();
   int y = x;
 

diff  --git a/clang/test/Analysis/test-include.c b/clang/test/Analysis/test-include.c
index 20aa2447850b9..1aa229c39706c 100644
--- a/clang/test/Analysis/test-include.c
+++ b/clang/test/Analysis/test-include.c
@@ -8,13 +8,13 @@ void test_01(int *data) {
   *data = 1; // expected-warning{{Dereference of null pointer}}
 }
 
-int test_02() {
+int test_02(void) {
   int res = DIVXY(1,0); // expected-warning{{Division by zero}}
                         // expected-warning at -1{{division by zero is undefined}}
   return res;
 }
 
-int test_03() {
+int test_03(void) {
   int res = DIVYX(0,1); // expected-warning{{Division by zero}}
                         // expected-warning at -1{{division by zero is undefined}}
   return res;

diff  --git a/clang/test/Analysis/track-control-dependency-conditions.m b/clang/test/Analysis/track-control-dependency-conditions.m
index 05b0638a5eb56..0f690bfe0362b 100644
--- a/clang/test/Analysis/track-control-dependency-conditions.m
+++ b/clang/test/Analysis/track-control-dependency-conditions.m
@@ -14,7 +14,7 @@ @interface J
 @property C *c;
 @end
 
-J *conjure_J();
+J *conjure_J(void);
 
 @implementation I
 - (void)bar {

diff  --git a/clang/test/Analysis/transparent_union_bug.c b/clang/test/Analysis/transparent_union_bug.c
index b6069c6a59b19..5f8a5a4a706ec 100644
--- a/clang/test/Analysis/transparent_union_bug.c
+++ b/clang/test/Analysis/transparent_union_bug.c
@@ -1,7 +1,7 @@
 // RUN: %clang_analyze_cc1 -analyze -triple x86_64-apple-darwin10 \
 // RUN:  -analyzer-checker=core,debug.ExprInspection -verify %s
 
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 
 typedef struct {
   int value;

diff  --git a/clang/test/Analysis/traversal-begin-end-function.c b/clang/test/Analysis/traversal-begin-end-function.c
index 9d46f26ce8f92..57d48e9b75413 100644
--- a/clang/test/Analysis/traversal-begin-end-function.c
+++ b/clang/test/Analysis/traversal-begin-end-function.c
@@ -3,7 +3,7 @@
 void inline_callee(int i);
 
 // CHECK: --BEGIN FUNCTION--
-void inline_caller() {
+void inline_caller(void) {
   // CHECK: --BEGIN FUNCTION--
   // CHECK: --BEGIN FUNCTION--
   // CHECK: --BEGIN FUNCTION--

diff  --git a/clang/test/Analysis/traversal-path-unification.c b/clang/test/Analysis/traversal-path-unification.c
index 28a15110f903e..e47e150d32d4d 100644
--- a/clang/test/Analysis/traversal-path-unification.c
+++ b/clang/test/Analysis/traversal-path-unification.c
@@ -1,9 +1,9 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,debug.DumpTraversal %s | FileCheck %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,debug.DumpTraversal -DUSE_EXPR %s | FileCheck %s
 
-int a();
-int b();
-int c();
+int a(void);
+int b(void);
+int c(void);
 
 #ifdef USE_EXPR
 #define CHECK(x) ((x) & 1)
@@ -12,7 +12,7 @@ int c();
 #endif
 
 // CHECK: --BEGIN FUNCTION--
-void testRemoveDeadBindings() {
+void testRemoveDeadBindings(void) {
   int i = a();
   if (CHECK(i))
     a();

diff  --git a/clang/test/Analysis/trustnonnullchecker_test.m b/clang/test/Analysis/trustnonnullchecker_test.m
index 4240502cbbdd3..5e09c4f6dde21 100644
--- a/clang/test/Analysis/trustnonnullchecker_test.m
+++ b/clang/test/Analysis/trustnonnullchecker_test.m
@@ -2,9 +2,9 @@
 
 #include "Inputs/system-header-simulator-for-nullability.h"
 
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 
-NSString* _Nonnull trust_nonnull_framework_annotation() {
+NSString* _Nonnull trust_nonnull_framework_annotation(void) {
   NSString* out = [NSString generateString];
   if (out) {}
   return out; // no-warning
@@ -31,33 +31,33 @@
   return out; // no-warning
 }
 
-NSString* _Nonnull trust_assume_nonnull_macro() {
+NSString* _Nonnull trust_assume_nonnull_macro(void) {
   NSString* out = [NSString generateImplicitlyNonnullString];
   if (out) {}
   return out; // no-warning
 }
 
-NSString* _Nonnull distrust_without_annotation() {
+NSString* _Nonnull distrust_without_annotation(void) {
   NSString* out = [NSString generatePossiblyNullString];
   if (out) {}
   return out; // expected-warning{{}}
 }
 
-NSString* _Nonnull nonnull_please_trust_me();
+NSString* _Nonnull nonnull_please_trust_me(void);
 
-NSString* _Nonnull distrust_local_nonnull_annotation() {
+NSString* _Nonnull distrust_local_nonnull_annotation(void) {
   NSString* out = nonnull_please_trust_me();
   if (out) {}
   return out; // expected-warning{{}}
 }
 
-NSString* _Nonnull trust_c_function() {
+NSString* _Nonnull trust_c_function(void) {
   NSString* out = getString();
   if (out) {};
   return out; // no-warning
 }
 
-NSString* _Nonnull distrust_unannoted_function() {
+NSString* _Nonnull distrust_unannoted_function(void) {
   NSString* out = getPossiblyNullString();
   if (out) {};
   return out; // expected-warning{{}}

diff  --git a/clang/test/Analysis/undef-buffers.c b/clang/test/Analysis/undef-buffers.c
index 70db8eb6e5516..b5058dc0ac914 100644
--- a/clang/test/Analysis/undef-buffers.c
+++ b/clang/test/Analysis/undef-buffers.c
@@ -8,13 +8,13 @@ typedef __typeof(sizeof(int)) size_t;
 void *malloc(size_t);
 void free(void *);
 
-char stackBased1 () {
+char stackBased1 (void) {
   char buf[2];
   buf[0] = 'a';
   return buf[1]; // expected-warning{{Undefined}}
 }
 
-char stackBased2 () {
+char stackBased2 (void) {
   char buf[2];
   buf[1] = 'a';
   return buf[0]; // expected-warning{{Undefined}}
@@ -31,7 +31,7 @@ char stackBased3 (int *x) {
   return buf[0];
 }
 
-char heapBased1 () {
+char heapBased1 (void) {
   char *buf = malloc(2);
   buf[0] = 'a';
   char result = buf[1]; // expected-warning{{undefined}}
@@ -39,7 +39,7 @@ char heapBased1 () {
   return result;
 }
 
-char heapBased2 () {
+char heapBased2 (void) {
   char *buf = malloc(2);
   buf[1] = 'a';
   char result = buf[0]; // expected-warning{{undefined}}

diff  --git a/clang/test/Analysis/undef-call.c b/clang/test/Analysis/undef-call.c
index c7aa844d79824..f560da104e561 100644
--- a/clang/test/Analysis/undef-call.c
+++ b/clang/test/Analysis/undef-call.c
@@ -4,10 +4,10 @@
 // expected-no-diagnostics
 
 struct S {
-  void (*fp)();
+  void (*fp)(void);
 };
 
-int main() {
+int main(void) {
   struct S s;
   // This will cause the analyzer to look for a function definition that has
   // no FunctionDecl. It used to cause a crash in AnyFunctionCall::getRuntimeDefinition.

diff  --git a/clang/test/Analysis/uninit-bug-first-iteration-init.c b/clang/test/Analysis/uninit-bug-first-iteration-init.c
index a0fae2950fed4..3b573ac280534 100644
--- a/clang/test/Analysis/uninit-bug-first-iteration-init.c
+++ b/clang/test/Analysis/uninit-bug-first-iteration-init.c
@@ -3,7 +3,7 @@
 // rdar://problem/44978988
 // expected-no-diagnostics
 
-int foo();
+int foo(void);
 
 int gTotal;
 

diff  --git a/clang/test/Analysis/uninit-const.c b/clang/test/Analysis/uninit-const.c
index c3f3e7f70d8e2..06fca22c83c6d 100644
--- a/clang/test/Analysis/uninit-const.c
+++ b/clang/test/Analysis/uninit-const.c
@@ -4,7 +4,7 @@
 // RUN:   -analyzer-checker=debug.ExprInspection \
 // RUN:   -analyzer-config core.CallAndMessage:ArgPointeeInitializedness=true
 
-void clang_analyzer_warnIfReached();
+void clang_analyzer_warnIfReached(void);
 
 // Passing uninitialized const data to function
 #include "Inputs/system-header-simulator.h"

diff  --git a/clang/test/Analysis/uninit-exhaustive-switch-bug.c b/clang/test/Analysis/uninit-exhaustive-switch-bug.c
index 634b00ce30bc4..c45e9e60e820f 100644
--- a/clang/test/Analysis/uninit-exhaustive-switch-bug.c
+++ b/clang/test/Analysis/uninit-exhaustive-switch-bug.c
@@ -3,9 +3,9 @@
 // rdar://problem/54359410
 // expected-no-diagnostics
 
-int rand();
+int rand(void);
 
-void test() {
+void test(void) {
   int offset = 0;
   int value;
   int test = rand();

diff  --git a/clang/test/Analysis/uninit-vals-union.c b/clang/test/Analysis/uninit-vals-union.c
index b433e7b0ef629..bccc77a4a4fee 100644
--- a/clang/test/Analysis/uninit-vals-union.c
+++ b/clang/test/Analysis/uninit-vals-union.c
@@ -6,7 +6,7 @@ typedef union {
 
 typedef struct { int x; } A;
 
-void foo() {
+void foo(void) {
   U u = {};
   A *a = &u; // expected-warning{{incompatible pointer types}}
   a->x;      // no-crash

diff  --git a/clang/test/Analysis/uninit-vals.c b/clang/test/Analysis/uninit-vals.c
index c0c6034e80328..6e65c757f564e 100644
--- a/clang/test/Analysis/uninit-vals.c
+++ b/clang/test/Analysis/uninit-vals.c
@@ -12,13 +12,13 @@ int f1_a(struct FPRec* foo) {
   return bar(x)+1; // no-warning
 }
 
-int f1_b() {
+int f1_b(void) {
   int x; // expected-note{{'x' declared without an initial value}}
   return bar(x)+1;  // expected-warning{{1st function call argument is an uninitialized value}}
                     // expected-note at -1{{1st function call argument is an uninitialized value}}
 }
 
-int f2() {
+int f2(void) {
   
   int x; // expected-note{{'x' declared without an initial value}}
   
@@ -29,7 +29,7 @@ int f2() {
   return 2;  
 }
 
-int f2_b() {
+int f2_b(void) {
   int x; // expected-note{{'x' declared without an initial value}}
   
   return ((1+x)+2+((x))) + 1 ? 1 : 2; // expected-warning{{The right operand of '+' is a garbage value}}
@@ -69,7 +69,7 @@ void f6(int x) {
                       // expected-note at -1{{The left operand of '==' is a garbage value due to array index out of bounds}}
 }
 
-int ret_uninit() {
+int ret_uninit(void) {
   int i; // expected-note{{'i' declared without an initial value}}
   int *p = &i;
   return *p;  // expected-warning{{Undefined or garbage value returned to caller}}
@@ -137,28 +137,28 @@ int pr4631_f1_b(void)
 
 // <rdar://problem/12278788> - FP when returning a void-valued expression from
 // a void function...or block.
-void foo_radar12278788() { return; }
-void test_radar12278788() {
+void foo_radar12278788(void) { return; }
+void test_radar12278788(void) {
   return foo_radar12278788(); // no-warning
 }
 
-void foo_radar12278788_fp() { return; }
-typedef int (*RetIntFuncType)();
-typedef void (*RetVoidFuncType)();
-int test_radar12278788_FP() {
+void foo_radar12278788_fp(void) { return; }
+typedef int (*RetIntFuncType)(void);
+typedef void (*RetVoidFuncType)(void);
+int test_radar12278788_FP(void) {
   RetVoidFuncType f = foo_radar12278788_fp;
   return ((RetIntFuncType)f)(); //expected-warning {{Undefined or garbage value returned to caller}}
                                 //expected-note at -1 {{Undefined or garbage value returned to caller}}
 }
 
-void rdar13665798() {
-  ^() {
+void rdar13665798(void) {
+  ^(void) {
     return foo_radar12278788(); // no-warning
   }();
-  ^void() {
+  ^void(void) {
     return foo_radar12278788(); // no-warning
   }();
-  ^int() { // expected-note{{Calling anonymous block}}
+  ^int(void) { // expected-note{{Calling anonymous block}}
     RetVoidFuncType f = foo_radar12278788_fp;
     return ((RetIntFuncType)f)(); //expected-warning {{Undefined or garbage value returned to caller}}
                                   //expected-note at -1 {{Undefined or garbage value returned to caller}}
@@ -169,7 +169,7 @@ struct Point {
   int x, y;
 };
 
-struct Point getHalfPoint() {
+struct Point getHalfPoint(void) {
   struct Point p;
   p.x = 0;
   return p;
@@ -177,13 +177,13 @@ struct Point getHalfPoint() {
 
 void use(struct Point p); 
 
-void testUseHalfPoint() {
+void testUseHalfPoint(void) {
   struct Point p = getHalfPoint(); // expected-note{{'p' initialized here}}
   use(p); // expected-warning{{uninitialized}}
           // expected-note at -1{{uninitialized}}
 }
 
-void testUseHalfPoint2() {
+void testUseHalfPoint2(void) {
   struct Point p;
   p = getHalfPoint(); // expected-note{{Value assigned to 'p'}}
   use(p); // expected-warning{{uninitialized}}

diff  --git a/clang/test/Analysis/uninit-vals.m b/clang/test/Analysis/uninit-vals.m
index b59f72b10770b..7e5f3355ccb5d 100644
--- a/clang/test/Analysis/uninit-vals.m
+++ b/clang/test/Analysis/uninit-vals.m
@@ -17,7 +17,7 @@
 
 void g(int);
 
-void f4() {
+void f4(void) {
   int a;
   if (global.data == 0)
     a = 3;
@@ -28,9 +28,9 @@ void f4() {
 
 // Test uninitialized value due to part of the structure being uninitialized.
 struct TestUninit { int x; int y; };
-struct TestUninit test_uninit_aux();
+struct TestUninit test_uninit_aux(void);
 void test_unit_aux2(int);
-void test_uninit_pos() {
+void test_uninit_pos(void) {
   struct TestUninit v1 = { 0, 0 };
   struct TestUninit v2 = test_uninit_aux();
   int z; // expected-note{{'z' declared without an initial value}}
@@ -38,27 +38,27 @@ void test_uninit_pos() {
             // expected-note at -1{{Assigned value is garbage or undefined}}
   test_unit_aux2(v2.x + v1.y);
 }
-void test_uninit_pos_2() {
+void test_uninit_pos_2(void) {
   struct TestUninit v1 = { 0, 0 };
   struct TestUninit v2;
   test_unit_aux2(v2.x + v1.y);  // expected-warning{{The left operand of '+' is a garbage value}}
                                 // expected-note at -1{{The left operand of '+' is a garbage value}}
 }
-void test_uninit_pos_3() {
+void test_uninit_pos_3(void) {
   struct TestUninit v1 = { 0, 0 };
   struct TestUninit v2;
   test_unit_aux2(v1.y + v2.x);  // expected-warning{{The right operand of '+' is a garbage value}}
                                 // expected-note at -1{{The right operand of '+' is a garbage value}}
 }
 
-void test_uninit_neg() {
+void test_uninit_neg(void) {
   struct TestUninit v1 = { 0, 0 };
   struct TestUninit v2 = test_uninit_aux();
   test_unit_aux2(v2.x + v1.y);
 }
 
 extern void test_uninit_struct_arg_aux(struct TestUninit arg);
-void test_uninit_struct_arg() {
+void test_uninit_struct_arg(void) {
   struct TestUninit x; // expected-note{{'x' initialized here}}
   test_uninit_struct_arg_aux(x); // expected-warning{{Passed-by-value struct argument contains uninitialized data (e.g., field: 'x')}}
                                  // expected-note at -1{{Passed-by-value struct argument contains uninitialized data (e.g., field: 'x')}}
@@ -75,7 +75,7 @@ void testFoo(Foo *o) {
 
 // Test case from <rdar://problem/7780304>.  That shows an uninitialized value
 // being used in the LHS of a compound assignment.
-void rdar_7780304() {
+void rdar_7780304(void) {
   typedef struct s_r7780304 { int x; } s_r7780304;
   s_r7780304 b;
   b.x |= 1; // expected-warning{{The left expression of the compound assignment is an uninitialized value. The computed value will also be garbage}}
@@ -157,7 +157,7 @@ Point makePoint(float x, float y) {
   return result;
 }
 
-void PR14765_test() {
+void PR14765_test(void) {
   Circle *testObj = calloc(sizeof(Circle), 1);
 
   clang_analyzer_eval(testObj->size == 0); // expected-warning{{TRUE}}
@@ -206,7 +206,7 @@ IntPoint makeIntPoint(int x, int y) {
   return result;
 }
 
-void PR14765_test_int() {
+void PR14765_test_int(void) {
   IntCircle *testObj = calloc(sizeof(IntCircle), 1);
 
   clang_analyzer_eval(testObj->size == 0); // expected-warning{{TRUE}}
@@ -289,7 +289,7 @@ IntPoint2D makeIntPoint2D(int x, int y) {
   return result;
 }
 
-void testSmallStructsCopiedPerField() {
+void testSmallStructsCopiedPerField(void) {
   IntPoint2D a;
   a.x = 0;
 
@@ -300,7 +300,7 @@ void testSmallStructsCopiedPerField() {
                // expected-note at -1{{uninitialized}}
 }
 
-void testLargeStructsNotCopiedPerField() {
+void testLargeStructsNotCopiedPerField(void) {
   IntPoint a;
   a.x = 0;
 
@@ -310,7 +310,7 @@ void testLargeStructsNotCopiedPerField() {
   useInt(b.y); // no-warning
 }
 
-void testSmallStructInLargerStruct() {
+void testSmallStructInLargerStruct(void) {
   IntCircle2D *testObj = calloc(sizeof(IntCircle2D), 1);
 
   clang_analyzer_eval(testObj->size == 0); // expected-warning{{TRUE}}
@@ -352,7 +352,7 @@ void testCopySmallStructIntoArgument(IntCircle2D *testObj) {
                                                // expected-note at -1{{TRUE}}
 }
 
-void testSmallStructBitfields() {
+void testSmallStructBitfields(void) {
   struct {
     int x : 4;
     int y : 4;
@@ -368,7 +368,7 @@ void testSmallStructBitfields() {
                                  // expected-note at -1{{TRUE}}
 }
 
-void testSmallStructBitfieldsFirstUndef() {
+void testSmallStructBitfieldsFirstUndef(void) {
   struct {
     int x : 4;
     int y : 4;
@@ -383,7 +383,7 @@ void testSmallStructBitfieldsFirstUndef() {
                                  // expected-note at -1{{garbage}}
 }
 
-void testSmallStructBitfieldsSecondUndef() {
+void testSmallStructBitfieldsSecondUndef(void) {
   struct {
     int x : 4;
     int y : 4;
@@ -398,7 +398,7 @@ void testSmallStructBitfieldsSecondUndef() {
                                  // expected-note at -1{{garbage}}
 }
 
-void testSmallStructBitfieldsFirstUnnamed() {
+void testSmallStructBitfieldsFirstUnnamed(void) {
   struct {
     int : 4;
     int y : 4;
@@ -415,7 +415,7 @@ void testSmallStructBitfieldsFirstUnnamed() {
                                  // expected-note at -1{{garbage}}
 }
 
-void testSmallStructBitfieldsSecondUnnamed() {
+void testSmallStructBitfieldsSecondUnnamed(void) {
   struct {
     int x : 4;
     int : 4;

diff  --git a/clang/test/Analysis/unix-fns.c b/clang/test/Analysis/unix-fns.c
index c526f1b3e4fdb..670c8c256b9c6 100644
--- a/clang/test/Analysis/unix-fns.c
+++ b/clang/test/Analysis/unix-fns.c
@@ -100,28 +100,28 @@ void test_open_at(int directory_fd, const char *relative_path) {
     close(fd);
 }
 
-void test_dispatch_once() {
+void test_dispatch_once(void) {
   dispatch_once_t pred = 0;
-  do { if (__builtin_expect(*(&pred), ~0l) != ~0l) dispatch_once((&pred), (^() {})); } while (0); // expected-warning{{Call to 'dispatch_once' uses the local variable 'pred' for the predicate value}}
+  do { if (__builtin_expect(*(&pred), ~0l) != ~0l) dispatch_once((&pred), (^(void) {})); } while (0); // expected-warning{{Call to 'dispatch_once' uses the local variable 'pred' for the predicate value}}
 }
-void test_dispatch_once_neg() {
+void test_dispatch_once_neg(void) {
   static dispatch_once_t pred = 0;
-  do { if (__builtin_expect(*(&pred), ~0l) != ~0l) dispatch_once((&pred), (^() {})); } while (0); // no-warning
+  do { if (__builtin_expect(*(&pred), ~0l) != ~0l) dispatch_once((&pred), (^(void) {})); } while (0); // no-warning
 }
 
-void test_pthread_once_aux();
+void test_pthread_once_aux(void);
 
-void test_pthread_once() {
+void test_pthread_once(void) {
   pthread_once_t pred = {0x30B1BCBA, {0}};
   pthread_once(&pred, test_pthread_once_aux); // expected-warning{{Call to 'pthread_once' uses the local variable 'pred' for the "control" value}}
 }
-void test_pthread_once_neg() {
+void test_pthread_once_neg(void) {
   static pthread_once_t pred = {0x30B1BCBA, {0}};
   pthread_once(&pred, test_pthread_once_aux); // no-warning
 }
 
 // PR 2899 - warn of zero-sized allocations to malloc().
-void pr2899() {
+void pr2899(void) {
   char* foo = malloc(0); // expected-warning{{Call to 'malloc' has an allocation size of 0 bytes}}
   for (unsigned i = 0; i < 100; i++) {
     foo[i] = 0;
@@ -175,7 +175,7 @@ void test_reallocf_nowarn(char *ptr, size_t size) {
     foo[i] = 0;
   }
 }
-void test_alloca() {
+void test_alloca(void) {
   char *foo = alloca(0); // expected-warning{{Call to 'alloca' has an allocation size of 0 bytes}}
   for(unsigned i = 0; i < 100; i++) {
     foo[i] = 0; 
@@ -187,7 +187,7 @@ void test_alloca_nowarn(size_t sz) {
     foo[i] = 0;
   }
 }
-void test_builtin_alloca() {
+void test_builtin_alloca(void) {
   char *foo2 = __builtin_alloca(0); // expected-warning{{Call to 'alloca' has an allocation size of 0 bytes}}
   for(unsigned i = 0; i < 100; i++) {
     foo2[i] = 0; 
@@ -199,7 +199,7 @@ void test_builtin_alloca_nowarn(size_t sz) {
     foo2[i] = 0;
   }
 }
-void test_valloc() {
+void test_valloc(void) {
   char *foo = valloc(0); // expected-warning{{Call to 'valloc' has an allocation size of 0 bytes}}
   for(unsigned i = 0; i < 100; i++) {
     foo[i] = 0; 
@@ -212,9 +212,9 @@ void test_valloc_nowarn(size_t sz) {
   }
 }
 
-void test_dispatch_once_in_macro() {
+void test_dispatch_once_in_macro(void) {
   dispatch_once_t pred = 0;
-  dispatch_once(&pred, ^(){});  // expected-warning {{Call to 'dispatch_once' uses the local variable 'pred' for the predicate value}}
+  dispatch_once(&pred, ^(void){});  // expected-warning {{Call to 'dispatch_once' uses the local variable 'pred' for the predicate value}}
 }
 
 // Test inlining of dispatch_sync.
@@ -228,7 +228,7 @@ void test_dispatch_sync(dispatch_queue_t queue, int *q) {
 }
 
 // Test inlining of dispatch_once.
-void test_inline_dispatch_once() {
+void test_inline_dispatch_once(void) {
   static dispatch_once_t pred;
   int *p = 0;
   dispatch_once(&pred, ^(void) {
@@ -237,7 +237,7 @@ void test_inline_dispatch_once() {
 }
 
 // Make sure code after call to dispatch once is reached.
-void test_inline_dispatch_once_reachable() {
+void test_inline_dispatch_once_reachable(void) {
   static dispatch_once_t pred;
   __block int *p;
   dispatch_once(&pred, ^(void) {

diff  --git a/clang/test/Analysis/unreachable-code-path.c b/clang/test/Analysis/unreachable-code-path.c
index 95cc4eab50db4..59bca576cc0ab 100644
--- a/clang/test/Analysis/unreachable-code-path.c
+++ b/clang/test/Analysis/unreachable-code-path.c
@@ -34,7 +34,7 @@ void test3(unsigned a) {
 
 // These next tests are path-sensitive
 
-void test4() {
+void test4(void) {
   int a = 5;
 
   while (a > 1)
@@ -69,7 +69,7 @@ void test6(const char *c) {
 // Compile-time constant false positives
 #define CONSTANT 0
 enum test_enum { Off, On };
-void test7() {
+void test7(void) {
   if (CONSTANT)
     return; // no-warning
 
@@ -80,7 +80,7 @@ void test7() {
     return; // no-warning
 }
 
-void test8() {
+void test8(void) {
   static unsigned a = 0;
 
   if (a)
@@ -105,7 +105,7 @@ void test9(unsigned a) {
 }
 
 // Tests from flow-sensitive version
-void test10() {
+void test10(void) {
   goto c;
   d:
   goto e; // expected-warning {{never executed}}
@@ -127,7 +127,7 @@ void test10() {
 // test11: we can actually end up in the default case, even if it is not
 // obvious: there might be something wrong with the given argument.
 enum foobar { FOO, BAR };
-extern void error();
+extern void error(void);
 void test11(enum foobar fb) {
   switch (fb) {
     case FOO:
@@ -149,8 +149,8 @@ void inlined(int condition) {
   }
 }
 
-void testInlined() {
-  extern int coin();
+void testInlined(void) {
+  extern int coin(void);
   int cond = coin();
   if (!cond) {
     inlined(0);

diff  --git a/clang/test/Analysis/unused-ivars.m b/clang/test/Analysis/unused-ivars.m
index 8f12d9b18a7d3..90e36d527af7c 100644
--- a/clang/test/Analysis/unused-ivars.m
+++ b/clang/test/Analysis/unused-ivars.m
@@ -33,13 +33,13 @@ @interface TestB : NSObject {
 @implementation TestB
 - (id)ivar {
   __attribute__((__blocks__(byref))) id value = ((void*)0);
-  void (^b)() = ^{ value = _ivar; };
+  void (^b)(void) = ^{ value = _ivar; };
   b();
   return value;
 }
 
 - (void)setIvar:(id)newValue {
-  void (^b)() = ^{ [_ivar release]; _ivar = [newValue retain]; };
+  void (^b)(void) = ^{ [_ivar release]; _ivar = [newValue retain]; };
   b();
 }
 @end

diff  --git a/clang/test/Analysis/vector.m b/clang/test/Analysis/vector.m
index e74c487d3a606..fbdb6b30d5808 100644
--- a/clang/test/Analysis/vector.m
+++ b/clang/test/Analysis/vector.m
@@ -2,8 +2,8 @@
 
 typedef int __attribute__((ext_vector_type(2))) V;
 
-void clang_analyzer_warnIfReached();
-void clang_analyzer_numTimesReached();
+void clang_analyzer_warnIfReached(void);
+void clang_analyzer_numTimesReached(void);
 void clang_analyzer_eval(int);
 
 int flag;
@@ -28,7 +28,7 @@ V dont_crash_and_dont_split_state(V x, V y) {
   return z;
 }
 
-void test_read() {
+void test_read(void) {
   V x;
   x[0] = 0;
   x[1] = 1;
@@ -36,14 +36,14 @@ void test_read() {
   clang_analyzer_eval(x[0] == 0); // expected-warning{{TRUE}}
 }
 
-V return_vector() {
+V return_vector(void) {
   V z;
   z[0] = 0;
   z[1] = 0;
   return z;
 }
 
-int test_vector_access() {
+int test_vector_access(void) {
   return return_vector()[0]; // no-crash no-warning
 }
 

diff  --git a/clang/test/Analysis/vfork.c b/clang/test/Analysis/vfork.c
index 861e622a6d067..2a4602c064606 100644
--- a/clang/test/Analysis/vfork.c
+++ b/clang/test/Analysis/vfork.c
@@ -3,7 +3,7 @@
 
 #include "Inputs/system-header-simulator.h"
 
-void foo();
+void foo(void);
 
 // Ensure that child process is properly checked.
 int f1(int x, int y) {
@@ -125,7 +125,7 @@ void f4(int x) {
 } //no-warning
 
 
-void f5() {
+void f5(void) {
   // See "libxtables: move some code to avoid cautions in vfork man page"
   // (http://lists.netfilter.org/pipermail/netfilter-buglog/2014-October/003280.html).
   if (vfork() == 0) { // expected-warning{{Call to function 'vfork' is insecure}}

diff  --git a/clang/test/Analysis/vla-overflow.c b/clang/test/Analysis/vla-overflow.c
index 8c9c626bc04cf..ec04cbb08e4c1 100644
--- a/clang/test/Analysis/vla-overflow.c
+++ b/clang/test/Analysis/vla-overflow.c
@@ -13,12 +13,12 @@ size_t check_VLA_overflow_sizeof(unsigned int x) {
   return 0;
 }
 
-void check_VLA_overflow_typedef() {
+void check_VLA_overflow_typedef(void) {
   unsigned int x = BIGINDEX;
   typedef char VLA[x][x][x][x]; // expected-warning{{Declared variable-length array (VLA) has too large size [core.VLASize]}}
 }
 
-void check_VLA_no_overflow() {
+void check_VLA_no_overflow(void) {
   unsigned int x = BIGINDEX;
   typedef char VLA[x][x][x][x - 1];
   typedef char VLA1[0xffffffffu];

diff  --git a/clang/test/Analysis/vla.c b/clang/test/Analysis/vla.c
index 457c14172310c..e32fe63c93140 100644
--- a/clang/test/Analysis/vla.c
+++ b/clang/test/Analysis/vla.c
@@ -12,7 +12,7 @@ void check_zero_sized_VLA(int x) {
   int vla[x]; // expected-warning{{Declared variable-length array (VLA) has zero size}}
 }
 
-void check_uninit_sized_VLA() {
+void check_uninit_sized_VLA(void) {
   int x;
   int vla[x]; // expected-warning{{Declared variable-length array (VLA) uses a garbage value as its size}}
 }
@@ -26,45 +26,45 @@ static void vla_allocate_unsigned(unsigned short x) {
   int vla[x]; // no-warning
 }
 
-void check_negative_sized_VLA_1() {
+void check_negative_sized_VLA_1(void) {
   vla_allocate_signed(-1);
 }
 
-void check_negative_sized_VLA_2() {
+void check_negative_sized_VLA_2(void) {
   vla_allocate_unsigned(-1);
 }
 
-void check_negative_sized_VLA_3() {
+void check_negative_sized_VLA_3(void) {
   short x = -1;
   int vla[x]; // expected-warning{{Declared variable-length array (VLA) has negative size}}
 }
 
-void check_negative_sized_VLA_4() {
+void check_negative_sized_VLA_4(void) {
   unsigned short x = -1;
   int vla[x]; // no-warning
 }
 
-void check_negative_sized_VLA_5() {
+void check_negative_sized_VLA_5(void) {
   signed char x = -1;
   int vla[x]; // expected-warning{{Declared variable-length array (VLA) has negative size}}
 }
 
-void check_negative_sized_VLA_6() {
+void check_negative_sized_VLA_6(void) {
   unsigned char x = -1;
   int vla[x]; // no-warning
 }
 
-void check_negative_sized_VLA_7() {
+void check_negative_sized_VLA_7(void) {
   signed char x = -1;
   int vla[x + 2]; // no-warning
 }
 
-void check_negative_sized_VLA_8() {
+void check_negative_sized_VLA_8(void) {
   signed char x = 1;
   int vla[x - 2]; // expected-warning{{Declared variable-length array (VLA) has negative size}}
 }
 
-void check_negative_sized_VLA_9() {
+void check_negative_sized_VLA_9(void) {
   int x = 1;
   int vla[x]; // no-warning
 }
@@ -89,12 +89,12 @@ void check_negative_sized_VLA_11(short x) {
     check_negative_sized_VLA_11_sub(x);
 }
 
-void check_VLA_typedef() {
+void check_VLA_typedef(void) {
   int x = -1;
   typedef int VLA[x]; // expected-warning{{Declared variable-length array (VLA) has negative size}}
 }
 
-size_t check_VLA_sizeof() {
+size_t check_VLA_sizeof(void) {
   int x = -1;
   size_t s = sizeof(int[x]); // expected-warning{{Declared variable-length array (VLA) has negative size}}
   return s;
@@ -118,7 +118,7 @@ void check_zero_sized_VLA_multi2(int x, int y) {
 
 // Check the extent.
 
-void check_VLA_extent() {
+void check_VLA_extent(void) {
   int x = 3;
 
   int vla1[x];
@@ -143,7 +143,7 @@ void check_VLA_extent() {
 // Just don't crash.
 extern void foo(void);
 int a;
-void b() {
+void b(void) {
   int c = a + 1;
   for (;;) {
     int d[c];

diff  --git a/clang/test/Analysis/weak-functions.c b/clang/test/Analysis/weak-functions.c
index c29ac21d245db..b2f297efed008 100644
--- a/clang/test/Analysis/weak-functions.c
+++ b/clang/test/Analysis/weak-functions.c
@@ -1,10 +1,10 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.core,debug.ExprInspection,unix.Malloc,unix.cstring,alpha.unix.cstring,unix.API,osx.API,osx.cocoa.RetainCount -Wno-null-dereference -Wno-tautological-compare -analyzer-store=region -fblocks -verify -analyzer-config eagerly-assume=false %s
 #define NULL 0
 void clang_analyzer_eval(int);
-void myFunc();
-void myWeakFunc() __attribute__((weak_import));
+void myFunc(void);
+void myWeakFunc(void) __attribute__((weak_import));
 
-void testWeakFuncIsNull()
+void testWeakFuncIsNull(void)
 {
   clang_analyzer_eval(myFunc == NULL);  // expected-warning{{FALSE}}
   clang_analyzer_eval(myWeakFunc == NULL);  // expected-warning{{UNKNOWN}}
@@ -15,7 +15,7 @@ void testWeakFuncIsNull()
   }
 }
 
-void testWeakFuncIsNot()
+void testWeakFuncIsNot(void)
 {
   clang_analyzer_eval(myWeakFunc == NULL);  // expected-warning{{UNKNOWN}}
   if (!myWeakFunc) {
@@ -25,7 +25,7 @@ void testWeakFuncIsNot()
   }
 }
 
-void testWeakFuncIsTrue()
+void testWeakFuncIsTrue(void)
 {
     clang_analyzer_eval(myWeakFunc == NULL);  // expected-warning{{UNKNOWN}}
     if (myWeakFunc) {
@@ -51,7 +51,7 @@ void f(void) {
 
 void g(void (*fp)(void));
 
-void f2() {
+void f2(void) {
   g(f);
 }
 
@@ -70,7 +70,7 @@ void f3(void (*f)(void), void (*g)(void)) {
 //===----------------------------------------------------------------------===
 void free(void *) __attribute__((weak_import));
 
-void t10 () {
+void t10 (void) {
   free((void*)&t10);
   // expected-warning at -1{{Argument to free() is the address of the function 't10', which is not memory allocated by malloc()}}
   // expected-warning at -2{{attempt to call free on non-heap object 't10'}}
@@ -82,7 +82,7 @@ void t10 () {
 typedef typeof(sizeof(int)) size_t;
 size_t strlen(const char *s) __attribute__((weak_import));
 
-size_t strlen_fn() {
+size_t strlen_fn(void) {
   return strlen((char*)&strlen_fn); // expected-warning{{Argument to string length function is the address of the function 'strlen_fn', which is not a null-terminated string}}
 }
 
@@ -93,27 +93,27 @@ typedef void (^dispatch_block_t)(void);
 typedef long dispatch_once_t;
 void dispatch_once(dispatch_once_t *predicate, dispatch_block_t block) __attribute__((weak_import));
 
-void test_dispatch_once() {
+void test_dispatch_once(void) {
   dispatch_once_t pred = 0;
-  do { if (__builtin_expect(*(&pred), ~0l) != ~0l) dispatch_once((&pred), (^() {})); } while (0); // expected-warning{{Call to 'dispatch_once' uses the local variable 'pred' for the predicate value}}
+  do { if (__builtin_expect(*(&pred), ~0l) != ~0l) dispatch_once((&pred), (^(void) {})); } while (0); // expected-warning{{Call to 'dispatch_once' uses the local variable 'pred' for the predicate value}}
 }
-void test_dispatch_once_neg() {
+void test_dispatch_once_neg(void) {
   static dispatch_once_t pred = 0;
-  do { if (__builtin_expect(*(&pred), ~0l) != ~0l) dispatch_once((&pred), (^() {})); } while (0); // no-warning
+  do { if (__builtin_expect(*(&pred), ~0l) != ~0l) dispatch_once((&pred), (^(void) {})); } while (0); // no-warning
 }
 
 //===----------------------------------------------------------------------===
 // retain-release-path-notes.m
 //===----------------------------------------------------------------------===
 typedef struct CFType *CFTypeRef;
-CFTypeRef CFCreateSomething() __attribute__((weak_import));
-CFTypeRef CFGetSomething() __attribute__((weak_import));
+CFTypeRef CFCreateSomething(void) __attribute__((weak_import));
+CFTypeRef CFGetSomething(void) __attribute__((weak_import));
 
-CFTypeRef CFCopyRuleViolation () {
+CFTypeRef CFCopyRuleViolation (void) {
   CFTypeRef object = CFGetSomething();
   return object; // expected-warning{{Object with a +0 retain count returned to caller where a +1 (owning) retain count is expected}}
 }
 
-CFTypeRef CFGetRuleViolation () {
+CFTypeRef CFGetRuleViolation (void) {
   CFTypeRef object = CFCreateSomething(); // expected-warning{{Potential leak of an object stored into 'object'}}
   return object; }

diff  --git a/clang/test/Analysis/yaccignore.c b/clang/test/Analysis/yaccignore.c
index c19356d921d13..87c012d9bbdff 100644
--- a/clang/test/Analysis/yaccignore.c
+++ b/clang/test/Analysis/yaccignore.c
@@ -8,7 +8,7 @@
 
 /* A Bison parser, made by GNU Bison 1.875.  */
 
-void clang_analyzer_warnIfReached();
-void foo() {
+void clang_analyzer_warnIfReached(void);
+void foo(void) {
   clang_analyzer_warnIfReached(); // conditional-warning {{REACHABLE}}
 }

diff  --git a/clang/test/Analysis/z3/apsint.c b/clang/test/Analysis/z3/apsint.c
index 670ef2be1c599..3e5792bc40d0a 100644
--- a/clang/test/Analysis/z3/apsint.c
+++ b/clang/test/Analysis/z3/apsint.c
@@ -2,13 +2,13 @@
 // expected-no-diagnostics
 
 // https://bugs.llvm.org/show_bug.cgi?id=37622
-_Bool a() {
+_Bool a(void) {
   return !({ a(); });
 }
 
 // https://bugs.llvm.org/show_bug.cgi?id=37646
 _Bool b;
-void c() {
+void c(void) {
   _Bool a = b | 0;
   for (;;)
     if (a)

diff  --git a/clang/test/CodeGen/2002-01-24-ComplexSpaceInType.c b/clang/test/CodeGen/2002-01-24-ComplexSpaceInType.c
index 9af533dfa414a..5a1fb33a22bd9 100644
--- a/clang/test/CodeGen/2002-01-24-ComplexSpaceInType.c
+++ b/clang/test/CodeGen/2002-01-24-ComplexSpaceInType.c
@@ -8,4 +8,4 @@
 
 struct { int X, Y; } Array[10];
 
-void foo() {}
+void foo(void) {}

diff  --git a/clang/test/CodeGen/2002-02-13-TypeVarNameCollision.c b/clang/test/CodeGen/2002-02-13-TypeVarNameCollision.c
index c76aef05109f5..560b1d8566b4d 100644
--- a/clang/test/CodeGen/2002-02-13-TypeVarNameCollision.c
+++ b/clang/test/CodeGen/2002-02-13-TypeVarNameCollision.c
@@ -10,7 +10,7 @@ typedef struct foo {
 
 static FOO foo[100];
 
-int test() {
+int test(void) {
   return foo[4].Y;
 }
 

diff  --git a/clang/test/CodeGen/2002-02-13-UnnamedLocal.c b/clang/test/CodeGen/2002-02-13-UnnamedLocal.c
index 58a9f5ab1c0b5..6aada23b286f0 100644
--- a/clang/test/CodeGen/2002-02-13-UnnamedLocal.c
+++ b/clang/test/CodeGen/2002-02-13-UnnamedLocal.c
@@ -13,7 +13,7 @@ typedef struct {
 
 int foo(foostruct ic);
 
-void test() {
+void test(void) {
   foostruct xqic;
   foo(xqic);
 }

diff  --git a/clang/test/CodeGen/2002-02-17-ArgumentAddress.c b/clang/test/CodeGen/2002-02-17-ArgumentAddress.c
index d1ad6a885ee16..f3a7b91af236e 100644
--- a/clang/test/CodeGen/2002-02-17-ArgumentAddress.c
+++ b/clang/test/CodeGen/2002-02-17-ArgumentAddress.c
@@ -27,7 +27,7 @@ struct Test Test4(struct Test A) {
   return A;
 }
 
-int Test6() {
+int Test6(void) {
   int B[200];
   return B[4];
 }

diff  --git a/clang/test/CodeGen/2002-02-18-64bitConstant.c b/clang/test/CodeGen/2002-02-18-64bitConstant.c
index 95da72dc30a3d..5a04be4d37f51 100644
--- a/clang/test/CodeGen/2002-02-18-64bitConstant.c
+++ b/clang/test/CodeGen/2002-02-18-64bitConstant.c
@@ -4,7 +4,7 @@
 
 int printf(const char * restrict format, ...);
 
-int main() {
+int main(void) {
   long long Var = 123455678902ll;
   printf("%lld\n", Var);
 }

diff  --git a/clang/test/CodeGen/2002-03-14-BrokenSSA.c b/clang/test/CodeGen/2002-03-14-BrokenSSA.c
index 65e5cfad815ee..1c83c8c948046 100644
--- a/clang/test/CodeGen/2002-03-14-BrokenSSA.c
+++ b/clang/test/CodeGen/2002-03-14-BrokenSSA.c
@@ -4,8 +4,8 @@
    uses of B & C that are not dominated by their definitions.  See:
    http://gcc.gnu.org/ml/gcc/2002-03/msg00697.html
  */
-int bar();
-int foo()
+int bar(void);
+int foo(void)
 {
   int a,b,c;
 

diff  --git a/clang/test/CodeGen/2002-03-14-QuotesInStrConst.c b/clang/test/CodeGen/2002-03-14-QuotesInStrConst.c
index de4bdd6580780..85773e38d4df7 100644
--- a/clang/test/CodeGen/2002-03-14-QuotesInStrConst.c
+++ b/clang/test/CodeGen/2002-03-14-QuotesInStrConst.c
@@ -5,6 +5,6 @@
  *  %.LC1 = internal global [32 x sbyte] c"*** Word "%s" on line %d is not\00"
  */
 
-const char *Foo() {
+const char *Foo(void) {
   return "*** Word \"%s\" on line %d is not";
 }

diff  --git a/clang/test/CodeGen/2002-04-07-SwitchStmt.c b/clang/test/CodeGen/2002-04-07-SwitchStmt.c
index cf1ec79b08a59..b088333ebfa32 100644
--- a/clang/test/CodeGen/2002-04-07-SwitchStmt.c
+++ b/clang/test/CodeGen/2002-04-07-SwitchStmt.c
@@ -1,9 +1,9 @@
 // RUN: %clang_cc1 -emit-llvm %s  -o /dev/null
 
 int printf(const char *, ...);
-int foo();
+int foo(void);
 
-int main() {
+int main(void) {
   while (foo()) {
      switch (foo()) {
      case 0:

diff  --git a/clang/test/CodeGen/2002-05-23-StaticValues.c b/clang/test/CodeGen/2002-05-23-StaticValues.c
index b8c25b73c71ff..4f179ce331016 100644
--- a/clang/test/CodeGen/2002-05-23-StaticValues.c
+++ b/clang/test/CodeGen/2002-05-23-StaticValues.c
@@ -9,7 +9,7 @@ static void foo(int Z) {
   Y = Z;
 }
 
-void *test() {
+void *test(void) {
   foo(12);
   return &Y;
 }

diff  --git a/clang/test/CodeGen/2002-06-25-FWriteInterfaceFailure.c b/clang/test/CodeGen/2002-06-25-FWriteInterfaceFailure.c
index 24c67d1520a13..8bdce6bb1a058 100644
--- a/clang/test/CodeGen/2002-06-25-FWriteInterfaceFailure.c
+++ b/clang/test/CodeGen/2002-06-25-FWriteInterfaceFailure.c
@@ -4,6 +4,6 @@ typedef struct _IO_FILE FILE;
 extern FILE *stderr;
 int fprintf(FILE * restrict stream, const char * restrict format, ...);
 
-void test() {
+void test(void) {
   fprintf(stderr, "testing\n");
 }

diff  --git a/clang/test/CodeGen/2002-07-14-MiscListTests.c b/clang/test/CodeGen/2002-07-14-MiscListTests.c
index 901701a176548..243a1962d06eb 100644
--- a/clang/test/CodeGen/2002-07-14-MiscListTests.c
+++ b/clang/test/CodeGen/2002-07-14-MiscListTests.c
@@ -21,7 +21,7 @@ typedef struct list {
 
 list *Data;
 
-void foo() {
+void foo(void) {
   static int Foo = 0;            // Test static local variable
   Foo += 1;                      // Increment static variable
 
@@ -56,7 +56,7 @@ list *FindData(list *L, int Data) {
 void foundIt(void);
 
 // Driver fn...
-void DoListStuff() {
+void DoListStuff(void) {
   list *MyList = 0;
   InsertIntoListTail(&MyList, 100);
   InsertIntoListTail(&MyList, 12);

diff  --git a/clang/test/CodeGen/2002-07-17-StringConstant.c b/clang/test/CodeGen/2002-07-17-StringConstant.c
index 5b86a5b7dff65..7cc5cc5f3db24 100644
--- a/clang/test/CodeGen/2002-07-17-StringConstant.c
+++ b/clang/test/CodeGen/2002-07-17-StringConstant.c
@@ -1,4 +1,4 @@
 // RUN: %clang_cc1 -emit-llvm %s  -o /dev/null
 
 
-char * foo() { return "\\begin{"; }
+char * foo(void) { return "\\begin{"; }

diff  --git a/clang/test/CodeGen/2002-07-30-SubregSetAssertion.c b/clang/test/CodeGen/2002-07-30-SubregSetAssertion.c
index 39e97b3b4aecc..b66442d1faf30 100644
--- a/clang/test/CodeGen/2002-07-30-SubregSetAssertion.c
+++ b/clang/test/CodeGen/2002-07-30-SubregSetAssertion.c
@@ -5,7 +5,7 @@ union X {
   void *B;
 };
 
-union X foo() {
+union X foo(void) {
   union X A;
   A.B = (void*)123;
   return A;

diff  --git a/clang/test/CodeGen/2002-07-30-VarArgsCallFailure.c b/clang/test/CodeGen/2002-07-30-VarArgsCallFailure.c
index 784305d6d3b6f..7a01304c59c0e 100644
--- a/clang/test/CodeGen/2002-07-30-VarArgsCallFailure.c
+++ b/clang/test/CodeGen/2002-07-30-VarArgsCallFailure.c
@@ -2,7 +2,7 @@
 
 int tcount;
 void test(char *, const char*, int);
-void foo() {
+void foo(void) {
   char Buf[10];
   test(Buf, "n%%%d", tcount++);
 }

diff  --git a/clang/test/CodeGen/2002-07-31-SubregFailure.c b/clang/test/CodeGen/2002-07-31-SubregFailure.c
index 5c7f38f005799..f66be4e7f8109 100644
--- a/clang/test/CodeGen/2002-07-31-SubregFailure.c
+++ b/clang/test/CodeGen/2002-07-31-SubregFailure.c
@@ -5,7 +5,7 @@ typedef union {
    long (*ap)[4];
 } ptrs;
 
-void DoAssignIteration() {
+void DoAssignIteration(void) {
   ptrs abase;
   abase.ap+=27;
   Assignment(*abase.ap);

diff  --git a/clang/test/CodeGen/2002-08-02-UnionTest.c b/clang/test/CodeGen/2002-08-02-UnionTest.c
index 2be149909be5f..6686e0a63c7d2 100644
--- a/clang/test/CodeGen/2002-08-02-UnionTest.c
+++ b/clang/test/CodeGen/2002-08-02-UnionTest.c
@@ -7,13 +7,13 @@ int printf(const char * restrict format, ...);
 
 union X { char X; void *B; int a, b, c, d;};
 
-union X foo() {
+union X foo(void) {
   union X Global;
   Global.B = (void*)123;   /* Interesting part */
   return Global;
 }
 
-int main() {
+int main(void) {
   union X test = foo();
   printf("0x%p", test.B);
 }

diff  --git a/clang/test/CodeGen/2002-09-19-StarInLabel.c b/clang/test/CodeGen/2002-09-19-StarInLabel.c
index e046e2b002978..a34fc8969073f 100644
--- a/clang/test/CodeGen/2002-09-19-StarInLabel.c
+++ b/clang/test/CodeGen/2002-09-19-StarInLabel.c
@@ -1,9 +1,9 @@
 // RUN: %clang_cc1 -emit-llvm %s  -o /dev/null
 
-extern void start() __asm__("start");
-extern void _start() __asm__("_start");
-extern void __start() __asm__("__start");
-void start() {}
-void _start() {}
-void __start() {}
+extern void start(void) __asm__("start");
+extern void _start(void) __asm__("_start");
+extern void __start(void) __asm__("__start");
+void start(void) {}
+void _start(void) {}
+void __start(void) {}
 

diff  --git a/clang/test/CodeGen/2002-10-12-TooManyArguments.c b/clang/test/CodeGen/2002-10-12-TooManyArguments.c
index 2324c2aa46624..2ea413fb30c86 100644
--- a/clang/test/CodeGen/2002-10-12-TooManyArguments.c
+++ b/clang/test/CodeGen/2002-10-12-TooManyArguments.c
@@ -3,6 +3,6 @@
 
 void foo() {}
 
-void bar() {
+void bar(void) {
   foo(1, 2, 3);  /* Too many arguments passed */
 }

diff  --git a/clang/test/CodeGen/2002-12-15-StructParameters.c b/clang/test/CodeGen/2002-12-15-StructParameters.c
index f6b59de7f0a61..4f0e41e5847af 100644
--- a/clang/test/CodeGen/2002-12-15-StructParameters.c
+++ b/clang/test/CodeGen/2002-12-15-StructParameters.c
@@ -10,7 +10,7 @@ typedef struct
 void foo(void*);
 void bar(compile_stack_type T, unsigned);
 
-void test() {
+void test(void) {
   compile_stack_type CST;
   foo(&CST);
 

diff  --git a/clang/test/CodeGen/2003-06-26-CFECrash.c b/clang/test/CodeGen/2003-06-26-CFECrash.c
index dd874b7b4547b..aef3aa0253448 100644
--- a/clang/test/CodeGen/2003-06-26-CFECrash.c
+++ b/clang/test/CodeGen/2003-06-26-CFECrash.c
@@ -13,7 +13,7 @@ typedef struct Globals {
 
 extern Uz_Globs G;
 
-int extract_or_test_files() {  
+int extract_or_test_files(void) {  
   G.pInfo = G.info;
 }
 

diff  --git a/clang/test/CodeGen/2003-06-29-MultipleFunctionDefinition.c b/clang/test/CodeGen/2003-06-29-MultipleFunctionDefinition.c
index 99b3a7f5ba36c..9e54ecb77dba4 100644
--- a/clang/test/CodeGen/2003-06-29-MultipleFunctionDefinition.c
+++ b/clang/test/CodeGen/2003-06-29-MultipleFunctionDefinition.c
@@ -2,7 +2,7 @@
 
 /* This is apparently legal C.
  */
-extern __inline__ void test() { }
+extern __inline__ void test(void) { }
 
-void test() {
+void test(void) {
 }

diff  --git a/clang/test/CodeGen/2003-08-18-SigSetJmp.c b/clang/test/CodeGen/2003-08-18-SigSetJmp.c
index 1b1b18f6eeccc..fb36f9f23d355 100644
--- a/clang/test/CodeGen/2003-08-18-SigSetJmp.c
+++ b/clang/test/CodeGen/2003-08-18-SigSetJmp.c
@@ -4,7 +4,7 @@
 typedef int sigjmp_buf[_JBLEN + 1];
 int sigsetjmp(sigjmp_buf env, int savemask);
 sigjmp_buf B;
-int foo() {
+int foo(void) {
   sigsetjmp(B, 1);
   bar();
 }

diff  --git a/clang/test/CodeGen/2003-08-20-BadBitfieldRef.c b/clang/test/CodeGen/2003-08-20-BadBitfieldRef.c
index a001546fb55d6..94ebdbe6bbdf7 100644
--- a/clang/test/CodeGen/2003-08-20-BadBitfieldRef.c
+++ b/clang/test/CodeGen/2003-08-20-BadBitfieldRef.c
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -emit-llvm %s  -o /dev/null
 
-void foo()
+void foo(void)
 {
   char *ap;
   ap[1] == '-' && ap[2] == 0;

diff  --git a/clang/test/CodeGen/2003-08-20-PrototypeMismatch.c b/clang/test/CodeGen/2003-08-20-PrototypeMismatch.c
index fa42ca581a0a4..88dd068d3c556 100644
--- a/clang/test/CodeGen/2003-08-20-PrototypeMismatch.c
+++ b/clang/test/CodeGen/2003-08-20-PrototypeMismatch.c
@@ -10,6 +10,6 @@ char C;
   return C;
 }
 
-void test() {
+void test(void) {
   foo(7);
 }

diff  --git a/clang/test/CodeGen/2003-08-21-BinOp-Type-Mismatch.c b/clang/test/CodeGen/2003-08-21-BinOp-Type-Mismatch.c
index d86b0244e17bf..b682d25d2a4d1 100644
--- a/clang/test/CodeGen/2003-08-21-BinOp-Type-Mismatch.c
+++ b/clang/test/CodeGen/2003-08-21-BinOp-Type-Mismatch.c
@@ -2,7 +2,7 @@
 
 struct bar;
 
-void foo()
+void foo(void)
 {
   unsigned int frame, focus;
   (struct bar *) focus == (focus ? ((struct bar *) frame) : 0);

diff  --git a/clang/test/CodeGen/2003-08-21-StmtExpr.c b/clang/test/CodeGen/2003-08-21-StmtExpr.c
index 39db694400d87..77f4cd655a815 100644
--- a/clang/test/CodeGen/2003-08-21-StmtExpr.c
+++ b/clang/test/CodeGen/2003-08-21-StmtExpr.c
@@ -6,7 +6,7 @@ typedef struct {
 } structty;
 
 void bar(structty new_mask);
-static void foo() {
+static void foo(void) {
   bar(({ structty mask; mask; }));
 }
 

diff  --git a/clang/test/CodeGen/2003-08-29-BitFieldStruct.c b/clang/test/CodeGen/2003-08-29-BitFieldStruct.c
index d8995eab3df9a..b0efd5ee1f19b 100644
--- a/clang/test/CodeGen/2003-08-29-BitFieldStruct.c
+++ b/clang/test/CodeGen/2003-08-29-BitFieldStruct.c
@@ -7,7 +7,7 @@ struct Word {
   short quux;
 } *word_limit;
 
-void foo ()
+void foo (void)
 {
   word_limit->final = (word_limit->final && word_limit->final);
 }

diff  --git a/clang/test/CodeGen/2003-08-29-HugeCharConst.c b/clang/test/CodeGen/2003-08-29-HugeCharConst.c
index cd3eb54b31d4f..b12dd7e780ebf 100644
--- a/clang/test/CodeGen/2003-08-29-HugeCharConst.c
+++ b/clang/test/CodeGen/2003-08-29-HugeCharConst.c
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -emit-llvm %s  -o /dev/null
 
-void foo() {
+void foo(void) {
   unsigned char int_latin1[] = "f\200\372b\200\343\200\340";
 }

diff  --git a/clang/test/CodeGen/2003-10-29-AsmRename.c b/clang/test/CodeGen/2003-10-29-AsmRename.c
index d0f19af322762..746ff15dd0e31 100644
--- a/clang/test/CodeGen/2003-10-29-AsmRename.c
+++ b/clang/test/CodeGen/2003-10-29-AsmRename.c
@@ -16,7 +16,7 @@ int Func64(struct bar* B) {
 }
 
 
-int test() {
+int test(void) {
   Func(0);    /* should be renamed to call Func64 */
   Func64(0);
 }

diff  --git a/clang/test/CodeGen/2003-11-01-EmptyStructCrash.c b/clang/test/CodeGen/2003-11-01-EmptyStructCrash.c
index e0f231af5994c..14d63dc478781 100644
--- a/clang/test/CodeGen/2003-11-01-EmptyStructCrash.c
+++ b/clang/test/CodeGen/2003-11-01-EmptyStructCrash.c
@@ -2,5 +2,5 @@
 
 typedef struct { } the_coolest_struct_in_the_world;
 extern the_coolest_struct_in_the_world xyzzy;
-void *foo() { return &xyzzy; }
+void *foo(void) { return &xyzzy; }
 

diff  --git a/clang/test/CodeGen/2003-11-16-StaticArrayInit.c b/clang/test/CodeGen/2003-11-16-StaticArrayInit.c
index 8a11c05d08dba..7cf7a5ae4b7a6 100644
--- a/clang/test/CodeGen/2003-11-16-StaticArrayInit.c
+++ b/clang/test/CodeGen/2003-11-16-StaticArrayInit.c
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -emit-llvm %s  -o /dev/null
 
-void bar () {
+void bar (void) {
  static char x[10];
  static char *xend = x + 10;
 }

diff  --git a/clang/test/CodeGen/2003-11-20-ComplexDivision.c b/clang/test/CodeGen/2003-11-20-ComplexDivision.c
index ecd780b9b3f80..51198b81ee2e1 100644
--- a/clang/test/CodeGen/2003-11-20-ComplexDivision.c
+++ b/clang/test/CodeGen/2003-11-20-ComplexDivision.c
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -emit-llvm %s  -o /dev/null
 
-int test() {
+int test(void) {
   __complex__ double C;
   double D;
   C / D;

diff  --git a/clang/test/CodeGen/2003-11-20-UnionBitfield.c b/clang/test/CodeGen/2003-11-20-UnionBitfield.c
index 6ffe76a171974..19b360456fcce 100644
--- a/clang/test/CodeGen/2003-11-20-UnionBitfield.c
+++ b/clang/test/CodeGen/2003-11-20-UnionBitfield.c
@@ -5,7 +5,7 @@ struct printf_spec {
   char converter;
 };
 
-void parse_doprnt_spec () {
+void parse_doprnt_spec (void) {
   struct printf_spec spec;
   spec.minus_flag = 1;
 }

diff  --git a/clang/test/CodeGen/2003-12-14-ExternInlineSupport.c b/clang/test/CodeGen/2003-12-14-ExternInlineSupport.c
index cf01fd1ecbd1f..6ec14c6428d35 100644
--- a/clang/test/CodeGen/2003-12-14-ExternInlineSupport.c
+++ b/clang/test/CodeGen/2003-12-14-ExternInlineSupport.c
@@ -1,4 +1,4 @@
 // RUN: %clang_cc1 -triple %itanium_abi_triple -std=gnu89 %s -emit-llvm -o - | FileCheck %s
 
-extern __inline__ void dead_function() {}
+extern __inline__ void dead_function(void) {}
 // CHECK-NOT: dead_function

diff  --git a/clang/test/CodeGen/2004-02-12-LargeAggregateCopy.c b/clang/test/CodeGen/2004-02-12-LargeAggregateCopy.c
index 811ee8e3f6418..a34f80d54e550 100644
--- a/clang/test/CodeGen/2004-02-12-LargeAggregateCopy.c
+++ b/clang/test/CodeGen/2004-02-12-LargeAggregateCopy.c
@@ -2,7 +2,7 @@
 
 struct X { int V[10000]; };
 struct X Global1, Global2;
-void test() {
+void test(void) {
   // CHECK: llvm.memcpy
   Global2 = Global1;
 }

diff  --git a/clang/test/CodeGen/2004-02-13-BuiltinFrameReturnAddress.c b/clang/test/CodeGen/2004-02-13-BuiltinFrameReturnAddress.c
index 8c0b7ba8fff05..4819c9c36aff6 100644
--- a/clang/test/CodeGen/2004-02-13-BuiltinFrameReturnAddress.c
+++ b/clang/test/CodeGen/2004-02-13-BuiltinFrameReturnAddress.c
@@ -1,10 +1,10 @@
 // RUN: %clang_cc1  %s -emit-llvm -o - | FileCheck %s
 
-void *test1() {
+void *test1(void) {
   // CHECK: call i8* @llvm.returnaddress
   return __builtin_return_address(1);
 }
-void *test2() {
+void *test2(void) {
   // CHECK: call i8* @llvm.frameaddress
   return __builtin_frame_address(0);
 }

diff  --git a/clang/test/CodeGen/2004-03-07-ExternalConstant.c b/clang/test/CodeGen/2004-03-07-ExternalConstant.c
index 36371c073d8d8..db09c91c1e156 100644
--- a/clang/test/CodeGen/2004-03-07-ExternalConstant.c
+++ b/clang/test/CodeGen/2004-03-07-ExternalConstant.c
@@ -2,6 +2,6 @@
 
 // CHECK: @a = external {{(dso_local )?}}constan
 extern const int a[];   // 'a' should be marked constant even though it's external!
-int foo () {
+int foo (void) {
   return a[0];
 }

diff  --git a/clang/test/CodeGen/2004-03-15-SimpleIndirectGoto.c b/clang/test/CodeGen/2004-03-15-SimpleIndirectGoto.c
index 93fb59ff142ea..8bfcd6aabe710 100644
--- a/clang/test/CodeGen/2004-03-15-SimpleIndirectGoto.c
+++ b/clang/test/CodeGen/2004-03-15-SimpleIndirectGoto.c
@@ -17,7 +17,7 @@ void bar(int *pc) {
  end:
   return;
 }
-int main() {
+int main(void) {
   bar(code);
   return 0;
 }

diff  --git a/clang/test/CodeGen/2004-03-16-AsmRegisterCrash.c b/clang/test/CodeGen/2004-03-16-AsmRegisterCrash.c
index 492e24853dec4..8e6ec67c5c2ad 100644
--- a/clang/test/CodeGen/2004-03-16-AsmRegisterCrash.c
+++ b/clang/test/CodeGen/2004-03-16-AsmRegisterCrash.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -triple armv7-unknown-unknown %s  -o /dev/null
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown %s  -o /dev/null
 
-int foo() {
+int foo(void) {
 #ifdef __arm__
   register int X __asm__("r1");
 #else

diff  --git a/clang/test/CodeGen/2004-06-08-OpaqueStructArg.c b/clang/test/CodeGen/2004-06-08-OpaqueStructArg.c
index cec44591f3989..bf39b8b3dc6de 100644
--- a/clang/test/CodeGen/2004-06-08-OpaqueStructArg.c
+++ b/clang/test/CodeGen/2004-06-08-OpaqueStructArg.c
@@ -2,6 +2,6 @@
 
    struct fu;
    void foo(struct fu);
-   void bar() {
+   void bar(void) {
       foo;
    }

diff  --git a/clang/test/CodeGen/2004-11-27-StaticFunctionRedeclare.c b/clang/test/CodeGen/2004-11-27-StaticFunctionRedeclare.c
index f6ce5528a4ead..e9e2a9b01bb96 100644
--- a/clang/test/CodeGen/2004-11-27-StaticFunctionRedeclare.c
+++ b/clang/test/CodeGen/2004-11-27-StaticFunctionRedeclare.c
@@ -10,8 +10,8 @@
 // CHECK: call {{.*}} @func
 // CHECK: define internal {{.*}}i32 @func(
 static int func();
-void bar() {
-  int func();
+void bar(void) {
+  int func(void);
   foo(func);
 }
 static int func(char** A, char ** B) {}

diff  --git a/clang/test/CodeGen/2005-01-02-ConstantInits.c b/clang/test/CodeGen/2005-01-02-ConstantInits.c
index b3091a25f56bb..d1fbbd21e11d6 100644
--- a/clang/test/CodeGen/2005-01-02-ConstantInits.c
+++ b/clang/test/CodeGen/2005-01-02-ConstantInits.c
@@ -19,7 +19,7 @@ struct X { int a[2]; };
 // CHECK-NEXT:    [[TMP0:%.*]] = load i32, i32* @test.i23, align 4
 // CHECK-NEXT:    ret i32 [[TMP0]]
 //
-int test() {
+int test(void) {
   static int i23 = (int) &(((struct X *)0)->a[1]);
   return i23;
 }

diff  --git a/clang/test/CodeGen/2005-02-27-MarkGlobalConstant.c b/clang/test/CodeGen/2005-02-27-MarkGlobalConstant.c
index dc2cdbfa726f8..7cf15375e5a18 100644
--- a/clang/test/CodeGen/2005-02-27-MarkGlobalConstant.c
+++ b/clang/test/CodeGen/2005-02-27-MarkGlobalConstant.c
@@ -5,7 +5,7 @@
 // constant.
 
 void bar();
-void foo() {
+void foo(void) {
   // CHECK: private unnamed_addr constant
   char Blah[] = "asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd";
   bar(Blah);

diff  --git a/clang/test/CodeGen/2005-03-06-OffsetOfStructCrash.c b/clang/test/CodeGen/2005-03-06-OffsetOfStructCrash.c
index 46968bb8db647..352a7c84ee410 100644
--- a/clang/test/CodeGen/2005-03-06-OffsetOfStructCrash.c
+++ b/clang/test/CodeGen/2005-03-06-OffsetOfStructCrash.c
@@ -5,10 +5,10 @@ struct XXX {
   struct  Y F;
 };
 
-void test1() {
+void test1(void) {
    (int)&((struct XXX*)(((void *)0)))->F;
 }
 
-void test2() {
+void test2(void) {
    &((struct XXX*)(((void *)0)))->F;
 }

diff  --git a/clang/test/CodeGen/2005-06-15-ExpandGotoInternalProblem.c b/clang/test/CodeGen/2005-06-15-ExpandGotoInternalProblem.c
index 0698601ad1335..521e698661515 100644
--- a/clang/test/CodeGen/2005-06-15-ExpandGotoInternalProblem.c
+++ b/clang/test/CodeGen/2005-06-15-ExpandGotoInternalProblem.c
@@ -3,7 +3,7 @@
 // PR580
 
 int X, Y;
-int foo() {
+int foo(void) {
   int i;
         for (i=0; i<100; i++ )
         {

diff  --git a/clang/test/CodeGen/2005-07-28-IncorrectWeakGlobal.c b/clang/test/CodeGen/2005-07-28-IncorrectWeakGlobal.c
index cbacf2253911c..7419b19cedb6f 100644
--- a/clang/test/CodeGen/2005-07-28-IncorrectWeakGlobal.c
+++ b/clang/test/CodeGen/2005-07-28-IncorrectWeakGlobal.c
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 %s -emit-llvm -o - | grep TheGlobal | not grep weak
 
 extern int TheGlobal;
-int foo() { return TheGlobal; }
+int foo(void) { return TheGlobal; }
 int TheGlobal = 1;

diff  --git a/clang/test/CodeGen/2005-09-24-AsmUserPrefix.c b/clang/test/CodeGen/2005-09-24-AsmUserPrefix.c
index d0e5bd1c3a444..eb5b5048c816d 100644
--- a/clang/test/CodeGen/2005-09-24-AsmUserPrefix.c
+++ b/clang/test/CodeGen/2005-09-24-AsmUserPrefix.c
@@ -1,8 +1,8 @@
 // RUN: %clang_cc1 %s -emit-llvm -o - | opt -O3 | llc | \
 // RUN:    not grep _foo2
 
-void foo() __asm__("foo2");
+void foo(void) __asm__("foo2");
 
-void bar() {
+void bar(void) {
   foo();
 }

diff  --git a/clang/test/CodeGen/2005-12-04-AttributeUsed.c b/clang/test/CodeGen/2005-12-04-AttributeUsed.c
index b2146ccb82956..82b9254d34918 100644
--- a/clang/test/CodeGen/2005-12-04-AttributeUsed.c
+++ b/clang/test/CodeGen/2005-12-04-AttributeUsed.c
@@ -4,4 +4,4 @@
 int X __attribute__((used));
 int Y;
 
-__attribute__((used)) void foo() {}
+__attribute__((used)) void foo(void) {}

diff  --git a/clang/test/CodeGen/2006-01-13-Includes.c b/clang/test/CodeGen/2006-01-13-Includes.c
index 4b50526b94309..39e0df68c3b73 100644
--- a/clang/test/CodeGen/2006-01-13-Includes.c
+++ b/clang/test/CodeGen/2006-01-13-Includes.c
@@ -3,7 +3,7 @@
 
 int printf(const char * restrict format, ...);
 
-void test() {
+void test(void) {
   printf("Hello World\n");
 }
 

diff  --git a/clang/test/CodeGen/2006-03-03-MissingInitializer.c b/clang/test/CodeGen/2006-03-03-MissingInitializer.c
index d2317d3acc41d..ca392a778c3c9 100644
--- a/clang/test/CodeGen/2006-03-03-MissingInitializer.c
+++ b/clang/test/CodeGen/2006-03-03-MissingInitializer.c
@@ -2,7 +2,7 @@
 
 struct X { int *XX; int Y;};
 
-void foo() {
+void foo(void) {
   // CHECK: @foo.nate = internal global i32 0
   static int nate = 0;
   struct X bob = { &nate, 14 };

diff  --git a/clang/test/CodeGen/2006-05-19-SingleEltReturn.c b/clang/test/CodeGen/2006-05-19-SingleEltReturn.c
index 79e84020ca470..2f9f9024ca224 100644
--- a/clang/test/CodeGen/2006-05-19-SingleEltReturn.c
+++ b/clang/test/CodeGen/2006-05-19-SingleEltReturn.c
@@ -10,13 +10,13 @@ struct Y {
   struct X x;
 };
 
-struct Y bar();
+struct Y bar(void);
 
 void foo(struct Y *P) {
   *P = bar();
 }
 
-struct Y bar() {
+struct Y bar(void) {
   struct Y a;
   a.x.D = 0;
   return a;

diff  --git a/clang/test/CodeGen/2006-09-28-SimpleAsm.c b/clang/test/CodeGen/2006-09-28-SimpleAsm.c
index c3983af5c98d8..1e159e76a48d3 100644
--- a/clang/test/CodeGen/2006-09-28-SimpleAsm.c
+++ b/clang/test/CodeGen/2006-09-28-SimpleAsm.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
 // PR924
 
-void bar() {
+void bar(void) {
   // Extended asm
   // CHECK: call void asm sideeffect "ext: xorl %eax, eax; movl eax, fs; movl eax, gs  %blah
   asm volatile ("ext: xorl %%eax, eax; movl eax, fs; movl eax, gs  %%blah %= %\

diff  --git a/clang/test/CodeGen/2006-10-30-ArrayCrash.c b/clang/test/CodeGen/2006-10-30-ArrayCrash.c
index 67446fd0567b0..ad4498fec911b 100644
--- a/clang/test/CodeGen/2006-10-30-ArrayCrash.c
+++ b/clang/test/CodeGen/2006-10-30-ArrayCrash.c
@@ -1,14 +1,14 @@
 // RUN: %clang_cc1 -O3 -emit-llvm -o - %s
 // PR954, PR911
 
-extern void foo();
+extern void foo(void);
 
 struct S {
   short        f1[3];
   unsigned int f2 : 1;
 };
 
-void bar()
+void bar(void)
 {
   struct S *A;
 

diff  --git a/clang/test/CodeGen/2007-01-24-InlineAsmCModifier.c b/clang/test/CodeGen/2007-01-24-InlineAsmCModifier.c
index 5158898f5dc81..ca8e3aaaaec6a 100644
--- a/clang/test/CodeGen/2007-01-24-InlineAsmCModifier.c
+++ b/clang/test/CodeGen/2007-01-24-InlineAsmCModifier.c
@@ -2,7 +2,7 @@
 // immediates.
 // RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
 
-void foo() {
+void foo(void) {
   // CHECK: i32 789514
   __asm__         volatile("/* " "pickANumber" ": %c0 */"::"i"(0xC0C0A));
 

diff  --git a/clang/test/CodeGen/2007-02-07-AddrLabel.c b/clang/test/CodeGen/2007-02-07-AddrLabel.c
index 25eb894336791..db62974c78c97 100644
--- a/clang/test/CodeGen/2007-02-07-AddrLabel.c
+++ b/clang/test/CodeGen/2007-02-07-AddrLabel.c
@@ -1,7 +1,7 @@
 // PR947
 // RUN: %clang_cc1 %s -emit-llvm -o - 
 
-void foo() {
+void foo(void) {
     void *ptr;
   label:
     ptr = &&label;

diff  --git a/clang/test/CodeGen/2007-04-05-PackedBitFields-2.c b/clang/test/CodeGen/2007-04-05-PackedBitFields-2.c
index 41e6b7def91e3..a81f18c31bbb2 100644
--- a/clang/test/CodeGen/2007-04-05-PackedBitFields-2.c
+++ b/clang/test/CodeGen/2007-04-05-PackedBitFields-2.c
@@ -11,6 +11,6 @@ struct pck F {
 }; 
 struct F f1;
 
-void foo() {
+void foo(void) {
 	f1.l = 5;
 }

diff  --git a/clang/test/CodeGen/2007-04-05-PackedBitFields.c b/clang/test/CodeGen/2007-04-05-PackedBitFields.c
index 5c824a3e08f12..0f40fc42505d7 100644
--- a/clang/test/CodeGen/2007-04-05-PackedBitFields.c
+++ b/clang/test/CodeGen/2007-04-05-PackedBitFields.c
@@ -11,6 +11,6 @@ struct pck E {
 
 struct E e1;
 
-void foo() {
+void foo(void) {
 	e1.k = 5;
 }

diff  --git a/clang/test/CodeGen/2007-04-05-PackedStruct.c b/clang/test/CodeGen/2007-04-05-PackedStruct.c
index 1e9171e4235e8..a65c6818de0c7 100644
--- a/clang/test/CodeGen/2007-04-05-PackedStruct.c
+++ b/clang/test/CodeGen/2007-04-05-PackedStruct.c
@@ -13,6 +13,6 @@ struct MyStruct {
   void * B;
 };
 
-void bar(){
+void bar(void){
 struct MyStruct MS = { tB, 0 };
 }

diff  --git a/clang/test/CodeGen/2007-04-05-UnPackedStruct.c b/clang/test/CodeGen/2007-04-05-UnPackedStruct.c
index e7a8df6239473..9b76ff73ec9b9 100644
--- a/clang/test/CodeGen/2007-04-05-UnPackedStruct.c
+++ b/clang/test/CodeGen/2007-04-05-UnPackedStruct.c
@@ -11,6 +11,6 @@ struct MyStruct {
   void * B;
 };
 
-void bar(){
+void bar(void){
 struct MyStruct MS = { tB, 0 };
 }

diff  --git a/clang/test/CodeGen/2007-04-11-InlineAsmStruct.c b/clang/test/CodeGen/2007-04-11-InlineAsmStruct.c
index d617feeed9f96..713c548f35553 100644
--- a/clang/test/CodeGen/2007-04-11-InlineAsmStruct.c
+++ b/clang/test/CodeGen/2007-04-11-InlineAsmStruct.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 %s -emit-llvm -o -
 
 struct V { short X, Y; };
-int bar() {
+int bar(void) {
   struct V bar;
   __asm__ volatile("foo %0\n" : "=r"(bar));
   return bar.X;

diff  --git a/clang/test/CodeGen/2007-04-11-InlineAsmUnion.c b/clang/test/CodeGen/2007-04-11-InlineAsmUnion.c
index 6d24d938abb34..da4a7b3ca5b19 100644
--- a/clang/test/CodeGen/2007-04-11-InlineAsmUnion.c
+++ b/clang/test/CodeGen/2007-04-11-InlineAsmUnion.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 %s -emit-llvm -o -
 
 union U { int x; float p; };
-void foo() {
+void foo(void) {
   union U bar;
   __asm__ volatile("foo %0\n" : "=r"(bar));
 }

diff  --git a/clang/test/CodeGen/2007-04-13-InlineAsmStruct2.c b/clang/test/CodeGen/2007-04-13-InlineAsmStruct2.c
index c9a87ffd55fb0..4bae521a236a1 100644
--- a/clang/test/CodeGen/2007-04-13-InlineAsmStruct2.c
+++ b/clang/test/CodeGen/2007-04-13-InlineAsmStruct2.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
 
 struct V { short X, Y; };
-int bar() {
+int bar(void) {
   struct V bar;
   // CHECK: call void asm
   __asm__ volatile("foo %0\n" :: "r"(bar));

diff  --git a/clang/test/CodeGen/2007-04-13-InlineAsmUnion2.c b/clang/test/CodeGen/2007-04-13-InlineAsmUnion2.c
index a8983b61d71f8..9e9d6ba64117a 100644
--- a/clang/test/CodeGen/2007-04-13-InlineAsmUnion2.c
+++ b/clang/test/CodeGen/2007-04-13-InlineAsmUnion2.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
 
 union U { int x; char* p; };
-void foo() {
+void foo(void) {
   union U bar;
   // CHECK: call void asm
   __asm__ volatile("foo %0\n" :: "r"(bar));

diff  --git a/clang/test/CodeGen/2007-05-08-PCH.c b/clang/test/CodeGen/2007-05-08-PCH.c
index c45d57c42f6f5..730a3be0d6270 100644
--- a/clang/test/CodeGen/2007-05-08-PCH.c
+++ b/clang/test/CodeGen/2007-05-08-PCH.c
@@ -1,7 +1,7 @@
 // PR 1400
 // RUN: %clang_cc1 -x c-header %s -o /dev/null
 
-int main() {
+int main(void) {
   return 0;
 }
 

diff  --git a/clang/test/CodeGen/2007-06-15-AnnotateAttribute.c b/clang/test/CodeGen/2007-06-15-AnnotateAttribute.c
index de34866783bab..754d7169aabbe 100644
--- a/clang/test/CodeGen/2007-06-15-AnnotateAttribute.c
+++ b/clang/test/CodeGen/2007-06-15-AnnotateAttribute.c
@@ -14,7 +14,7 @@ int foo(int y __attribute__((annotate("LocalValAnnotation")))) {
   return y + x;
 }
 
-int main() {
+int main(void) {
   static int a __attribute__((annotate("GlobalValAnnotation")));
   a = foo(2);
   return 0;

diff  --git a/clang/test/CodeGen/2007-08-01-LoadStoreAlign.c b/clang/test/CodeGen/2007-08-01-LoadStoreAlign.c
index 87cf163d4d9b3..5570a5bfa9897 100644
--- a/clang/test/CodeGen/2007-08-01-LoadStoreAlign.c
+++ b/clang/test/CodeGen/2007-08-01-LoadStoreAlign.c
@@ -8,7 +8,7 @@ struct p {
 struct p t = { 1, 10 };
 struct p u;
 
-int main () {
+int main (void) {
   // CHECK: align 1
   // CHECK: align 1
   int tmp = t.b;

diff  --git a/clang/test/CodeGen/2007-08-21-ComplexCst.c b/clang/test/CodeGen/2007-08-21-ComplexCst.c
index cd9ceb198baad..0aa04289c3701 100644
--- a/clang/test/CodeGen/2007-08-21-ComplexCst.c
+++ b/clang/test/CodeGen/2007-08-21-ComplexCst.c
@@ -1,3 +1,3 @@
 // RUN: %clang_cc1 -O2 -emit-llvm %s -o /dev/null
 void f(_Complex float z);
-void g() { f(1.0i); }
+void g(void) { f(1.0i); }

diff  --git a/clang/test/CodeGen/2007-09-05-ConstCtor.c b/clang/test/CodeGen/2007-09-05-ConstCtor.c
index 138b818875604..c19f391993da4 100644
--- a/clang/test/CodeGen/2007-09-05-ConstCtor.c
+++ b/clang/test/CodeGen/2007-09-05-ConstCtor.c
@@ -7,7 +7,7 @@ struct A {
 
 void bar(struct A *a);
 
-void bork() {
+void bork(void) {
   const unsigned long vcgt = 1234;
   struct A a = { vcgt };
   bar(&a);

diff  --git a/clang/test/CodeGen/2007-09-27-ComplexIntCompare.c b/clang/test/CodeGen/2007-09-27-ComplexIntCompare.c
index d07aa0cf7c363..7fc8da33c459f 100644
--- a/clang/test/CodeGen/2007-09-27-ComplexIntCompare.c
+++ b/clang/test/CodeGen/2007-09-27-ComplexIntCompare.c
@@ -7,7 +7,7 @@ struct s { _Complex unsigned short x; };
 struct s gs = { 100 + 200i };
 struct s __attribute__((noinline)) foo (void) { return gs; }
 
-int main ()
+int main (void)
 {
   if (foo ().x != gs.x)
     abort ();

diff  --git a/clang/test/CodeGen/2007-09-28-PackedUnionMember.c b/clang/test/CodeGen/2007-09-28-PackedUnionMember.c
index f0183063ddbfc..fc6f55fc75e65 100644
--- a/clang/test/CodeGen/2007-09-28-PackedUnionMember.c
+++ b/clang/test/CodeGen/2007-09-28-PackedUnionMember.c
@@ -20,11 +20,11 @@ struct E {
   unsigned long f2;
 };
 
-typedef long (*FuncPtr) ();
+typedef long (*FuncPtr) (void);
 
 extern long bork(FuncPtr handler, const struct E *list);
 
-static long hndlr()
+static long hndlr(void)
 {
   struct H cmd = { 4, 412 };
   struct H cmd2 = { 4, 412, 0 };

diff  --git a/clang/test/CodeGen/2007-10-30-Volatile.c b/clang/test/CodeGen/2007-10-30-Volatile.c
index 96df76c039e07..52b47284c25ee 100644
--- a/clang/test/CodeGen/2007-10-30-Volatile.c
+++ b/clang/test/CodeGen/2007-10-30-Volatile.c
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -emit-llvm %s -o /dev/null -Wall -Wno-unused-but-set-variable -Werror
-void bork() {
+void bork(void) {
   char * volatile p = 0;
   volatile int cc = 0;
   p += cc;

diff  --git a/clang/test/CodeGen/2007-11-07-AlignedMemcpy.c b/clang/test/CodeGen/2007-11-07-AlignedMemcpy.c
index 829b60cb0ef02..cb5853a4fcdc1 100644
--- a/clang/test/CodeGen/2007-11-07-AlignedMemcpy.c
+++ b/clang/test/CodeGen/2007-11-07-AlignedMemcpy.c
@@ -1,4 +1,4 @@
 // RUN: %clang_cc1 -emit-llvm %s -o /dev/null
-void bork() {
+void bork(void) {
   int Qux[33] = {0};
 }

diff  --git a/clang/test/CodeGen/2007-11-07-CopyAggregateAlign.c b/clang/test/CodeGen/2007-11-07-CopyAggregateAlign.c
index 769a38a7695be..0f65580d63709 100644
--- a/clang/test/CodeGen/2007-11-07-CopyAggregateAlign.c
+++ b/clang/test/CodeGen/2007-11-07-CopyAggregateAlign.c
@@ -4,4 +4,4 @@ struct A { char s, t, u, v; short a; };
 // CHECK: %b = alloca %struct.A, align 2
 // CHECK: call void @llvm.memcpy.p0i8.p0i8.{{.*}} align 2 {{.*}} align 2 {{.*}}, i1 false)
 
-void q() { struct A a, b; a = b; }
+void q(void) { struct A a, b; a = b; }

diff  --git a/clang/test/CodeGen/2007-11-07-ZeroAggregateAlign.c b/clang/test/CodeGen/2007-11-07-ZeroAggregateAlign.c
index 2b8cfe1f8f770..e1164c6980d73 100644
--- a/clang/test/CodeGen/2007-11-07-ZeroAggregateAlign.c
+++ b/clang/test/CodeGen/2007-11-07-ZeroAggregateAlign.c
@@ -2,4 +2,4 @@
 struct A { short s; short t; int i; };
 // CHECK: %a = alloca %struct.A, align 4
 // CHECK: call void @llvm.memset.p0i8.{{.*}} align 4 {{.*}}, i1 false)
-void q() { struct A a = {0}; }
+void q(void) { struct A a = {0}; }

diff  --git a/clang/test/CodeGen/2007-12-16-AsmNoUnwind.c b/clang/test/CodeGen/2007-12-16-AsmNoUnwind.c
index de078a28dd488..3d05da0870afd 100644
--- a/clang/test/CodeGen/2007-12-16-AsmNoUnwind.c
+++ b/clang/test/CodeGen/2007-12-16-AsmNoUnwind.c
@@ -1,3 +1,3 @@
 // RUN: %clang_cc1 %s -emit-llvm -o - | grep nounwind
 
-void bar() { asm (""); }
+void bar(void) { asm (""); }

diff  --git a/clang/test/CodeGen/2008-01-21-PackedBitFields.c b/clang/test/CodeGen/2008-01-21-PackedBitFields.c
index a649475e8df20..daf29cb8bcbfc 100644
--- a/clang/test/CodeGen/2008-01-21-PackedBitFields.c
+++ b/clang/test/CodeGen/2008-01-21-PackedBitFields.c
@@ -3,5 +3,5 @@
 typedef double Al1Double __attribute__((aligned(1)));
 struct x { int a:23; Al1Double v; };
 struct x X = { 5, 3.0 };
-double foo() { return X.v; }
+double foo(void) { return X.v; }
 

diff  --git a/clang/test/CodeGen/2008-02-26-inline-asm-bug.c b/clang/test/CodeGen/2008-02-26-inline-asm-bug.c
index 1103e9ba587e6..b6e6507917a01 100644
--- a/clang/test/CodeGen/2008-02-26-inline-asm-bug.c
+++ b/clang/test/CodeGen/2008-02-26-inline-asm-bug.c
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -emit-llvm < %s | grep "\$0,\$1"
 
-void f() {
+void f(void) {
   int d1, d2;
   asm("%0,%1": "=r" (d1) : "r" (d2));
 }

diff  --git a/clang/test/CodeGen/2008-05-12-TempUsedBeforeDef.c b/clang/test/CodeGen/2008-05-12-TempUsedBeforeDef.c
index bc2886effc204..c88c22b874626 100644
--- a/clang/test/CodeGen/2008-05-12-TempUsedBeforeDef.c
+++ b/clang/test/CodeGen/2008-05-12-TempUsedBeforeDef.c
@@ -3,7 +3,7 @@
 unsigned foo = 8L;
 unsigned bar = 0L;
 volatile unsigned char baz = 6L;
-int test() {
+int test(void) {
   char qux = 1L;
   for (; baz >= -29; baz--)
     bork(bar && foo, qux);

diff  --git a/clang/test/CodeGen/2008-07-17-no-emit-on-error.c b/clang/test/CodeGen/2008-07-17-no-emit-on-error.c
index 2cae57b3d89f6..8217cbec1bceb 100644
--- a/clang/test/CodeGen/2008-07-17-no-emit-on-error.c
+++ b/clang/test/CodeGen/2008-07-17-no-emit-on-error.c
@@ -5,11 +5,11 @@
 // RUN: not %clang_cc1 %s -emit-llvm-bc -o %t1.bc
 // RUN: not opt %t1.bc -disable-output
 
-void f() {
+void f(void) {
 }
 
 #ifndef PASS
-void g() {
+void g(void) {
   *10;
 }
 #endif

diff  --git a/clang/test/CodeGen/2008-07-21-mixed-var-fn-decl.c b/clang/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
index 89ec60282f889..84605520b8e22 100644
--- a/clang/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
+++ b/clang/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
 
-int g0, f0();
-int f1(), g1;
+int g0, f0(void);
+int f1(void), g1;
 
 // CHECK: @g0 = {{(dso_local )?}}global i32 0, align 4
 // CHECK: @g1 = {{(dso_local )?}}global i32 0, align 4

diff  --git a/clang/test/CodeGen/2008-07-22-packed-bitfield-access.c b/clang/test/CodeGen/2008-07-22-packed-bitfield-access.c
index 76b942d5ad035..652197f3eb54b 100644
--- a/clang/test/CodeGen/2008-07-22-packed-bitfield-access.c
+++ b/clang/test/CodeGen/2008-07-22-packed-bitfield-access.c
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 %s -emit-llvm -o -
 
-int main () {
+int main (void) {
   struct foo {
     unsigned a:16;
     unsigned b:32 __attribute__ ((packed));

diff  --git a/clang/test/CodeGen/2008-07-29-override-alias-decl.c b/clang/test/CodeGen/2008-07-29-override-alias-decl.c
index 84fac34f3c451..6db0cc3048043 100644
--- a/clang/test/CodeGen/2008-07-29-override-alias-decl.c
+++ b/clang/test/CodeGen/2008-07-29-override-alias-decl.c
@@ -1,19 +1,19 @@
 // RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -emit-llvm -o - %s | FileCheck %s
 
-int x() { return 1; }
+int x(void) { return 1; }
 
 // CHECK:  ret i32 1
 
 
-int f() __attribute__((weak, alias("x")));
+int f(void) __attribute__((weak, alias("x")));
 
 /* Test that we link to the alias correctly instead of making a new
    forward definition. */
-int f();
-int h() {
+int f(void);
+int h(void) {
   return f();
 }
 
-// CHECK:  [[call:%.*]] = call i32 (...) @f()
+// CHECK:  [[call:%.*]] = call i32 @f()
 // CHECK:  ret i32 [[call]]
 

diff  --git a/clang/test/CodeGen/2008-07-30-implicit-initialization.c b/clang/test/CodeGen/2008-07-30-implicit-initialization.c
index e63b4080a918f..be0d96549a3c6 100644
--- a/clang/test/CodeGen/2008-07-30-implicit-initialization.c
+++ b/clang/test/CodeGen/2008-07-30-implicit-initialization.c
@@ -11,17 +11,17 @@ struct s0 {
   int x, y;
 };
 
-int f0() {
+int f0(void) {
   struct s0 x = {0};
   return x.y;
 }
 
-int f1() {
+int f1(void) {
   struct s0 x[2] = { {0} };
   return x[1].x;
 }
 
-int f2() {
+int f2(void) {
   int x[2] = { 0 };
   return x[1];
 }

diff  --git a/clang/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c b/clang/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
index 546590eba64c5..c149d831e9bda 100644
--- a/clang/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
+++ b/clang/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
@@ -23,6 +23,6 @@ static void bar(void *db) {
 
 char s[5] = "hi";
 
-int foo() {
+int foo(void) {
   bar(0);
 }

diff  --git a/clang/test/CodeGen/2008-07-31-asm-labels.c b/clang/test/CodeGen/2008-07-31-asm-labels.c
index 65a02b6fa00e8..71be9378233d4 100644
--- a/clang/test/CodeGen/2008-07-31-asm-labels.c
+++ b/clang/test/CodeGen/2008-07-31-asm-labels.c
@@ -10,13 +10,13 @@
 
 void pipe() asm("_thisIsNotAPipe");
 
-void f0() {
+void f0(void) {
   pipe();
 }
 
 void pipe(int);
 
-void f1() {
+void f1(void) {
   pipe(1);
 }
 
@@ -28,6 +28,6 @@ void pipe(int arg) {
 
 // PR3698
 extern int g0 asm("_renamed");
-int f2() {
+int f2(void) {
   return g0;
 }

diff  --git a/clang/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c b/clang/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
index d2877018e9278..f1a83c5b6c13a 100644
--- a/clang/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
+++ b/clang/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
@@ -7,7 +7,7 @@
 // CHECK:   ret i32 1
 // <rdr://6115726>
 
-int f0() {
+int f0(void) {
   int x;
   unsigned short n = 1;
   int *a = &x;

diff  --git a/clang/test/CodeGen/2009-02-13-zerosize-union-field.c b/clang/test/CodeGen/2009-02-13-zerosize-union-field.c
index b4752503855af..f1d335a8f8336 100644
--- a/clang/test/CodeGen/2009-02-13-zerosize-union-field.c
+++ b/clang/test/CodeGen/2009-02-13-zerosize-union-field.c
@@ -4,7 +4,7 @@ typedef unsigned int Foo __attribute__((aligned(32)));
 typedef union{Foo:0;}a;
 typedef union{int x; Foo:0;}b;
 extern int printf(const char*, ...);
-int main() {
+int main(void) {
   // CHECK: getelementptr inbounds ([5 x i8], [5 x i8]* @.str, i32 0, i32 0), i32 0
   printf("%ld\n", sizeof(a));
   // CHECK: getelementptr inbounds ([5 x i8], [5 x i8]* @.str, i32 0, i32 0), i32 1

diff  --git a/clang/test/CodeGen/2009-03-13-dbg.c b/clang/test/CodeGen/2009-03-13-dbg.c
index 5a1f294e4ba08..3effacb9319df 100644
--- a/clang/test/CodeGen/2009-03-13-dbg.c
+++ b/clang/test/CodeGen/2009-03-13-dbg.c
@@ -1,2 +1,2 @@
 // RUN: %clang_cc1 %s -emit-llvm -debug-info-kind=limited -o /dev/null
-void foo() {}
+void foo(void) {}

diff  --git a/clang/test/CodeGen/2009-04-23-dbg.c b/clang/test/CodeGen/2009-04-23-dbg.c
index 69c38b2d44987..356400cf7fa71 100644
--- a/clang/test/CodeGen/2009-04-23-dbg.c
+++ b/clang/test/CodeGen/2009-04-23-dbg.c
@@ -14,7 +14,7 @@ int bar;
 int bar;
 # 2 "a.c" 2
 
-int main() {
+int main(void) {
  bar = 0;
  return 0;
 }

diff  --git a/clang/test/CodeGen/2009-05-22-callingconv.c b/clang/test/CodeGen/2009-05-22-callingconv.c
index 3e616d9bea46b..44467351d8502 100644
--- a/clang/test/CodeGen/2009-05-22-callingconv.c
+++ b/clang/test/CodeGen/2009-05-22-callingconv.c
@@ -19,7 +19,7 @@ re_string_construct (pstr, str, len, trans, icase, dfa)
                 abort();
 return 0;
 }
-int main()
+int main(void)
 {
   return re_string_construct(0, 0, 0, 0, 0, (void*)0x282020c0);
 }

diff  --git a/clang/test/CodeGen/2009-06-14-HighlyAligned.c b/clang/test/CodeGen/2009-06-14-HighlyAligned.c
index b5a7f5e733ff4..03f86b0aa56c0 100644
--- a/clang/test/CodeGen/2009-06-14-HighlyAligned.c
+++ b/clang/test/CodeGen/2009-06-14-HighlyAligned.c
@@ -3,6 +3,6 @@
 
 static int highly_aligned __attribute__((aligned(4096)));
 
-int f() {
+int f(void) {
 	return highly_aligned;
 }

diff  --git a/clang/test/CodeGen/2009-07-15-pad-wchar_t-array.c b/clang/test/CodeGen/2009-07-15-pad-wchar_t-array.c
index 4ae35158fa8ae..7be237d11a4dd 100644
--- a/clang/test/CodeGen/2009-07-15-pad-wchar_t-array.c
+++ b/clang/test/CodeGen/2009-07-15-pad-wchar_t-array.c
@@ -11,7 +11,7 @@ typedef __WCHAR_TYPE__ wchar_t;
   #define WCHAR_T_TYPE int
 #endif
 
-signed short _iodbcdm_sqlerror( )
+signed short _iodbcdm_sqlerror(void)
 {
   wchar_t _sqlState[6] = { L"\0" };
 }

diff  --git a/clang/test/CodeGen/2009-07-31-DbgDeclare.c b/clang/test/CodeGen/2009-07-31-DbgDeclare.c
index b1d8220c02715..dabb389f6e81d 100644
--- a/clang/test/CodeGen/2009-07-31-DbgDeclare.c
+++ b/clang/test/CodeGen/2009-07-31-DbgDeclare.c
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -S -debug-info-kind=limited -o %t.s %s
-void foo() {
+void foo(void) {
      int i = 0;
      i = 42;
 }

diff  --git a/clang/test/CodeGen/2009-10-20-GlobalDebug.c b/clang/test/CodeGen/2009-10-20-GlobalDebug.c
index f8bdebca58364..d65f628709a69 100644
--- a/clang/test/CodeGen/2009-10-20-GlobalDebug.c
+++ b/clang/test/CodeGen/2009-10-20-GlobalDebug.c
@@ -5,7 +5,7 @@
 // CHECK: @global ={{.*}} global i32 0, align 4, !dbg [[G:![0-9]+]]
 
 int global;
-int main() {
+int main(void) {
   static int localstatic;
   return 0;
 }

diff  --git a/clang/test/CodeGen/2010-02-10-PointerName.c b/clang/test/CodeGen/2010-02-10-PointerName.c
index e5f668413e199..2dc8e19317ce4 100644
--- a/clang/test/CodeGen/2010-02-10-PointerName.c
+++ b/clang/test/CodeGen/2010-02-10-PointerName.c
@@ -3,7 +3,7 @@
 // CHECK-NOT: {"char"}
 
 char i = 1;
-void foo() {
+void foo(void) {
   char *cp = &i;
 }
 

diff  --git a/clang/test/CodeGen/2010-02-15-DbgStaticVar.c b/clang/test/CodeGen/2010-02-15-DbgStaticVar.c
index a1bfa62f981ef..72bbeb963db2f 100644
--- a/clang/test/CodeGen/2010-02-15-DbgStaticVar.c
+++ b/clang/test/CodeGen/2010-02-15-DbgStaticVar.c
@@ -7,7 +7,7 @@ static int foo(int a)
 	return b+a;
 }
 
-int main() {
+int main(void) {
 	int j = foo(1);
 	return 0;
 }

diff  --git a/clang/test/CodeGen/2010-02-16-DbgScopes.c b/clang/test/CodeGen/2010-02-16-DbgScopes.c
index 4188f7417c3fe..8b962c6fcc367 100644
--- a/clang/test/CodeGen/2010-02-16-DbgScopes.c
+++ b/clang/test/CodeGen/2010-02-16-DbgScopes.c
@@ -5,8 +5,8 @@
 // CHECK: !DILexicalBlock(
 // CHECK: !DILexicalBlock(
 
-extern int bar();
-extern void foobar();
+extern int bar(void);
+extern void foobar(void);
 void foo(int s) {
   unsigned loc = 0;
   if (s) {

diff  --git a/clang/test/CodeGen/2010-02-18-Dbg-VectorType.c b/clang/test/CodeGen/2010-02-18-Dbg-VectorType.c
index eb17d11ac89b1..0a4826fcd3897 100644
--- a/clang/test/CodeGen/2010-02-18-Dbg-VectorType.c
+++ b/clang/test/CodeGen/2010-02-18-Dbg-VectorType.c
@@ -1,7 +1,7 @@
 // RUN: %clang -emit-llvm -S -O0 -g %s -o - | grep DW_TAG_typedef | grep float4
 typedef float float4 __attribute__((vector_size(16)));
 
-int main(){
+int main(void){
   volatile float4 x = (float4) { 0.0f, 1.0f, 2.0f, 3.0f };
   x += x;
   return 0;

diff  --git a/clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c b/clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c
index 94c5e659920a3..9d7f1f0b8b6cd 100644
--- a/clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c
+++ b/clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited %s -o - | FileCheck %s
 // Insure that dbg.declare lines for locals refer to correct line number records.
 // Radar 8152866.
-void foo() {
+void foo(void) {
   int l = 0;    // line #4: CHECK: {{call.*llvm.dbg.declare.*%l.*\!dbg }}[[variable_l:![0-9]+]]
   int p = 0;    // line #5: CHECK: {{call.*llvm.dbg.declare.*%p.*\!dbg }}[[variable_p:![0-9]+]]
 }

diff  --git a/clang/test/CodeGen/2010-08-10-DbgConstant.c b/clang/test/CodeGen/2010-08-10-DbgConstant.c
index ad9d566186876..de3ff8ffe8bd7 100644
--- a/clang/test/CodeGen/2010-08-10-DbgConstant.c
+++ b/clang/test/CodeGen/2010-08-10-DbgConstant.c
@@ -3,4 +3,4 @@
 
 static const unsigned int ro = 201;
 void bar(int);
-void foo() { bar(ro); }
+void foo(void) { bar(ro); }

diff  --git a/clang/test/CodeGen/OpaqueStruct.c b/clang/test/CodeGen/OpaqueStruct.c
index fe96126c0581a..ebed15c546ba3 100644
--- a/clang/test/CodeGen/OpaqueStruct.c
+++ b/clang/test/CodeGen/OpaqueStruct.c
@@ -7,6 +7,6 @@ struct a {
   b* p;
 };
 
-void f() {
+void f(void) {
   b* z = x->p;
 }

diff  --git a/clang/test/CodeGen/PR2001-bitfield-reload.c b/clang/test/CodeGen/PR2001-bitfield-reload.c
index d05aef35793ea..9795a1be54e23 100644
--- a/clang/test/CodeGen/PR2001-bitfield-reload.c
+++ b/clang/test/CodeGen/PR2001-bitfield-reload.c
@@ -10,7 +10,7 @@ static int foo(int i) {
   return (x.f0 = i);
 }
 
-int bar() {
+int bar(void) {
   // CHECK: ret i32 1
   return foo(-5) == -1;
 }

diff  --git a/clang/test/CodeGen/PR2413-void-address-cast-error.c b/clang/test/CodeGen/PR2413-void-address-cast-error.c
index 3920dfdec2472..aa338880dc475 100644
--- a/clang/test/CodeGen/PR2413-void-address-cast-error.c
+++ b/clang/test/CodeGen/PR2413-void-address-cast-error.c
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -emit-llvm %s -o -
-void f()
+void f(void)
 {
         void *addr;
         addr = (void *)( ((long int)addr + 7L) );

diff  --git a/clang/test/CodeGen/PR2643-null-store-to-bitfield.c b/clang/test/CodeGen/PR2643-null-store-to-bitfield.c
index d6c2f36aa503b..5d06e5da519e3 100644
--- a/clang/test/CodeGen/PR2643-null-store-to-bitfield.c
+++ b/clang/test/CodeGen/PR2643-null-store-to-bitfield.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -emit-llvm -o - %s
 // PR2643
 
-void foo() {
+void foo(void) {
   struct {
     int a : 1;
     int b : 1;

diff  --git a/clang/test/CodeGen/PR2743-reference-missing-static.c b/clang/test/CodeGen/PR2743-reference-missing-static.c
index f32d6c5f14451..b653d04af7f5b 100644
--- a/clang/test/CodeGen/PR2743-reference-missing-static.c
+++ b/clang/test/CodeGen/PR2743-reference-missing-static.c
@@ -6,11 +6,11 @@
    sema. Unfortunately this test will become useless once sema starts
    rejecting this. */
 
-static void e0();
-void f0() { e0(); }
+static void e0(void);
+void f0(void) { e0(); }
 
-inline void e1();
-void f1() { e1(); }
+inline void e1(void);
+void f1(void) { e1(); }
 
-void e2() __attribute__((weak));
-void f2() { e2(); }
+void e2(void) __attribute__((weak));
+void f2(void) { e2(); }

diff  --git a/clang/test/CodeGen/PR32874.c b/clang/test/CodeGen/PR32874.c
index 8f94b996a48a6..ff05ad1f4aea4 100644
--- a/clang/test/CodeGen/PR32874.c
+++ b/clang/test/CodeGen/PR32874.c
@@ -24,7 +24,7 @@ void foo(const int *p) {
 }
 
 // CHECK-LABEL: define{{.*}} void @ub_constant_arithmetic
-void ub_constant_arithmetic() {
+void ub_constant_arithmetic(void) {
   // Check that we still instrument unsafe arithmetic, even if it is known to
   // be unsafe at compile time.
 

diff  --git a/clang/test/CodeGen/PR3589-freestanding-libcalls.c b/clang/test/CodeGen/PR3589-freestanding-libcalls.c
index 16c1b5e9348d9..d691d8f25e114 100644
--- a/clang/test/CodeGen/PR3589-freestanding-libcalls.c
+++ b/clang/test/CodeGen/PR3589-freestanding-libcalls.c
@@ -4,6 +4,6 @@
 
 int printf(const char *, ...);
 
-void f0() {
+void f0(void) {
   printf("hello\n");
 }

diff  --git a/clang/test/CodeGen/PR3709-int-to-pointer-sign.c b/clang/test/CodeGen/PR3709-int-to-pointer-sign.c
index f77737e0f7707..f38675908d14e 100644
--- a/clang/test/CodeGen/PR3709-int-to-pointer-sign.c
+++ b/clang/test/CodeGen/PR3709-int-to-pointer-sign.c
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -emit-llvm %s -o - -O1 -triple=x86_64-gnu-linux | grep "i64 -1"
 
 // PR3709
-long long a() { return (long long)(int*)-1;}
+long long a(void) { return (long long)(int*)-1;}
 

diff  --git a/clang/test/CodeGen/PowerPC/aix-constructor-attribute.c b/clang/test/CodeGen/PowerPC/aix-constructor-attribute.c
index 8759b02b3aa77..24bf1f0528fed 100644
--- a/clang/test/CodeGen/PowerPC/aix-constructor-attribute.c
+++ b/clang/test/CodeGen/PowerPC/aix-constructor-attribute.c
@@ -7,18 +7,18 @@
 
 // CHECK: @llvm.global_ctors = appending global [3 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* bitcast (i32 ()* @foo3 to void ()*), i8* null }, { i32, void ()*, i8* } { i32 180, void ()* bitcast (i32 ()* @foo2 to void ()*), i8* null }, { i32, void ()*, i8* } { i32 180, void ()* bitcast (i32 ()* @foo to void ()*), i8* null }]
 
-int foo() __attribute__((constructor(180)));
-int foo2() __attribute__((constructor(180)));
-int foo3() __attribute__((constructor(65535)));
+int foo(void) __attribute__((constructor(180)));
+int foo2(void) __attribute__((constructor(180)));
+int foo3(void) __attribute__((constructor(65535)));
 
-int foo3() {
+int foo3(void) {
   return 3;
 }
 
-int foo2() {
+int foo2(void) {
   return 2;
 }
 
-int foo() {
+int foo(void) {
   return 1;
 }

diff  --git a/clang/test/CodeGen/PowerPC/aix-destructor-attribute.c b/clang/test/CodeGen/PowerPC/aix-destructor-attribute.c
index fccd0b73f62ec..2c2359beccd9f 100644
--- a/clang/test/CodeGen/PowerPC/aix-destructor-attribute.c
+++ b/clang/test/CodeGen/PowerPC/aix-destructor-attribute.c
@@ -12,15 +12,15 @@
 // RUN:     -fno-use-cxa-atexit -fregister-global-dtors-with-atexit < %s | \
 // RUN:   FileCheck --check-prefix=REGISTER %s
 
-int bar() __attribute__((destructor(100)));
-int bar2() __attribute__((destructor(65535)));
+int bar(void) __attribute__((destructor(100)));
+int bar2(void) __attribute__((destructor(65535)));
 int bar3(int) __attribute__((destructor(65535)));
 
-int bar() {
+int bar(void) {
   return 1;
 }
 
-int bar2() {
+int bar2(void) {
   return 2;
 }
 

diff  --git a/clang/test/CodeGen/PowerPC/aix_alloca_align.c b/clang/test/CodeGen/PowerPC/aix_alloca_align.c
index e235abdd16309..61021f0a05a49 100644
--- a/clang/test/CodeGen/PowerPC/aix_alloca_align.c
+++ b/clang/test/CodeGen/PowerPC/aix_alloca_align.c
@@ -7,7 +7,7 @@
 typedef __SIZE_TYPE__ size_t;
 extern void *alloca(size_t __size) __attribute__((__nothrow__));
 
-void foo() {
+void foo(void) {
   char *ptr1 = (char *)alloca(sizeof(char) * 9);
   char *ptr2 = (char *)alloca(sizeof(char) * 32);
 }

diff  --git a/clang/test/CodeGen/PowerPC/altivec.c b/clang/test/CodeGen/PowerPC/altivec.c
index af239b54711c1..1d4980bd0d7ef 100644
--- a/clang/test/CodeGen/PowerPC/altivec.c
+++ b/clang/test/CodeGen/PowerPC/altivec.c
@@ -28,7 +28,7 @@ vector char v3 = (vector char)((vector int)('a', 'b', 'c', 'd'));
 // CHECK-LE: @v4 ={{.*}} global <4 x i32> <i32 67305985, i32 0, i32 0, i32 0>
 vector int v4 = (vector char){1, 2, 3, 4};
 
-void test2()
+void test2(void)
 {
   vector int vi;
   vector float vf;
@@ -44,7 +44,7 @@ void test2()
 }
 
 // Check pre/post increment/decrement
-void test3() {
+void test3(void) {
   vector int vi;
   vi++;                                    // CHECK: add <4 x i32> {{.*}} <i32 1, i32 1, i32 1, i32 1>
   vector unsigned int vui;

diff  --git a/clang/test/CodeGen/PowerPC/builtins-ppc-p9-f128.c b/clang/test/CodeGen/PowerPC/builtins-ppc-p9-f128.c
index d0c89cea5bd43..97f4c4f6e6f60 100644
--- a/clang/test/CodeGen/PowerPC/builtins-ppc-p9-f128.c
+++ b/clang/test/CodeGen/PowerPC/builtins-ppc-p9-f128.c
@@ -6,43 +6,43 @@ __float128 B;
 __float128 C;
 
 
-__float128 testSqrtOdd() {
+__float128 testSqrtOdd(void) {
   return __builtin_sqrtf128_round_to_odd(A);
 // CHECK: @llvm.ppc.sqrtf128.round.to.odd(fp128
 // CHECK-NEXT: ret fp128
 }
 
-__float128 testFMAOdd() {
+__float128 testFMAOdd(void) {
   return __builtin_fmaf128_round_to_odd(A, B, C);
 // CHECK: @llvm.ppc.fmaf128.round.to.odd(fp128 %{{.+}}, fp128 %{{.+}}, fp128
 // CHECK-NEXT: ret fp128
 }
 
-__float128 testAddOdd() {
+__float128 testAddOdd(void) {
   return __builtin_addf128_round_to_odd(A, B);
 // CHECK: @llvm.ppc.addf128.round.to.odd(fp128 %{{.+}}, fp128
 // CHECK-NEXT: ret fp128
 }
 
-__float128 testSubOdd() {
+__float128 testSubOdd(void) {
   return __builtin_subf128_round_to_odd(A, B);
 // CHECK: @llvm.ppc.subf128.round.to.odd(fp128 %{{.+}}, fp128
 // CHECK-NEXT: ret fp128
 }
 
-__float128 testMulOdd() {
+__float128 testMulOdd(void) {
   return __builtin_mulf128_round_to_odd(A, B);
 // CHECK: @llvm.ppc.mulf128.round.to.odd(fp128 %{{.+}}, fp128
 // CHECK-NEXT: ret fp128
 }
 
-__float128 testDivOdd() {
+__float128 testDivOdd(void) {
   return __builtin_divf128_round_to_odd(A, B);
 // CHECK: @llvm.ppc.divf128.round.to.odd(fp128 %{{.+}}, fp128
 // CHECK-NEXT: ret fp128
 }
 
-double testTruncOdd() {
+double testTruncOdd(void) {
   return __builtin_truncf128_round_to_odd(A);
 // CHECK: @llvm.ppc.truncf128.round.to.odd(fp128
 // CHECK-NEXT: ret double
@@ -54,7 +54,7 @@ __float128 insert_exp_qp(unsigned long long int b) {
 // CHECK-NEXT: ret fp128
 }
 
-unsigned long long int extract_exp() {
+unsigned long long int extract_exp(void) {
   return __builtin_vsx_scalar_extract_expq(A);
 // CHECK: @llvm.ppc.scalar.extract.expq(fp128
 // CHECK-NEXT: ret i64

diff  --git a/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-math.c b/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-math.c
index f2ed79699c853..47b81660a91ef 100644
--- a/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-math.c
+++ b/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-math.c
@@ -11,7 +11,7 @@
 // CHECK:         call void @llvm.ppc.mtfsb0(i32 10)
 // CHECK-NEXT:    ret void
 //
-void mtfsb0 () {
+void mtfsb0 (void) {
   __mtfsb0 (10);
 }
 
@@ -19,7 +19,7 @@ void mtfsb0 () {
 // CHECK:         call void @llvm.ppc.mtfsb1(i32 0)
 // CHECK-NEXT:    ret void
 //
-void mtfsb1 () {
+void mtfsb1 (void) {
   __mtfsb1 (0);
 }
 
@@ -36,7 +36,7 @@ void mtfsf (unsigned int ui) {
 // CHECK:         call void @llvm.ppc.mtfsfi(i32 7, i32 15)
 // CHECK-NEXT:    ret void
 //
-void mtfsfi () {
+void mtfsfi (void) {
   __mtfsfi (7, 15);
 }
 

diff  --git a/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-stfiw.c b/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-stfiw.c
index 5cc4bec673984..3eb5590750ce6 100644
--- a/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-stfiw.c
+++ b/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-stfiw.c
@@ -10,13 +10,13 @@
 extern const int *cia;
 extern double da;
 
-void test_stfiw() {
+void test_stfiw(void) {
   // CHECK-LABEL: test_stfiw
   // CHECK: void @llvm.ppc.stfiw(i8* %0, double %1)
   __builtin_ppc_stfiw(cia, da);
 }
 
-void test_xl_stfiw() {
+void test_xl_stfiw(void) {
   // CHECK-LABEL: test_xl_stfiw
   // CHECK: void @llvm.ppc.stfiw(i8* %0, double %1)
   __stfiw(cia, da);

diff  --git a/clang/test/CodeGen/PowerPC/ppc-sfvarargs.c b/clang/test/CodeGen/PowerPC/ppc-sfvarargs.c
index 924d9c5fe4c0e..850acf8f0317e 100644
--- a/clang/test/CodeGen/PowerPC/ppc-sfvarargs.c
+++ b/clang/test/CodeGen/PowerPC/ppc-sfvarargs.c
@@ -8,7 +8,7 @@ void test(char *fmt, ...) {
   va_end(ap);
 }
 
-void foo() {
+void foo(void) {
   double a;
   test("test",a);
 }

diff  --git a/clang/test/CodeGen/PowerPC/ppc32-dwarf.c b/clang/test/CodeGen/PowerPC/ppc32-dwarf.c
index a2f2f2ab3fb0f..da4189c57703b 100644
--- a/clang/test/CodeGen/PowerPC/ppc32-dwarf.c
+++ b/clang/test/CodeGen/PowerPC/ppc32-dwarf.c
@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 -triple powerpc-unknown-unknown -emit-llvm %s -o - | FileCheck %s --check-prefixes=CHECK,PPC32
 static unsigned char dwarf_reg_size_table[1024];
 
-int test() {
+int test(void) {
   __builtin_init_dwarf_reg_size_table(dwarf_reg_size_table);
 
   return __builtin_dwarf_sp_column();

diff  --git a/clang/test/CodeGen/PowerPC/ppc64-dwarf.c b/clang/test/CodeGen/PowerPC/ppc64-dwarf.c
index 8d7cdd6345982..219231072569d 100644
--- a/clang/test/CodeGen/PowerPC/ppc64-dwarf.c
+++ b/clang/test/CodeGen/PowerPC/ppc64-dwarf.c
@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 -triple powerpc64-unknown-unknown -emit-llvm %s -o - | FileCheck %s --check-prefixes=CHECK,PPC64
 static unsigned char dwarf_reg_size_table[1024];
 
-int test() {
+int test(void) {
   __builtin_init_dwarf_reg_size_table(dwarf_reg_size_table);
 
   return __builtin_dwarf_sp_column();

diff  --git a/clang/test/CodeGen/PowerPC/ppc64-f128-builtins.c b/clang/test/CodeGen/PowerPC/ppc64-f128-builtins.c
index 07d1564127b2f..f25dde870a4a8 100644
--- a/clang/test/CodeGen/PowerPC/ppc64-f128-builtins.c
+++ b/clang/test/CodeGen/PowerPC/ppc64-f128-builtins.c
@@ -10,7 +10,7 @@ char buf[20];
 // IEEE128: call signext i32 (i8*, ...) @__printfieee128
 // PPC128-LABEL: define dso_local void @test_printf
 // PPC128: call signext i32 (i8*, ...) @printf
-void test_printf() {
+void test_printf(void) {
   __builtin_printf("%.Lf", x);
 }
 
@@ -40,7 +40,7 @@ void test_vsprintf(int n, ...) {
 // IEEE128: call signext i32 (i8*, i8*, ...) @__sprintfieee128
 // PPC128-LABEL: define dso_local void @test_sprintf
 // PPC128: call signext i32 (i8*, i8*, ...) @sprintf
-void test_sprintf() {
+void test_sprintf(void) {
   __builtin_sprintf(buf, "%.Lf", x);
 }
 
@@ -48,7 +48,7 @@ void test_sprintf() {
 // IEEE128: call signext i32 (i8*, i64, i8*, ...) @__snprintfieee128
 // PPC128-LABEL: define dso_local void @test_snprintf
 // PPC128: call signext i32 (i8*, i64, i8*, ...) @snprintf
-void test_snprintf() {
+void test_snprintf(void) {
   __builtin_snprintf(buf, 20, "%.Lf", x);
 }
 

diff  --git a/clang/test/CodeGen/PowerPC/ppc64le-aggregates.c b/clang/test/CodeGen/PowerPC/ppc64le-aggregates.c
index cc8606e31ae06..55b336cc115ab 100644
--- a/clang/test/CodeGen/PowerPC/ppc64le-aggregates.c
+++ b/clang/test/CodeGen/PowerPC/ppc64le-aggregates.c
@@ -369,58 +369,58 @@ struct s16 { char c[16]; };
 struct s17 { char c[17]; };
 
 // CHECK: define{{.*}} i8 @ret_s1()
-struct s1 ret_s1() {
+struct s1 ret_s1(void) {
   return (struct s1) { 17 };
 }
 
 // CHECK: define{{.*}} i16 @ret_s2()
-struct s2 ret_s2() {
+struct s2 ret_s2(void) {
   return (struct s2) { 17, 18 };
 }
 
 // CHECK: define{{.*}} i24 @ret_s3()
-struct s3 ret_s3() {
+struct s3 ret_s3(void) {
   return (struct s3) { 17, 18, 19 };
 }
 
 // CHECK: define{{.*}} i32 @ret_s4()
-struct s4 ret_s4() {
+struct s4 ret_s4(void) {
   return (struct s4) { 17, 18, 19, 20 };
 }
 
 // CHECK: define{{.*}} i40 @ret_s5()
-struct s5 ret_s5() {
+struct s5 ret_s5(void) {
   return (struct s5) { 17, 18, 19, 20, 21 };
 }
 
 // CHECK: define{{.*}} i48 @ret_s6()
-struct s6 ret_s6() {
+struct s6 ret_s6(void) {
   return (struct s6) { 17, 18, 19, 20, 21, 22 };
 }
 
 // CHECK: define{{.*}} i56 @ret_s7()
-struct s7 ret_s7() {
+struct s7 ret_s7(void) {
   return (struct s7) { 17, 18, 19, 20, 21, 22, 23 };
 }
 
 // CHECK: define{{.*}} i64 @ret_s8()
-struct s8 ret_s8() {
+struct s8 ret_s8(void) {
   return (struct s8) { 17, 18, 19, 20, 21, 22, 23, 24 };
 }
 
 // CHECK: define{{.*}} { i64, i64 } @ret_s9()
-struct s9 ret_s9() {
+struct s9 ret_s9(void) {
   return (struct s9) { 17, 18, 19, 20, 21, 22, 23, 24, 25 };
 }
 
 // CHECK: define{{.*}} { i64, i64 } @ret_s16()
-struct s16 ret_s16() {
+struct s16 ret_s16(void) {
   return (struct s16) { 17, 18, 19, 20, 21, 22, 23, 24,
                         25, 26, 27, 28, 29, 30, 31, 32 };
 }
 
 // CHECK: define{{.*}} void @ret_s17(%struct.s17*
-struct s17 ret_s17() {
+struct s17 ret_s17(void) {
   return (struct s17) { 17, 18, 19, 20, 21, 22, 23, 24,
                         25, 26, 27, 28, 29, 30, 31, 32, 33 };
 }

diff  --git a/clang/test/CodeGen/PowerPC/vector-bool-pixel-altivec-init-no-parentheses.c b/clang/test/CodeGen/PowerPC/vector-bool-pixel-altivec-init-no-parentheses.c
index db1d9d2e95bc1..071f66a8f0ab6 100644
--- a/clang/test/CodeGen/PowerPC/vector-bool-pixel-altivec-init-no-parentheses.c
+++ b/clang/test/CodeGen/PowerPC/vector-bool-pixel-altivec-init-no-parentheses.c
@@ -46,7 +46,7 @@ vector bool long long vbi64_2;
 vector pixel p1;
 
 ////////////////////////////////////////////////////////////////////////////////
-void test_vector_bool_pixel_init_no_parentheses() {
+void test_vector_bool_pixel_init_no_parentheses(void) {
   // vector bool char initialization
   vbi8_1 = (vector bool char)'a';
   // MIXED-ERR: error: invalid conversion between vector type '__vector __bool unsigned char'

diff  --git a/clang/test/CodeGen/PowerPC/vector-bool-pixel-altivec-init.c b/clang/test/CodeGen/PowerPC/vector-bool-pixel-altivec-init.c
index e7fa10c9a580b..71860c6436047 100644
--- a/clang/test/CodeGen/PowerPC/vector-bool-pixel-altivec-init.c
+++ b/clang/test/CodeGen/PowerPC/vector-bool-pixel-altivec-init.c
@@ -46,7 +46,7 @@ vector bool long long vbi64_2;
 vector pixel p1;
 
 ////////////////////////////////////////////////////////////////////////////////
-void test_vector_bool_pixel_init() {
+void test_vector_bool_pixel_init(void) {
   // vector bool char initialization
   vbi8_1 = (vector bool char)('a');
   // MIXED: <i8 97, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0>

diff  --git a/clang/test/CodeGen/RISCV/riscv-inline-asm.c b/clang/test/CodeGen/RISCV/riscv-inline-asm.c
index 60bdccd8da25b..fb09e351364ba 100644
--- a/clang/test/CodeGen/RISCV/riscv-inline-asm.c
+++ b/clang/test/CodeGen/RISCV/riscv-inline-asm.c
@@ -5,7 +5,7 @@
 
 // Test RISC-V specific inline assembly constraints.
 
-void test_I() {
+void test_I(void) {
 // CHECK-LABEL: define{{.*}} void @test_I()
 // CHECK: call void asm sideeffect "", "I"(i32 2047)
   asm volatile ("" :: "I"(2047));
@@ -13,13 +13,13 @@ void test_I() {
   asm volatile ("" :: "I"(-2048));
 }
 
-void test_J() {
+void test_J(void) {
 // CHECK-LABEL: define{{.*}} void @test_J()
 // CHECK: call void asm sideeffect "", "J"(i32 0)
   asm volatile ("" :: "J"(0));
 }
 
-void test_K() {
+void test_K(void) {
 // CHECK-LABEL: define{{.*}} void @test_K()
 // CHECK: call void asm sideeffect "", "K"(i32 31)
   asm volatile ("" :: "K"(31));
@@ -29,7 +29,7 @@ void test_K() {
 
 float f;
 double d;
-void test_f() {
+void test_f(void) {
 // CHECK-LABEL: define{{.*}} void @test_f()
 // CHECK: [[FLT_ARG:%[a-zA-Z_0-9]+]] = load float, float* @f
 // CHECK: call void asm sideeffect "", "f"(float [[FLT_ARG]])
@@ -45,7 +45,7 @@ void test_A(int *p) {
   asm volatile("" :: "A"(*p));
 }
 
-void test_S() {
+void test_S(void) {
 // CHECK-LABEL: define{{.*}} void @test_S()
 // CHECK: call void asm sideeffect "", "S"(float* nonnull @f)
   asm volatile("" :: "S"(&f));

diff  --git a/clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c b/clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c
index 4ad83b2c6d7cb..89c9cc8cb0d07 100644
--- a/clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c
+++ b/clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c
@@ -26,7 +26,7 @@
 // RUN: %clang -target riscv64-unknown-elf %s -S -emit-llvm -mcmodel=large -o - \
 // RUN:   | FileCheck %s -check-prefix=RV64-LARGE
 
-void test() {}
+void test(void) {}
 
 // RV32-DEFAULT: !{i32 1, !"SmallDataLimit", i32 8}
 // RV32-G4:      !{i32 1, !"SmallDataLimit", i32 4}

diff  --git a/clang/test/CodeGen/RISCV/riscv32-ilp32-ilp32f-ilp32d-abi.c b/clang/test/CodeGen/RISCV/riscv32-ilp32-ilp32f-ilp32d-abi.c
index be9578500093e..849c2042d0ddb 100644
--- a/clang/test/CodeGen/RISCV/riscv32-ilp32-ilp32f-ilp32d-abi.c
+++ b/clang/test/CodeGen/RISCV/riscv32-ilp32-ilp32f-ilp32d-abi.c
@@ -81,7 +81,7 @@ void f_agg_tiny(struct tiny x) {
 }
 
 // CHECK-LABEL: define{{.*}} i32 @f_agg_tiny_ret()
-struct tiny f_agg_tiny_ret() {
+struct tiny f_agg_tiny_ret(void) {
   return (struct tiny){1, 2, 3, 4};
 }
 
@@ -95,7 +95,7 @@ void f_vec_tiny_v4i8(v4i8 x) {
 }
 
 // CHECK-LABEL: define{{.*}} i32 @f_vec_tiny_v4i8_ret()
-v4i8 f_vec_tiny_v4i8_ret() {
+v4i8 f_vec_tiny_v4i8_ret(void) {
   return (v4i8){1, 2, 3, 4};
 }
 
@@ -105,7 +105,7 @@ void f_vec_tiny_v1i32(v1i32 x) {
 }
 
 // CHECK-LABEL: define{{.*}} i32 @f_vec_tiny_v1i32_ret()
-v1i32 f_vec_tiny_v1i32_ret() {
+v1i32 f_vec_tiny_v1i32_ret(void) {
   return (v1i32){1};
 }
 
@@ -120,7 +120,7 @@ void f_agg_small(struct small x) {
 }
 
 // CHECK-LABEL: define{{.*}} [2 x i32] @f_agg_small_ret()
-struct small f_agg_small_ret() {
+struct small f_agg_small_ret(void) {
   return (struct small){1, 0};
 }
 
@@ -133,7 +133,7 @@ void f_vec_small_v8i8(v8i8 x) {
 }
 
 // CHECK-LABEL: define{{.*}} i64 @f_vec_small_v8i8_ret()
-v8i8 f_vec_small_v8i8_ret() {
+v8i8 f_vec_small_v8i8_ret(void) {
   return (v8i8){1, 2, 3, 4, 5, 6, 7, 8};
 }
 
@@ -143,7 +143,7 @@ void f_vec_small_v1i64(v1i64 x) {
 }
 
 // CHECK-LABEL: define{{.*}} i64 @f_vec_small_v1i64_ret()
-v1i64 f_vec_small_v1i64_ret() {
+v1i64 f_vec_small_v1i64_ret(void) {
   return (v1i64){1};
 }
 
@@ -190,7 +190,7 @@ void f_vec_large_v16i8(v16i8 x) {
 }
 
 // CHECK-LABEL: define{{.*}} void @f_vec_large_v16i8_ret(<16 x i8>* noalias sret(<16 x i8>) align 16 %agg.result)
-v16i8 f_vec_large_v16i8_ret() {
+v16i8 f_vec_large_v16i8_ret(void) {
   return (v16i8){1, 2, 3, 4, 5, 6, 7, 8};
 }
 
@@ -238,7 +238,7 @@ int f_va_callee(int, ...);
 
 // CHECK-LABEL: define{{.*}} void @f_va_caller()
 // CHECK: call i32 (i32, ...) @f_va_callee(i32 noundef 1, i32 noundef 2, i64 noundef 3, double noundef 4.000000e+00, double noundef 5.000000e+00, i32 {{%.*}}, [2 x i32] {{%.*}}, i64 {{%.*}}, %struct.large* noundef {{%.*}})
-void f_va_caller() {
+void f_va_caller(void) {
   f_va_callee(1, 2, 3LL, 4.0f, 5.0, (struct tiny){6, 7, 8, 9},
               (struct small){10, NULL}, (struct small_aligned){11},
               (struct large){12, 13, 14, 15});

diff  --git a/clang/test/CodeGen/RISCV/riscv32-ilp32d-abi.c b/clang/test/CodeGen/RISCV/riscv32-ilp32d-abi.c
index 856529d6db508..61c9252382739 100644
--- a/clang/test/CodeGen/RISCV/riscv32-ilp32d-abi.c
+++ b/clang/test/CodeGen/RISCV/riscv32-ilp32d-abi.c
@@ -29,7 +29,7 @@ struct double_s { double f; };
 void f_double_s_arg(struct double_s a) {}
 
 // CHECK: define{{.*}} double @f_ret_double_s()
-struct double_s f_ret_double_s() {
+struct double_s f_ret_double_s(void) {
   return (struct double_s){1.0};
 }
 
@@ -43,7 +43,7 @@ struct zbf_double_zbf_s { int : 0; double f; int : 0; };
 void f_zbf_double_s_arg(struct zbf_double_s a) {}
 
 // CHECK: define{{.*}} double @f_ret_zbf_double_s()
-struct zbf_double_s f_ret_zbf_double_s() {
+struct zbf_double_s f_ret_zbf_double_s(void) {
   return (struct zbf_double_s){1.0};
 }
 
@@ -51,7 +51,7 @@ struct zbf_double_s f_ret_zbf_double_s() {
 void f_zbf_double_zbf_s_arg(struct zbf_double_zbf_s a) {}
 
 // CHECK: define{{.*}} double @f_ret_zbf_double_zbf_s()
-struct zbf_double_zbf_s f_ret_zbf_double_zbf_s() {
+struct zbf_double_zbf_s f_ret_zbf_double_zbf_s(void) {
   return (struct zbf_double_zbf_s){1.0};
 }
 
@@ -65,7 +65,7 @@ struct double_float_s { double f; float g; };
 void f_double_double_s_arg(struct double_double_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_double_double_s()
-struct double_double_s f_ret_double_double_s() {
+struct double_double_s f_ret_double_double_s(void) {
   return (struct double_double_s){1.0, 2.0};
 }
 
@@ -73,7 +73,7 @@ struct double_double_s f_ret_double_double_s() {
 void f_double_float_s_arg(struct double_float_s a) {}
 
 // CHECK: define{{.*}} { double, float } @f_ret_double_float_s()
-struct double_float_s f_ret_double_float_s() {
+struct double_float_s f_ret_double_float_s(void) {
   return (struct double_float_s){1.0, 2.0};
 }
 
@@ -96,7 +96,7 @@ struct double_int8_zbf_s { double f; int8_t i; int : 0; };
 void f_double_int8_s_arg(struct double_int8_s a) {}
 
 // CHECK: define{{.*}} { double, i8 } @f_ret_double_int8_s()
-struct double_int8_s f_ret_double_int8_s() {
+struct double_int8_s f_ret_double_int8_s(void) {
   return (struct double_int8_s){1.0, 2};
 }
 
@@ -104,7 +104,7 @@ struct double_int8_s f_ret_double_int8_s() {
 void f_double_uint8_s_arg(struct double_uint8_s a) {}
 
 // CHECK: define{{.*}} { double, i8 } @f_ret_double_uint8_s()
-struct double_uint8_s f_ret_double_uint8_s() {
+struct double_uint8_s f_ret_double_uint8_s(void) {
   return (struct double_uint8_s){1.0, 2};
 }
 
@@ -112,7 +112,7 @@ struct double_uint8_s f_ret_double_uint8_s() {
 void f_double_int32_s_arg(struct double_int32_s a) {}
 
 // CHECK: define{{.*}} { double, i32 } @f_ret_double_int32_s()
-struct double_int32_s f_ret_double_int32_s() {
+struct double_int32_s f_ret_double_int32_s(void) {
   return (struct double_int32_s){1.0, 2};
 }
 
@@ -120,7 +120,7 @@ struct double_int32_s f_ret_double_int32_s() {
 void f_double_int64_s_arg(struct double_int64_s a) {}
 
 // CHECK: define{{.*}} void @f_ret_double_int64_s(%struct.double_int64_s* noalias sret(%struct.double_int64_s) align 8 %agg.result)
-struct double_int64_s f_ret_double_int64_s() {
+struct double_int64_s f_ret_double_int64_s(void) {
   return (struct double_int64_s){1.0, 2};
 }
 
@@ -128,7 +128,7 @@ struct double_int64_s f_ret_double_int64_s() {
 void f_double_int64bf_s_arg(struct double_int64bf_s a) {}
 
 // CHECK: define{{.*}} { double, i32 } @f_ret_double_int64bf_s()
-struct double_int64bf_s f_ret_double_int64bf_s() {
+struct double_int64bf_s f_ret_double_int64bf_s(void) {
   return (struct double_int64bf_s){1.0, 2};
 }
 
@@ -139,7 +139,7 @@ struct double_int64bf_s f_ret_double_int64bf_s() {
 void f_double_int8_zbf_s(struct double_int8_zbf_s a) {}
 
 // CHECK: define{{.*}} { double, i8 } @f_ret_double_int8_zbf_s()
-struct double_int8_zbf_s f_ret_double_int8_zbf_s() {
+struct double_int8_zbf_s f_ret_double_int8_zbf_s(void) {
   return (struct double_int8_zbf_s){1.0, 2};
 }
 
@@ -158,7 +158,7 @@ void f_struct_double_int8_insufficient_fprs(float a, double b, double c, double
 void f_doublecomplex(double __complex__ a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublecomplex()
-double __complex__ f_ret_doublecomplex() {
+double __complex__ f_ret_doublecomplex(void) {
   return 1.0;
 }
 
@@ -168,7 +168,7 @@ struct doublecomplex_s { double __complex__ c; };
 void f_doublecomplex_s_arg(struct doublecomplex_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublecomplex_s()
-struct doublecomplex_s f_ret_doublecomplex_s() {
+struct doublecomplex_s f_ret_doublecomplex_s(void) {
   return (struct doublecomplex_s){1.0};
 }
 
@@ -181,7 +181,7 @@ struct doublearr1_s { double a[1]; };
 void f_doublearr1_s_arg(struct doublearr1_s a) {}
 
 // CHECK: define{{.*}} double @f_ret_doublearr1_s()
-struct doublearr1_s f_ret_doublearr1_s() {
+struct doublearr1_s f_ret_doublearr1_s(void) {
   return (struct doublearr1_s){{1.0}};
 }
 
@@ -191,7 +191,7 @@ struct doublearr2_s { double a[2]; };
 void f_doublearr2_s_arg(struct doublearr2_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublearr2_s()
-struct doublearr2_s f_ret_doublearr2_s() {
+struct doublearr2_s f_ret_doublearr2_s(void) {
   return (struct doublearr2_s){{1.0, 2.0}};
 }
 
@@ -201,7 +201,7 @@ struct doublearr2_tricky1_s { struct { double f[1]; } g[2]; };
 void f_doublearr2_tricky1_s_arg(struct doublearr2_tricky1_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublearr2_tricky1_s()
-struct doublearr2_tricky1_s f_ret_doublearr2_tricky1_s() {
+struct doublearr2_tricky1_s f_ret_doublearr2_tricky1_s(void) {
   return (struct doublearr2_tricky1_s){{{{1.0}}, {{2.0}}}};
 }
 
@@ -211,7 +211,7 @@ struct doublearr2_tricky2_s { struct {}; struct { double f[1]; } g[2]; };
 void f_doublearr2_tricky2_s_arg(struct doublearr2_tricky2_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublearr2_tricky2_s()
-struct doublearr2_tricky2_s f_ret_doublearr2_tricky2_s() {
+struct doublearr2_tricky2_s f_ret_doublearr2_tricky2_s(void) {
   return (struct doublearr2_tricky2_s){{}, {{{1.0}}, {{2.0}}}};
 }
 
@@ -221,7 +221,7 @@ struct doublearr2_tricky3_s { union {}; struct { double f[1]; } g[2]; };
 void f_doublearr2_tricky3_s_arg(struct doublearr2_tricky3_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublearr2_tricky3_s()
-struct doublearr2_tricky3_s f_ret_doublearr2_tricky3_s() {
+struct doublearr2_tricky3_s f_ret_doublearr2_tricky3_s(void) {
   return (struct doublearr2_tricky3_s){{}, {{{1.0}}, {{2.0}}}};
 }
 
@@ -231,7 +231,7 @@ struct doublearr2_tricky4_s { union {}; struct { struct {}; double f[1]; } g[2];
 void f_doublearr2_tricky4_s_arg(struct doublearr2_tricky4_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublearr2_tricky4_s()
-struct doublearr2_tricky4_s f_ret_doublearr2_tricky4_s() {
+struct doublearr2_tricky4_s f_ret_doublearr2_tricky4_s(void) {
   return (struct doublearr2_tricky4_s){{}, {{{}, {1.0}}, {{}, {2.0}}}};
 }
 
@@ -244,7 +244,7 @@ struct int_double_int_s { int a; double b; int c; };
 void f_int_double_int_s_arg(struct int_double_int_s a) {}
 
 // CHECK: define{{.*}} void @f_ret_int_double_int_s(%struct.int_double_int_s* noalias sret(%struct.int_double_int_s) align 8 %agg.result)
-struct int_double_int_s f_ret_int_double_int_s() {
+struct int_double_int_s f_ret_int_double_int_s(void) {
   return (struct int_double_int_s){1, 2.0, 3};
 }
 
@@ -254,7 +254,7 @@ struct int64_double_s { int64_t a; double b; };
 void f_int64_double_s_arg(struct int64_double_s a) {}
 
 // CHECK: define{{.*}} void @f_ret_int64_double_s(%struct.int64_double_s* noalias sret(%struct.int64_double_s) align 8 %agg.result)
-struct int64_double_s f_ret_int64_double_s() {
+struct int64_double_s f_ret_int64_double_s(void) {
   return (struct int64_double_s){1, 2.0};
 }
 
@@ -264,7 +264,7 @@ struct char_char_double_s { char a; char b; double c; };
 void f_char_char_double_s_arg(struct char_char_double_s a) {}
 
 // CHECK: define{{.*}} void @f_ret_char_char_double_s(%struct.char_char_double_s* noalias sret(%struct.char_char_double_s) align 8 %agg.result)
-struct char_char_double_s f_ret_char_char_double_s() {
+struct char_char_double_s f_ret_char_char_double_s(void) {
   return (struct char_char_double_s){1, 2, 3.0};
 }
 
@@ -277,7 +277,7 @@ union double_u { double a; };
 void f_double_u_arg(union double_u a) {}
 
 // CHECK: define{{.*}} i64 @f_ret_double_u()
-union double_u f_ret_double_u() {
+union double_u f_ret_double_u(void) {
   return (union double_u){1.0};
 }
 

diff  --git a/clang/test/CodeGen/RISCV/riscv32-ilp32f-abi.c b/clang/test/CodeGen/RISCV/riscv32-ilp32f-abi.c
index 1963267e6ca88..5b416c38221fc 100644
--- a/clang/test/CodeGen/RISCV/riscv32-ilp32f-abi.c
+++ b/clang/test/CodeGen/RISCV/riscv32-ilp32f-abi.c
@@ -17,7 +17,7 @@ struct double_s { double d; };
 void f_double_s_arg(struct double_s a) {}
 
 // CHECK: define{{.*}} i64 @f_ret_double_s()
-struct double_s f_ret_double_s() {
+struct double_s f_ret_double_s(void) {
   return (struct double_s){1.0};
 }
 
@@ -27,7 +27,7 @@ struct double_double_s { double d; double e; };
 void f_double_double_s_arg(struct double_double_s a) {}
 
 // CHECK: define{{.*}} void @f_ret_double_double_s(%struct.double_double_s* noalias sret(%struct.double_double_s) align 8 %agg.result)
-struct double_double_s f_ret_double_double_s() {
+struct double_double_s f_ret_double_double_s(void) {
   return (struct double_double_s){1.0, 2.0};
 }
 
@@ -39,7 +39,7 @@ struct int_double_s { int a; double b; };
 void f_int_double_s_arg(struct int_double_s a) {}
 
 // CHECK: define{{.*}} void @f_ret_int_double_s(%struct.int_double_s* noalias sret(%struct.int_double_s) align 8 %agg.result)
-struct int_double_s f_ret_int_double_s() {
+struct int_double_s f_ret_int_double_s(void) {
   return (struct int_double_s){1, 2.0};
 }
 

diff  --git a/clang/test/CodeGen/RISCV/riscv32-ilp32f-ilp32d-abi.c b/clang/test/CodeGen/RISCV/riscv32-ilp32f-ilp32d-abi.c
index 3e4f9ed0fb51b..b6e5f362db817 100644
--- a/clang/test/CodeGen/RISCV/riscv32-ilp32f-ilp32d-abi.c
+++ b/clang/test/CodeGen/RISCV/riscv32-ilp32f-ilp32d-abi.c
@@ -31,7 +31,7 @@ struct float_s { float f; };
 void f_float_s_arg(struct float_s a) {}
 
 // CHECK: define{{.*}} float @f_ret_float_s()
-struct float_s f_ret_float_s() {
+struct float_s f_ret_float_s(void) {
   return (struct float_s){1.0};
 }
 
@@ -45,7 +45,7 @@ struct zbf_float_zbf_s { int : 0; float f; int : 0; };
 void f_zbf_float_s_arg(struct zbf_float_s a) {}
 
 // CHECK: define{{.*}} float @f_ret_zbf_float_s()
-struct zbf_float_s f_ret_zbf_float_s() {
+struct zbf_float_s f_ret_zbf_float_s(void) {
   return (struct zbf_float_s){1.0};
 }
 
@@ -53,7 +53,7 @@ struct zbf_float_s f_ret_zbf_float_s() {
 void f_zbf_float_zbf_s_arg(struct zbf_float_zbf_s a) {}
 
 // CHECK: define{{.*}} float @f_ret_zbf_float_zbf_s()
-struct zbf_float_zbf_s f_ret_zbf_float_zbf_s() {
+struct zbf_float_zbf_s f_ret_zbf_float_zbf_s(void) {
   return (struct zbf_float_zbf_s){1.0};
 }
 
@@ -66,7 +66,7 @@ struct float_float_s { float f; float g; };
 void f_float_float_s_arg(struct float_float_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_float_float_s()
-struct float_float_s f_ret_float_float_s() {
+struct float_float_s f_ret_float_float_s(void) {
   return (struct float_float_s){1.0, 2.0};
 }
 
@@ -89,7 +89,7 @@ struct float_int8_zbf_s { float f; int8_t i; int : 0; };
 void f_float_int8_s_arg(struct float_int8_s a) {}
 
 // CHECK: define{{.*}} { float, i8 } @f_ret_float_int8_s()
-struct float_int8_s f_ret_float_int8_s() {
+struct float_int8_s f_ret_float_int8_s(void) {
   return (struct float_int8_s){1.0, 2};
 }
 
@@ -97,7 +97,7 @@ struct float_int8_s f_ret_float_int8_s() {
 void f_float_uint8_s_arg(struct float_uint8_s a) {}
 
 // CHECK: define{{.*}} { float, i8 } @f_ret_float_uint8_s()
-struct float_uint8_s f_ret_float_uint8_s() {
+struct float_uint8_s f_ret_float_uint8_s(void) {
   return (struct float_uint8_s){1.0, 2};
 }
 
@@ -105,7 +105,7 @@ struct float_uint8_s f_ret_float_uint8_s() {
 void f_float_int32_s_arg(struct float_int32_s a) {}
 
 // CHECK: define{{.*}} { float, i32 } @f_ret_float_int32_s()
-struct float_int32_s f_ret_float_int32_s() {
+struct float_int32_s f_ret_float_int32_s(void) {
   return (struct float_int32_s){1.0, 2};
 }
 
@@ -113,7 +113,7 @@ struct float_int32_s f_ret_float_int32_s() {
 void f_float_int64_s_arg(struct float_int64_s a) {}
 
 // CHECK: define{{.*}} void @f_ret_float_int64_s(%struct.float_int64_s* noalias sret(%struct.float_int64_s) align 8 %agg.result)
-struct float_int64_s f_ret_float_int64_s() {
+struct float_int64_s f_ret_float_int64_s(void) {
   return (struct float_int64_s){1.0, 2};
 }
 
@@ -121,7 +121,7 @@ struct float_int64_s f_ret_float_int64_s() {
 void f_float_int64bf_s_arg(struct float_int64bf_s a) {}
 
 // CHECK: define{{.*}} { float, i32 } @f_ret_float_int64bf_s()
-struct float_int64bf_s f_ret_float_int64bf_s() {
+struct float_int64bf_s f_ret_float_int64bf_s(void) {
   return (struct float_int64bf_s){1.0, 2};
 }
 
@@ -132,7 +132,7 @@ struct float_int64bf_s f_ret_float_int64bf_s() {
 void f_float_int8_zbf_s(struct float_int8_zbf_s a) {}
 
 // CHECK: define{{.*}} { float, i8 } @f_ret_float_int8_zbf_s()
-struct float_int8_zbf_s f_ret_float_int8_zbf_s() {
+struct float_int8_zbf_s f_ret_float_int8_zbf_s(void) {
   return (struct float_int8_zbf_s){1.0, 2};
 }
 
@@ -151,7 +151,7 @@ void f_struct_float_int8_insufficient_fprs(float a, float b, float c, float d,
 void f_floatcomplex(float __complex__ a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatcomplex()
-float __complex__ f_ret_floatcomplex() {
+float __complex__ f_ret_floatcomplex(void) {
   return 1.0;
 }
 
@@ -161,7 +161,7 @@ struct floatcomplex_s { float __complex__ c; };
 void f_floatcomplex_s_arg(struct floatcomplex_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatcomplex_s()
-struct floatcomplex_s f_ret_floatcomplex_s() {
+struct floatcomplex_s f_ret_floatcomplex_s(void) {
   return (struct floatcomplex_s){1.0};
 }
 
@@ -174,7 +174,7 @@ struct floatarr1_s { float a[1]; };
 void f_floatarr1_s_arg(struct floatarr1_s a) {}
 
 // CHECK: define{{.*}} float @f_ret_floatarr1_s()
-struct floatarr1_s f_ret_floatarr1_s() {
+struct floatarr1_s f_ret_floatarr1_s(void) {
   return (struct floatarr1_s){{1.0}};
 }
 
@@ -184,7 +184,7 @@ struct floatarr2_s { float a[2]; };
 void f_floatarr2_s_arg(struct floatarr2_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatarr2_s()
-struct floatarr2_s f_ret_floatarr2_s() {
+struct floatarr2_s f_ret_floatarr2_s(void) {
   return (struct floatarr2_s){{1.0, 2.0}};
 }
 
@@ -194,7 +194,7 @@ struct floatarr2_tricky1_s { struct { float f[1]; } g[2]; };
 void f_floatarr2_tricky1_s_arg(struct floatarr2_tricky1_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatarr2_tricky1_s()
-struct floatarr2_tricky1_s f_ret_floatarr2_tricky1_s() {
+struct floatarr2_tricky1_s f_ret_floatarr2_tricky1_s(void) {
   return (struct floatarr2_tricky1_s){{{{1.0}}, {{2.0}}}};
 }
 
@@ -204,7 +204,7 @@ struct floatarr2_tricky2_s { struct {}; struct { float f[1]; } g[2]; };
 void f_floatarr2_tricky2_s_arg(struct floatarr2_tricky2_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatarr2_tricky2_s()
-struct floatarr2_tricky2_s f_ret_floatarr2_tricky2_s() {
+struct floatarr2_tricky2_s f_ret_floatarr2_tricky2_s(void) {
   return (struct floatarr2_tricky2_s){{}, {{{1.0}}, {{2.0}}}};
 }
 
@@ -214,7 +214,7 @@ struct floatarr2_tricky3_s { union {}; struct { float f[1]; } g[2]; };
 void f_floatarr2_tricky3_s_arg(struct floatarr2_tricky3_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatarr2_tricky3_s()
-struct floatarr2_tricky3_s f_ret_floatarr2_tricky3_s() {
+struct floatarr2_tricky3_s f_ret_floatarr2_tricky3_s(void) {
   return (struct floatarr2_tricky3_s){{}, {{{1.0}}, {{2.0}}}};
 }
 
@@ -224,7 +224,7 @@ struct floatarr2_tricky4_s { union {}; struct { struct {}; float f[1]; } g[2]; }
 void f_floatarr2_tricky4_s_arg(struct floatarr2_tricky4_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatarr2_tricky4_s()
-struct floatarr2_tricky4_s f_ret_floatarr2_tricky4_s() {
+struct floatarr2_tricky4_s f_ret_floatarr2_tricky4_s(void) {
   return (struct floatarr2_tricky4_s){{}, {{{}, {1.0}}, {{}, {2.0}}}};
 }
 
@@ -237,7 +237,7 @@ struct int_float_int_s { int a; float b; int c; };
 void f_int_float_int_s_arg(struct int_float_int_s a) {}
 
 // CHECK: define{{.*}} void @f_ret_int_float_int_s(%struct.int_float_int_s* noalias sret(%struct.int_float_int_s) align 4 %agg.result)
-struct int_float_int_s f_ret_int_float_int_s() {
+struct int_float_int_s f_ret_int_float_int_s(void) {
   return (struct int_float_int_s){1, 2.0, 3};
 }
 
@@ -247,7 +247,7 @@ struct int64_float_s { int64_t a; float b; };
 void f_int64_float_s_arg(struct int64_float_s a) {}
 
 // CHECK: define{{.*}} void @f_ret_int64_float_s(%struct.int64_float_s* noalias sret(%struct.int64_float_s) align 8 %agg.result)
-struct int64_float_s f_ret_int64_float_s() {
+struct int64_float_s f_ret_int64_float_s(void) {
   return (struct int64_float_s){1, 2.0};
 }
 
@@ -257,7 +257,7 @@ struct char_char_float_s { char a; char b; float c; };
 void f_char_char_float_s_arg(struct char_char_float_s a) {}
 
 // CHECK: define{{.*}} [2 x i32] @f_ret_char_char_float_s()
-struct char_char_float_s f_ret_char_char_float_s() {
+struct char_char_float_s f_ret_char_char_float_s(void) {
   return (struct char_char_float_s){1, 2, 3.0};
 }
 
@@ -270,6 +270,6 @@ union float_u { float a; };
 void f_float_u_arg(union float_u a) {}
 
 // CHECK: define{{.*}} i32 @f_ret_float_u()
-union float_u f_ret_float_u() {
+union float_u f_ret_float_u(void) {
   return (union float_u){1.0};
 }

diff  --git a/clang/test/CodeGen/RISCV/riscv64-lp64-abi.c b/clang/test/CodeGen/RISCV/riscv64-lp64-abi.c
index e7561c3f5c1b1..0554140653ad5 100644
--- a/clang/test/CodeGen/RISCV/riscv64-lp64-abi.c
+++ b/clang/test/CodeGen/RISCV/riscv64-lp64-abi.c
@@ -38,7 +38,7 @@ struct large f_scalar_stack_2(double a, __int128_t b, long double c, v32i8 d,
 void f_floatcomplex(float __complex__ a) {}
 
 // CHECK: define{{.*}} i64 @f_ret_floatcomplex()
-float __complex__ f_ret_floatcomplex() {
+float __complex__ f_ret_floatcomplex(void) {
   return 1.0;
 }
 
@@ -48,6 +48,6 @@ struct floatcomplex_s { float __complex__ c; };
 void f_floatcomplex_s_arg(struct floatcomplex_s a) {}
 
 // CHECK: define{{.*}} i64 @f_ret_floatcomplex_s()
-struct floatcomplex_s f_ret_floatcomplex_s() {
+struct floatcomplex_s f_ret_floatcomplex_s(void) {
   return (struct floatcomplex_s){1.0};
 }

diff  --git a/clang/test/CodeGen/RISCV/riscv64-lp64-lp64f-lp64d-abi.c b/clang/test/CodeGen/RISCV/riscv64-lp64-lp64f-lp64d-abi.c
index 032afdf022600..349bfa190cfcd 100644
--- a/clang/test/CodeGen/RISCV/riscv64-lp64-lp64f-lp64d-abi.c
+++ b/clang/test/CodeGen/RISCV/riscv64-lp64-lp64f-lp64d-abi.c
@@ -70,7 +70,7 @@ void f_agg_tiny(struct tiny x) {
 }
 
 // CHECK-LABEL: define{{.*}} i64 @f_agg_tiny_ret()
-struct tiny f_agg_tiny_ret() {
+struct tiny f_agg_tiny_ret(void) {
   return (struct tiny){1, 2, 3, 4};
 }
 
@@ -84,7 +84,7 @@ void f_vec_tiny_v4i16(v4i16 x) {
 }
 
 // CHECK-LABEL: define{{.*}} i64 @f_vec_tiny_v4i16_ret()
-v4i16 f_vec_tiny_v4i16_ret() {
+v4i16 f_vec_tiny_v4i16_ret(void) {
   return (v4i16){1, 2, 3, 4};
 }
 
@@ -94,7 +94,7 @@ void f_vec_tiny_v1i64(v1i64 x) {
 }
 
 // CHECK-LABEL: define{{.*}} i64 @f_vec_tiny_v1i64_ret()
-v1i64 f_vec_tiny_v1i64_ret() {
+v1i64 f_vec_tiny_v1i64_ret(void) {
   return (v1i64){1};
 }
 
@@ -109,7 +109,7 @@ void f_agg_small(struct small x) {
 }
 
 // CHECK-LABEL: define{{.*}} [2 x i64] @f_agg_small_ret()
-struct small f_agg_small_ret() {
+struct small f_agg_small_ret(void) {
   return (struct small){1, 0};
 }
 
@@ -122,7 +122,7 @@ void f_vec_small_v8i16(v8i16 x) {
 }
 
 // CHECK-LABEL: define{{.*}} i128 @f_vec_small_v8i16_ret()
-v8i16 f_vec_small_v8i16_ret() {
+v8i16 f_vec_small_v8i16_ret(void) {
   return (v8i16){1, 2, 3, 4, 5, 6, 7, 8};
 }
 
@@ -132,7 +132,7 @@ void f_vec_small_v1i128(v1i128 x) {
 }
 
 // CHECK-LABEL: define{{.*}} i128 @f_vec_small_v1i128_ret()
-v1i128 f_vec_small_v1i128_ret() {
+v1i128 f_vec_small_v1i128_ret(void) {
   return (v1i128){1};
 }
 
@@ -179,7 +179,7 @@ void f_vec_large_v32i8(v32i8 x) {
 }
 
 // CHECK-LABEL: define{{.*}} void @f_vec_large_v32i8_ret(<32 x i8>* noalias sret(<32 x i8>) align 32 %agg.result)
-v32i8 f_vec_large_v32i8_ret() {
+v32i8 f_vec_large_v32i8_ret(void) {
   return (v32i8){1, 2, 3, 4, 5, 6, 7, 8};
 }
 
@@ -216,7 +216,7 @@ struct large f_scalar_stack_3(uint32_t a, __int128_t b, long double c, v32i8 d,
 int f_va_callee(int, ...);
 
 // CHECK-LABEL: define{{.*}} void @f_va_caller()
-void f_va_caller() {
+void f_va_caller(void) {
   // CHECK: call signext i32 (i32, ...) @f_va_callee(i32 noundef signext 1, i32 noundef signext 2, i64 noundef 3, double noundef 4.000000e+00, double noundef 5.000000e+00, i64 {{%.*}}, [2 x i64] {{%.*}}, i128 {{%.*}}, %struct.large* noundef {{%.*}})
   f_va_callee(1, 2, 3LL, 4.0f, 5.0, (struct tiny){6, 7, 8, 9},
               (struct small){10, NULL}, (struct small_aligned){11},

diff  --git a/clang/test/CodeGen/RISCV/riscv64-lp64d-abi.c b/clang/test/CodeGen/RISCV/riscv64-lp64d-abi.c
index 7fb470bf0df9c..fb149c5dca888 100644
--- a/clang/test/CodeGen/RISCV/riscv64-lp64d-abi.c
+++ b/clang/test/CodeGen/RISCV/riscv64-lp64d-abi.c
@@ -29,7 +29,7 @@ struct double_s { double f; };
 void f_double_s_arg(struct double_s a) {}
 
 // CHECK: define{{.*}} double @f_ret_double_s()
-struct double_s f_ret_double_s() {
+struct double_s f_ret_double_s(void) {
   return (struct double_s){1.0};
 }
 
@@ -43,7 +43,7 @@ struct zbf_double_zbf_s { int : 0; double f; int : 0; };
 void f_zbf_double_s_arg(struct zbf_double_s a) {}
 
 // CHECK: define{{.*}} double @f_ret_zbf_double_s()
-struct zbf_double_s f_ret_zbf_double_s() {
+struct zbf_double_s f_ret_zbf_double_s(void) {
   return (struct zbf_double_s){1.0};
 }
 
@@ -51,7 +51,7 @@ struct zbf_double_s f_ret_zbf_double_s() {
 void f_zbf_double_zbf_s_arg(struct zbf_double_zbf_s a) {}
 
 // CHECK: define{{.*}} double @f_ret_zbf_double_zbf_s()
-struct zbf_double_zbf_s f_ret_zbf_double_zbf_s() {
+struct zbf_double_zbf_s f_ret_zbf_double_zbf_s(void) {
   return (struct zbf_double_zbf_s){1.0};
 }
 
@@ -65,7 +65,7 @@ struct double_float_s { double f; float g; };
 void f_double_double_s_arg(struct double_double_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_double_double_s()
-struct double_double_s f_ret_double_double_s() {
+struct double_double_s f_ret_double_double_s(void) {
   return (struct double_double_s){1.0, 2.0};
 }
 
@@ -73,7 +73,7 @@ struct double_double_s f_ret_double_double_s() {
 void f_double_float_s_arg(struct double_float_s a) {}
 
 // CHECK: define{{.*}} { double, float } @f_ret_double_float_s()
-struct double_float_s f_ret_double_float_s() {
+struct double_float_s f_ret_double_float_s(void) {
   return (struct double_float_s){1.0, 2.0};
 }
 
@@ -96,7 +96,7 @@ struct double_int8_zbf_s { double f; int8_t i; int : 0; };
 void f_double_int8_s_arg(struct double_int8_s a) {}
 
 // CHECK: define{{.*}} { double, i8 } @f_ret_double_int8_s()
-struct double_int8_s f_ret_double_int8_s() {
+struct double_int8_s f_ret_double_int8_s(void) {
   return (struct double_int8_s){1.0, 2};
 }
 
@@ -104,7 +104,7 @@ struct double_int8_s f_ret_double_int8_s() {
 void f_double_uint8_s_arg(struct double_uint8_s a) {}
 
 // CHECK: define{{.*}} { double, i8 } @f_ret_double_uint8_s()
-struct double_uint8_s f_ret_double_uint8_s() {
+struct double_uint8_s f_ret_double_uint8_s(void) {
   return (struct double_uint8_s){1.0, 2};
 }
 
@@ -112,7 +112,7 @@ struct double_uint8_s f_ret_double_uint8_s() {
 void f_double_int32_s_arg(struct double_int32_s a) {}
 
 // CHECK: define{{.*}} { double, i32 } @f_ret_double_int32_s()
-struct double_int32_s f_ret_double_int32_s() {
+struct double_int32_s f_ret_double_int32_s(void) {
   return (struct double_int32_s){1.0, 2};
 }
 
@@ -120,7 +120,7 @@ struct double_int32_s f_ret_double_int32_s() {
 void f_double_int64_s_arg(struct double_int64_s a) {}
 
 // CHECK: define{{.*}} { double, i64 } @f_ret_double_int64_s()
-struct double_int64_s f_ret_double_int64_s() {
+struct double_int64_s f_ret_double_int64_s(void) {
   return (struct double_int64_s){1.0, 2};
 }
 
@@ -128,7 +128,7 @@ struct double_int64_s f_ret_double_int64_s() {
 void f_double_int128bf_s_arg(struct double_int128bf_s a) {}
 
 // CHECK: define{{.*}} { double, i64 } @f_ret_double_int128bf_s()
-struct double_int128bf_s f_ret_double_int128bf_s() {
+struct double_int128bf_s f_ret_double_int128bf_s(void) {
   return (struct double_int128bf_s){1.0, 2};
 }
 
@@ -139,7 +139,7 @@ struct double_int128bf_s f_ret_double_int128bf_s() {
 void f_double_int8_zbf_s(struct double_int8_zbf_s a) {}
 
 // CHECK: define{{.*}} { double, i8 } @f_ret_double_int8_zbf_s()
-struct double_int8_zbf_s f_ret_double_int8_zbf_s() {
+struct double_int8_zbf_s f_ret_double_int8_zbf_s(void) {
   return (struct double_int8_zbf_s){1.0, 2};
 }
 
@@ -158,7 +158,7 @@ void f_struct_double_int8_insufficient_fprs(float a, double b, double c, double
 void f_doublecomplex(double __complex__ a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublecomplex()
-double __complex__ f_ret_doublecomplex() {
+double __complex__ f_ret_doublecomplex(void) {
   return 1.0;
 }
 
@@ -168,7 +168,7 @@ struct doublecomplex_s { double __complex__ c; };
 void f_doublecomplex_s_arg(struct doublecomplex_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublecomplex_s()
-struct doublecomplex_s f_ret_doublecomplex_s() {
+struct doublecomplex_s f_ret_doublecomplex_s(void) {
   return (struct doublecomplex_s){1.0};
 }
 
@@ -181,7 +181,7 @@ struct doublearr1_s { double a[1]; };
 void f_doublearr1_s_arg(struct doublearr1_s a) {}
 
 // CHECK: define{{.*}} double @f_ret_doublearr1_s()
-struct doublearr1_s f_ret_doublearr1_s() {
+struct doublearr1_s f_ret_doublearr1_s(void) {
   return (struct doublearr1_s){{1.0}};
 }
 
@@ -191,7 +191,7 @@ struct doublearr2_s { double a[2]; };
 void f_doublearr2_s_arg(struct doublearr2_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublearr2_s()
-struct doublearr2_s f_ret_doublearr2_s() {
+struct doublearr2_s f_ret_doublearr2_s(void) {
   return (struct doublearr2_s){{1.0, 2.0}};
 }
 
@@ -201,7 +201,7 @@ struct doublearr2_tricky1_s { struct { double f[1]; } g[2]; };
 void f_doublearr2_tricky1_s_arg(struct doublearr2_tricky1_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublearr2_tricky1_s()
-struct doublearr2_tricky1_s f_ret_doublearr2_tricky1_s() {
+struct doublearr2_tricky1_s f_ret_doublearr2_tricky1_s(void) {
   return (struct doublearr2_tricky1_s){{{{1.0}}, {{2.0}}}};
 }
 
@@ -211,7 +211,7 @@ struct doublearr2_tricky2_s { struct {}; struct { double f[1]; } g[2]; };
 void f_doublearr2_tricky2_s_arg(struct doublearr2_tricky2_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublearr2_tricky2_s()
-struct doublearr2_tricky2_s f_ret_doublearr2_tricky2_s() {
+struct doublearr2_tricky2_s f_ret_doublearr2_tricky2_s(void) {
   return (struct doublearr2_tricky2_s){{}, {{{1.0}}, {{2.0}}}};
 }
 
@@ -221,7 +221,7 @@ struct doublearr2_tricky3_s { union {}; struct { double f[1]; } g[2]; };
 void f_doublearr2_tricky3_s_arg(struct doublearr2_tricky3_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublearr2_tricky3_s()
-struct doublearr2_tricky3_s f_ret_doublearr2_tricky3_s() {
+struct doublearr2_tricky3_s f_ret_doublearr2_tricky3_s(void) {
   return (struct doublearr2_tricky3_s){{}, {{{1.0}}, {{2.0}}}};
 }
 
@@ -231,7 +231,7 @@ struct doublearr2_tricky4_s { union {}; struct { struct {}; double f[1]; } g[2];
 void f_doublearr2_tricky4_s_arg(struct doublearr2_tricky4_s a) {}
 
 // CHECK: define{{.*}} { double, double } @f_ret_doublearr2_tricky4_s()
-struct doublearr2_tricky4_s f_ret_doublearr2_tricky4_s() {
+struct doublearr2_tricky4_s f_ret_doublearr2_tricky4_s(void) {
   return (struct doublearr2_tricky4_s){{}, {{{}, {1.0}}, {{}, {2.0}}}};
 }
 
@@ -244,7 +244,7 @@ struct int_double_int_s { int a; double b; int c; };
 void f_int_double_int_s_arg(struct int_double_int_s a) {}
 
 // CHECK: define{{.*}} void @f_ret_int_double_int_s(%struct.int_double_int_s* noalias sret(%struct.int_double_int_s) align 8 %agg.result)
-struct int_double_int_s f_ret_int_double_int_s() {
+struct int_double_int_s f_ret_int_double_int_s(void) {
   return (struct int_double_int_s){1, 2.0, 3};
 }
 
@@ -254,7 +254,7 @@ struct char_char_double_s { char a; char b; double c; };
 void f_char_char_double_s_arg(struct char_char_double_s a) {}
 
 // CHECK: define{{.*}} [2 x i64] @f_ret_char_char_double_s()
-struct char_char_double_s f_ret_char_char_double_s() {
+struct char_char_double_s f_ret_char_char_double_s(void) {
   return (struct char_char_double_s){1, 2, 3.0};
 }
 
@@ -267,6 +267,6 @@ union double_u { double a; };
 void f_double_u_arg(union double_u a) {}
 
 // CHECK: define{{.*}} i64 @f_ret_double_u()
-union double_u f_ret_double_u() {
+union double_u f_ret_double_u(void) {
   return (union double_u){1.0};
 }

diff  --git a/clang/test/CodeGen/RISCV/riscv64-lp64f-lp64d-abi.c b/clang/test/CodeGen/RISCV/riscv64-lp64f-lp64d-abi.c
index 6a0945c39aeaf..e5c85615785cb 100644
--- a/clang/test/CodeGen/RISCV/riscv64-lp64f-lp64d-abi.c
+++ b/clang/test/CodeGen/RISCV/riscv64-lp64f-lp64d-abi.c
@@ -31,7 +31,7 @@ struct float_s { float f; };
 void f_float_s_arg(struct float_s a) {}
 
 // CHECK: define{{.*}} float @f_ret_float_s()
-struct float_s f_ret_float_s() {
+struct float_s f_ret_float_s(void) {
   return (struct float_s){1.0};
 }
 
@@ -45,7 +45,7 @@ struct zbf_float_zbf_s { int : 0; float f; int : 0; };
 void f_zbf_float_s_arg(struct zbf_float_s a) {}
 
 // CHECK: define{{.*}} float @f_ret_zbf_float_s()
-struct zbf_float_s f_ret_zbf_float_s() {
+struct zbf_float_s f_ret_zbf_float_s(void) {
   return (struct zbf_float_s){1.0};
 }
 
@@ -53,7 +53,7 @@ struct zbf_float_s f_ret_zbf_float_s() {
 void f_zbf_float_zbf_s_arg(struct zbf_float_zbf_s a) {}
 
 // CHECK: define{{.*}} float @f_ret_zbf_float_zbf_s()
-struct zbf_float_zbf_s f_ret_zbf_float_zbf_s() {
+struct zbf_float_zbf_s f_ret_zbf_float_zbf_s(void) {
   return (struct zbf_float_zbf_s){1.0};
 }
 
@@ -66,7 +66,7 @@ struct float_float_s { float f; float g; };
 void f_float_float_s_arg(struct float_float_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_float_float_s()
-struct float_float_s f_ret_float_float_s() {
+struct float_float_s f_ret_float_float_s(void) {
   return (struct float_float_s){1.0, 2.0};
 }
 
@@ -89,7 +89,7 @@ struct float_int8_zbf_s { float f; int8_t i; int : 0; };
 void f_float_int8_s_arg(struct float_int8_s a) {}
 
 // CHECK: define{{.*}} { float, i8 } @f_ret_float_int8_s()
-struct float_int8_s f_ret_float_int8_s() {
+struct float_int8_s f_ret_float_int8_s(void) {
   return (struct float_int8_s){1.0, 2};
 }
 
@@ -97,7 +97,7 @@ struct float_int8_s f_ret_float_int8_s() {
 void f_float_uint8_s_arg(struct float_uint8_s a) {}
 
 // CHECK: define{{.*}} { float, i8 } @f_ret_float_uint8_s()
-struct float_uint8_s f_ret_float_uint8_s() {
+struct float_uint8_s f_ret_float_uint8_s(void) {
   return (struct float_uint8_s){1.0, 2};
 }
 
@@ -105,7 +105,7 @@ struct float_uint8_s f_ret_float_uint8_s() {
 void f_float_int32_s_arg(struct float_int32_s a) {}
 
 // CHECK: define{{.*}} { float, i32 } @f_ret_float_int32_s()
-struct float_int32_s f_ret_float_int32_s() {
+struct float_int32_s f_ret_float_int32_s(void) {
   return (struct float_int32_s){1.0, 2};
 }
 
@@ -113,7 +113,7 @@ struct float_int32_s f_ret_float_int32_s() {
 void f_float_int64_s_arg(struct float_int64_s a) {}
 
 // CHECK: define{{.*}} { float, i64 } @f_ret_float_int64_s()
-struct float_int64_s f_ret_float_int64_s() {
+struct float_int64_s f_ret_float_int64_s(void) {
   return (struct float_int64_s){1.0, 2};
 }
 
@@ -121,7 +121,7 @@ struct float_int64_s f_ret_float_int64_s() {
 void f_float_int128bf_s_arg(struct float_int128bf_s a) {}
 
 // CHECK: define{{.*}} <{ float, i64 }> @f_ret_float_int128bf_s()
-struct float_int128bf_s f_ret_float_int128bf_s() {
+struct float_int128bf_s f_ret_float_int128bf_s(void) {
   return (struct float_int128bf_s){1.0, 2};
 }
 
@@ -132,7 +132,7 @@ struct float_int128bf_s f_ret_float_int128bf_s() {
 void f_float_int8_zbf_s(struct float_int8_zbf_s a) {}
 
 // CHECK: define{{.*}} { float, i8 } @f_ret_float_int8_zbf_s()
-struct float_int8_zbf_s f_ret_float_int8_zbf_s() {
+struct float_int8_zbf_s f_ret_float_int8_zbf_s(void) {
   return (struct float_int8_zbf_s){1.0, 2};
 }
 
@@ -151,7 +151,7 @@ void f_struct_float_int8_insufficient_fprs(float a, float b, float c, float d,
 void f_floatcomplex(float __complex__ a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatcomplex()
-float __complex__ f_ret_floatcomplex() {
+float __complex__ f_ret_floatcomplex(void) {
   return 1.0;
 }
 
@@ -161,7 +161,7 @@ struct floatcomplex_s { float __complex__ c; };
 void f_floatcomplex_s_arg(struct floatcomplex_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatcomplex_s()
-struct floatcomplex_s f_ret_floatcomplex_s() {
+struct floatcomplex_s f_ret_floatcomplex_s(void) {
   return (struct floatcomplex_s){1.0};
 }
 
@@ -203,7 +203,7 @@ struct floatarr1_s { float a[1]; };
 void f_floatarr1_s_arg(struct floatarr1_s a) {}
 
 // CHECK: define{{.*}} float @f_ret_floatarr1_s()
-struct floatarr1_s f_ret_floatarr1_s() {
+struct floatarr1_s f_ret_floatarr1_s(void) {
   return (struct floatarr1_s){{1.0}};
 }
 
@@ -213,7 +213,7 @@ struct floatarr2_s { float a[2]; };
 void f_floatarr2_s_arg(struct floatarr2_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatarr2_s()
-struct floatarr2_s f_ret_floatarr2_s() {
+struct floatarr2_s f_ret_floatarr2_s(void) {
   return (struct floatarr2_s){{1.0, 2.0}};
 }
 
@@ -223,7 +223,7 @@ struct floatarr2_tricky1_s { struct { float f[1]; } g[2]; };
 void f_floatarr2_tricky1_s_arg(struct floatarr2_tricky1_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatarr2_tricky1_s()
-struct floatarr2_tricky1_s f_ret_floatarr2_tricky1_s() {
+struct floatarr2_tricky1_s f_ret_floatarr2_tricky1_s(void) {
   return (struct floatarr2_tricky1_s){{{{1.0}}, {{2.0}}}};
 }
 
@@ -233,7 +233,7 @@ struct floatarr2_tricky2_s { struct {}; struct { float f[1]; } g[2]; };
 void f_floatarr2_tricky2_s_arg(struct floatarr2_tricky2_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatarr2_tricky2_s()
-struct floatarr2_tricky2_s f_ret_floatarr2_tricky2_s() {
+struct floatarr2_tricky2_s f_ret_floatarr2_tricky2_s(void) {
   return (struct floatarr2_tricky2_s){{}, {{{1.0}}, {{2.0}}}};
 }
 
@@ -243,7 +243,7 @@ struct floatarr2_tricky3_s { union {}; struct { float f[1]; } g[2]; };
 void f_floatarr2_tricky3_s_arg(struct floatarr2_tricky3_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatarr2_tricky3_s()
-struct floatarr2_tricky3_s f_ret_floatarr2_tricky3_s() {
+struct floatarr2_tricky3_s f_ret_floatarr2_tricky3_s(void) {
   return (struct floatarr2_tricky3_s){{}, {{{1.0}}, {{2.0}}}};
 }
 
@@ -253,7 +253,7 @@ struct floatarr2_tricky4_s { union {}; struct { struct {}; float f[1]; } g[2]; }
 void f_floatarr2_tricky4_s_arg(struct floatarr2_tricky4_s a) {}
 
 // CHECK: define{{.*}} { float, float } @f_ret_floatarr2_tricky4_s()
-struct floatarr2_tricky4_s f_ret_floatarr2_tricky4_s() {
+struct floatarr2_tricky4_s f_ret_floatarr2_tricky4_s(void) {
   return (struct floatarr2_tricky4_s){{}, {{{}, {1.0}}, {{}, {2.0}}}};
 }
 
@@ -266,7 +266,7 @@ struct int_float_int_s { int a; float b; int c; };
 void f_int_float_int_s_arg(struct int_float_int_s a) {}
 
 // CHECK: define{{.*}} [2 x i64] @f_ret_int_float_int_s()
-struct int_float_int_s f_ret_int_float_int_s() {
+struct int_float_int_s f_ret_int_float_int_s(void) {
   return (struct int_float_int_s){1, 2.0, 3};
 }
 
@@ -276,7 +276,7 @@ struct char_char_float_s { char a; char b; float c; };
 void f_char_char_float_s_arg(struct char_char_float_s a) {}
 
 // CHECK: define{{.*}} i64 @f_ret_char_char_float_s()
-struct char_char_float_s f_ret_char_char_float_s() {
+struct char_char_float_s f_ret_char_char_float_s(void) {
   return (struct char_char_float_s){1, 2, 3.0};
 }
 
@@ -289,6 +289,6 @@ union float_u { float a; };
 void f_float_u_arg(union float_u a) {}
 
 // CHECK: define{{.*}} i64 @f_ret_float_u()
-union float_u f_ret_float_u() {
+union float_u f_ret_float_u(void) {
   return (union float_u){1.0};
 }

diff  --git a/clang/test/CodeGen/RISCV/rvv_errors.c b/clang/test/CodeGen/RISCV/rvv_errors.c
index 8316a4313274a..2bb42dc3fd345 100644
--- a/clang/test/CodeGen/RISCV/rvv_errors.c
+++ b/clang/test/CodeGen/RISCV/rvv_errors.c
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 %s -triple=riscv64 -target-feature +v -fsyntax-only -verify
 
-void test() {
+void test(void) {
   __builtin_rvv_vsetvli(1, 7, 0); // expected-error {{argument value 7 is outside the valid range [0, 3]}}
   __builtin_rvv_vsetvlimax(-1, 0); // expected-error {{argument value 18446744073709551615 is outside the valid range [0, 3]}}
   __builtin_rvv_vsetvli(1, 0, 4); // expected-error {{LMUL argument must be in the range [0,3] or [5,7]}}

diff  --git a/clang/test/CodeGen/SystemZ/s390x-packed-struct-func-arg.c b/clang/test/CodeGen/SystemZ/s390x-packed-struct-func-arg.c
index df68b03119399..71fe384c461e9 100644
--- a/clang/test/CodeGen/SystemZ/s390x-packed-struct-func-arg.c
+++ b/clang/test/CodeGen/SystemZ/s390x-packed-struct-func-arg.c
@@ -15,7 +15,7 @@ void f(struct S0 arg) {
   arg.f2 = 1;
 }
 
-void g() {
+void g(void) {
   struct S1 g;
   // CHECK: alloca %struct.S0, align 8
   // CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 8 {{.*}}, i8* align 1 {{.*}}, i64 16

diff  --git a/clang/test/CodeGen/SystemZ/systemz-inline-asm.c b/clang/test/CodeGen/SystemZ/systemz-inline-asm.c
index d1392bdf1d54a..aa8daf1a762db 100644
--- a/clang/test/CodeGen/SystemZ/systemz-inline-asm.c
+++ b/clang/test/CodeGen/SystemZ/systemz-inline-asm.c
@@ -33,7 +33,7 @@ void test_store_T(unsigned int i) {
 // CHECK: call void asm "st $1, $0", "=*T,r"(i32* nonnull elementtype(i32) @gi, i32 %i)
 }
 
-int test_load_m() {
+int test_load_m(void) {
   unsigned int i;
   asm("l %0, %1" : "=r" (i) : "m" (gi));
   return i;
@@ -41,7 +41,7 @@ int test_load_m() {
 // CHECK: call i32 asm "l $0, $1", "=r,*m"(i32* nonnull elementtype(i32) @gi)
 }
 
-int test_load_Q() {
+int test_load_Q(void) {
   unsigned int i;
   asm("l %0, %1" : "=r" (i) : "Q" (gi));
   return i;
@@ -49,7 +49,7 @@ int test_load_Q() {
 // CHECK: call i32 asm "l $0, $1", "=r,*Q"(i32* nonnull elementtype(i32) @gi)
 }
 
-int test_load_R() {
+int test_load_R(void) {
   unsigned int i;
   asm("l %0, %1" : "=r" (i) : "R" (gi));
   return i;
@@ -57,7 +57,7 @@ int test_load_R() {
 // CHECK: call i32 asm "l $0, $1", "=r,*R"(i32* nonnull elementtype(i32) @gi)
 }
 
-int test_load_S() {
+int test_load_S(void) {
   unsigned int i;
   asm("l %0, %1" : "=r" (i) : "S" (gi));
   return i;
@@ -65,7 +65,7 @@ int test_load_S() {
 // CHECK: call i32 asm "l $0, $1", "=r,*S"(i32* nonnull elementtype(i32) @gi)
 }
 
-int test_load_T() {
+int test_load_T(void) {
   unsigned int i;
   asm("l %0, %1" : "=r" (i) : "T" (gi));
   return i;
@@ -100,7 +100,7 @@ unsigned long test_rL(unsigned long i) {
 // CHECK: call i64 asm "sllg $0, $1, $2", "=r,r,L"(i64 %i, i32 500000)
 }
 
-void test_M() {
+void test_M(void) {
   asm volatile("#FOO %0" :: "M"(0x7fffffff));
 // CHECK-LABEL: define{{.*}} void @test_M()
 // CHECK: call void asm sideeffect "#FOO $0", "M"(i32 2147483647)

diff  --git a/clang/test/CodeGen/SystemZ/zos-alignment.c b/clang/test/CodeGen/SystemZ/zos-alignment.c
index be26c5a2785dd..370a727c98198 100644
--- a/clang/test/CodeGen/SystemZ/zos-alignment.c
+++ b/clang/test/CodeGen/SystemZ/zos-alignment.c
@@ -6,7 +6,7 @@ int __attribute__((aligned(32))) v1;
 typedef int __attribute__((aligned(32))) int32;
 static int32 v2;
 int32 v3;
-int f0() { return v0 + v1 + v2 + v3; }
+int f0(void) { return v0 + v1 + v2 + v3; }
 // DECL:      @v0 {{.*}} align 16
 // DECL-NEXT: @v1 {{.*}} align 32
 // DECL-NEXT: @v2 {{.*}} align 16

diff  --git a/clang/test/CodeGen/WebAssembly/wasm-arguments.c b/clang/test/CodeGen/WebAssembly/wasm-arguments.c
index 04b19749119dd..f51fb17456b2f 100644
--- a/clang/test/CodeGen/WebAssembly/wasm-arguments.c
+++ b/clang/test/CodeGen/WebAssembly/wasm-arguments.c
@@ -33,7 +33,7 @@ void struct_arg(s1 i) {}
 // Except with the experimental multivalue ABI, which returns structs by value
 // EXPERIMENTAL-MV: define %struct.s1 @struct_ret()
 // EXPERIMENTAL-MV: ret %struct.s1 %0
-s1 struct_ret() {
+s1 struct_ret(void) {
   s1 foo;
   return foo;
 }
@@ -53,7 +53,7 @@ void single_elem_arg(s2 i) {}
 // WEBASSEMBLY32: ret i32
 // WEBASSEMBLY64: define i32 @single_elem_ret()
 // EXPERIMENTAL-MV: define i32 @single_elem_ret()
-s2 single_elem_ret() {
+s2 single_elem_ret(void) {
   s2 foo;
   return foo;
 }
@@ -111,7 +111,7 @@ void union_arg(union simple_union s) {}
 // The experimental multivalue ABI returns them by value, though.
 // EXPERIMENTAL-MV: define %union.simple_union @union_ret()
 // EXPERIMENTAL-MV: ret %union.simple_union %0
-union simple_union union_ret() {
+union simple_union union_ret(void) {
   union simple_union bar;
   return bar;
 }
@@ -134,7 +134,7 @@ void bitfield_arg(bitfield1 bf1) {}
 
 // Except, of course, in the experimental multivalue ABI
 // EXPERIMENTAL-MV: define %struct.bitfield1 @bitfield_ret()
-bitfield1 bitfield_ret() {
+bitfield1 bitfield_ret(void) {
   bitfield1 baz;
   return baz;
 }

diff  --git a/clang/test/CodeGen/X86/avx-builtins.c b/clang/test/CodeGen/X86/avx-builtins.c
index 261beb3b0d255..05b487a20310d 100644
--- a/clang/test/CodeGen/X86/avx-builtins.c
+++ b/clang/test/CodeGen/X86/avx-builtins.c
@@ -1827,19 +1827,19 @@ __m256 test_mm256_setr_ps(float A0, float A1, float A2, float A3, float A4, floa
   return _mm256_setr_ps(A0, A1, A2, A3, A4, A5, A6, A7);
 }
 
-__m256d test_mm256_setzero_pd() {
+__m256d test_mm256_setzero_pd(void) {
   // CHECK-LABEL: test_mm256_setzero_pd
   // CHECK: store <4 x double> zeroinitializer
   return _mm256_setzero_pd();
 }
 
-__m256 test_mm256_setzero_ps() {
+__m256 test_mm256_setzero_ps(void) {
   // CHECK-LABEL: test_mm256_setzero_ps
   // CHECK: store <8 x float> zeroinitializer
   return _mm256_setzero_ps();
 }
 
-__m256i test_mm256_setzero_si256() {
+__m256i test_mm256_setzero_si256(void) {
   // CHECK-LABEL: test_mm256_setzero_si256
   // CHECK: store <4 x i64> zeroinitializer
   return _mm256_setzero_si256();
@@ -2055,19 +2055,19 @@ int test_mm256_testz_si256(__m256i A, __m256i B) {
   return _mm256_testz_si256(A, B);
 }
 
-__m256 test_mm256_undefined_ps() {
+__m256 test_mm256_undefined_ps(void) {
   // CHECK-LABEL: test_mm256_undefined_ps
   // CHECK: ret <8 x float> zeroinitializer
   return _mm256_undefined_ps();
 }
 
-__m256d test_mm256_undefined_pd() {
+__m256d test_mm256_undefined_pd(void) {
   // CHECK-LABEL: test_mm256_undefined_pd
   // CHECK: ret <4 x double> zeroinitializer
   return _mm256_undefined_pd();
 }
 
-__m256i test_mm256_undefined_si256() {
+__m256i test_mm256_undefined_si256(void) {
   // CHECK-LABEL: test_mm256_undefined_si256
   // CHECK: ret <4 x i64> zeroinitializer
   return _mm256_undefined_si256();
@@ -2109,13 +2109,13 @@ __m256 test_mm256_xor_ps(__m256 A, __m256 B) {
   return _mm256_xor_ps(A, B);
 }
 
-void test_mm256_zeroall() {
+void test_mm256_zeroall(void) {
   // CHECK-LABEL: test_mm256_zeroall
   // CHECK: call void @llvm.x86.avx.vzeroall()
   return _mm256_zeroall();
 }
 
-void test_mm256_zeroupper() {
+void test_mm256_zeroupper(void) {
   // CHECK-LABEL: test_mm256_zeroupper
   // CHECK: call void @llvm.x86.avx.vzeroupper()
   return _mm256_zeroupper();

diff  --git a/clang/test/CodeGen/X86/avx-union.c b/clang/test/CodeGen/X86/avx-union.c
index 2c4525f4f2074..27f47cfce5775 100644
--- a/clang/test/CodeGen/X86/avx-union.c
+++ b/clang/test/CodeGen/X86/avx-union.c
@@ -31,7 +31,7 @@ union M512 m2;
 // AVX:           call void @foo2(%union.M512* noundef byval(%union.M512) align 64
 // AVX512:        call void @foo2(<8 x double>
 // AVX512-LEGACY: call void @foo2(%union.M512* noundef byval(%union.M512) align 64
-void test() {
+void test(void) {
   foo1(m1);
   foo2(m2);
 }

diff  --git a/clang/test/CodeGen/X86/avx512-inline-asm-kregisters-basics.c b/clang/test/CodeGen/X86/avx512-inline-asm-kregisters-basics.c
index 8c0cb9f534569..ee2a5f5272c05 100644
--- a/clang/test/CodeGen/X86/avx512-inline-asm-kregisters-basics.c
+++ b/clang/test/CodeGen/X86/avx512-inline-asm-kregisters-basics.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 %s -O0 -triple=x86_64-apple-darwin -target-cpu skylake-avx512 -emit-llvm -o - -Wall -Werror | FileCheck %s
 // This test checks basic inline assembly recognition of k0-k7 registers for avx512.
 
-void test_basic_inline_asm_with_k_regs() {
+void test_basic_inline_asm_with_k_regs(void) {
     //CHECK: kandw %k1, %k2, %k3
     asm("kandw %k1, %k2, %k3\t");
     //CHECK: kandw %k4, %k5, %k6

diff  --git a/clang/test/CodeGen/X86/avx512f-builtins.c b/clang/test/CodeGen/X86/avx512f-builtins.c
index dbab32db5d384..9d785cd799450 100644
--- a/clang/test/CodeGen/X86/avx512f-builtins.c
+++ b/clang/test/CodeGen/X86/avx512f-builtins.c
@@ -3778,25 +3778,25 @@ __m128d test_mm_maskz_min_sd(__mmask8 __U, __m128d __A, __m128d __B) {
   return _mm_maskz_min_sd(__U,__A,__B); 
 }
 
-__m512 test_mm512_undefined() {
+__m512 test_mm512_undefined(void) {
   // CHECK-LABEL: @test_mm512_undefined
   // CHECK: ret <16 x float> zeroinitializer
   return _mm512_undefined();
 }
 
-__m512 test_mm512_undefined_ps() {
+__m512 test_mm512_undefined_ps(void) {
   // CHECK-LABEL: @test_mm512_undefined_ps
   // CHECK: ret <16 x float> zeroinitializer
   return _mm512_undefined_ps();
 }
 
-__m512d test_mm512_undefined_pd() {
+__m512d test_mm512_undefined_pd(void) {
   // CHECK-LABEL: @test_mm512_undefined_pd
   // CHECK: ret <8 x double> zeroinitializer
   return _mm512_undefined_pd();
 }
 
-__m512i test_mm512_undefined_epi32() {
+__m512i test_mm512_undefined_epi32(void) {
   // CHECK-LABEL: @test_mm512_undefined_epi32
   // CHECK: ret <8 x i64> zeroinitializer
   return _mm512_undefined_epi32();
@@ -10603,35 +10603,35 @@ __m128 test_mm_maskz_cvtsd_ss(__mmask8 __U, __m128 __A, __m128d __B) {
 }
 
 
-__m512i test_mm512_setzero_epi32()
+__m512i test_mm512_setzero_epi32(void)
 {
   // CHECK-LABEL: @test_mm512_setzero_epi32
   // CHECK: zeroinitializer
   return _mm512_setzero_epi32();
 }
 
-__m512 test_mm512_setzero()
+__m512 test_mm512_setzero(void)
 {
   // CHECK-LABEL: @test_mm512_setzero
   // CHECK: zeroinitializer
   return _mm512_setzero();
 }
 
-__m512i test_mm512_setzero_si512()
+__m512i test_mm512_setzero_si512(void)
 {
   // CHECK-LABEL: @test_mm512_setzero_si512
   // CHECK: zeroinitializer
   return _mm512_setzero_si512();
 }
 
-__m512 test_mm512_setzero_ps()
+__m512 test_mm512_setzero_ps(void)
 {
   // CHECK-LABEL: @test_mm512_setzero_ps
   // CHECK: zeroinitializer
   return _mm512_setzero_ps();
 }
 
-__m512d test_mm512_setzero_pd()
+__m512d test_mm512_setzero_pd(void)
 {
   // CHECK-LABEL: @test_mm512_setzero_pd
   // CHECK: zeroinitializer

diff  --git a/clang/test/CodeGen/X86/avx512fp16-abi.c b/clang/test/CodeGen/X86/avx512fp16-abi.c
index 1144274280557..3d1b713a610a5 100644
--- a/clang/test/CodeGen/X86/avx512fp16-abi.c
+++ b/clang/test/CodeGen/X86/avx512fp16-abi.c
@@ -204,7 +204,7 @@ struct fsd {
   double b;
 };
 
-struct fsd pr52011() {
+struct fsd pr52011(void) {
   // CHECK: define{{.*}} { float, double } @
 }
 
@@ -214,7 +214,7 @@ struct hsd {
   double b;
 };
 
-struct hsd pr52011_2() {
+struct hsd pr52011_2(void) {
   // CHECK: define{{.*}} { half, double } @
 }
 
@@ -224,7 +224,7 @@ struct hsf {
   float b;
 };
 
-struct hsf pr52011_3() {
+struct hsf pr52011_3(void) {
   // CHECK: define{{.*}} <4 x half> @
 }
 
@@ -234,7 +234,7 @@ struct fds {
   struct {};
 };
 
-struct fds pr52011_4() {
+struct fds pr52011_4(void) {
   // CHECK-C: define{{.*}} { float, double } @pr52011_4
   // CHECK-CPP: define{{.*}} void @_Z9pr52011_4v({{.*}} sret
 }

diff  --git a/clang/test/CodeGen/X86/avx512fp16-builtins.c b/clang/test/CodeGen/X86/avx512fp16-builtins.c
index 3faa153d0408c..73071bda75f0d 100644
--- a/clang/test/CodeGen/X86/avx512fp16-builtins.c
+++ b/clang/test/CodeGen/X86/avx512fp16-builtins.c
@@ -8,37 +8,37 @@ _Float16 test_mm512_cvtsh_h(__m512h __A) {
   return _mm512_cvtsh_h(__A);
 }
 
-__m128h test_mm_setzero_ph() {
+__m128h test_mm_setzero_ph(void) {
   // CHECK-LABEL: @test_mm_setzero_ph
   // CHECK: zeroinitializer
   return _mm_setzero_ph();
 }
 
-__m256h test_mm256_setzero_ph() {
+__m256h test_mm256_setzero_ph(void) {
   // CHECK-LABEL: @test_mm256_setzero_ph
   // CHECK: zeroinitializer
   return _mm256_setzero_ph();
 }
 
-__m256h test_mm256_undefined_ph() {
+__m256h test_mm256_undefined_ph(void) {
   // CHECK-LABEL: @test_mm256_undefined_ph
   // CHECK: ret <16 x half> zeroinitializer
   return _mm256_undefined_ph();
 }
 
-__m512h test_mm512_setzero_ph() {
+__m512h test_mm512_setzero_ph(void) {
   // CHECK-LABEL: @test_mm512_setzero_ph
   // CHECK: zeroinitializer
   return _mm512_setzero_ph();
 }
 
-__m128h test_mm_undefined_ph() {
+__m128h test_mm_undefined_ph(void) {
   // CHECK-LABEL: @test_mm_undefined_ph
   // CHECK: ret <8 x half> zeroinitializer
   return _mm_undefined_ph();
 }
 
-__m512h test_mm512_undefined_ph() {
+__m512h test_mm512_undefined_ph(void) {
   // CHECK-LABEL: @test_mm512_undefined_ph
   // CHECK: ret <32 x half> zeroinitializer
   return _mm512_undefined_ph();

diff  --git a/clang/test/CodeGen/X86/cetintrin.c b/clang/test/CodeGen/X86/cetintrin.c
index dc55745ec4508..a6c734b9c6835 100644
--- a/clang/test/CodeGen/X86/cetintrin.c
+++ b/clang/test/CodeGen/X86/cetintrin.c
@@ -37,7 +37,7 @@ unsigned int test_rdsspd(unsigned int a) {
   return _rdsspd(a);
 }
 
-unsigned int test_rdsspd_i32() {
+unsigned int test_rdsspd_i32(void) {
   // CHECK-LABEL: @test_rdsspd_i32
   // CHECK:       call i32 @llvm.x86.rdsspd(i32 %{{[a-z0-9.]+}})
   return _rdsspd_i32();
@@ -50,7 +50,7 @@ unsigned long long test_rdsspq(unsigned long long a) {
   return _rdsspq(a);
 }
 
-unsigned long long test_rdsspq_i64() {
+unsigned long long test_rdsspq_i64(void) {
   // X86_64-LABEL: @test_rdsspq_i64
   // X86_64:       call i64 @llvm.x86.rdsspq(i64 %{{[a-z0-9.]+}})
   return _rdsspq_i64();
@@ -72,7 +72,7 @@ unsigned int test_get_ssp(void) {
 
 #endif
 
-void  test_saveprevssp() {
+void  test_saveprevssp(void) {
   // CHECK-LABEL: @test_saveprevssp
   // CHECK:       call void @llvm.x86.saveprevssp()
   _saveprevssp();
@@ -112,7 +112,7 @@ void test_wrussq(unsigned long long __a, void * __p) {
 }
 #endif
 
-void test_setssbsy() {
+void test_setssbsy(void) {
   // CHECK-LABEL: @test_setssbsy
   // CHECK:       call void @llvm.x86.setssbsy()
   _setssbsy();

diff  --git a/clang/test/CodeGen/X86/fsgsbase-builtins.c b/clang/test/CodeGen/X86/fsgsbase-builtins.c
index 587ad84e3f51a..f9edd564b381d 100644
--- a/clang/test/CodeGen/X86/fsgsbase-builtins.c
+++ b/clang/test/CodeGen/X86/fsgsbase-builtins.c
@@ -3,25 +3,25 @@
 
 #include <immintrin.h>
 
-unsigned int test_readfsbase_u32()
+unsigned int test_readfsbase_u32(void)
 {
   // CHECK: @llvm.x86.rdfsbase.32
   return _readfsbase_u32();
 }
 
-unsigned long long test_readfsbase_u64()
+unsigned long long test_readfsbase_u64(void)
 {
   // CHECK: @llvm.x86.rdfsbase.64
   return _readfsbase_u64();
 }
 
-unsigned int test_readgsbase_u32()
+unsigned int test_readgsbase_u32(void)
 {
   // CHECK: @llvm.x86.rdgsbase.32
   return _readgsbase_u32();
 }
 
-unsigned long long test_readgsbase_u64()
+unsigned long long test_readgsbase_u64(void)
 {
   // CHECK: @llvm.x86.rdgsbase.64
   return _readgsbase_u64();

diff  --git a/clang/test/CodeGen/X86/lwp-builtins.c b/clang/test/CodeGen/X86/lwp-builtins.c
index c689c3974d4bd..b4fc8a48051b5 100644
--- a/clang/test/CodeGen/X86/lwp-builtins.c
+++ b/clang/test/CodeGen/X86/lwp-builtins.c
@@ -8,7 +8,7 @@ void test_llwpcb(void *ptr) {
   __llwpcb(ptr);
 }
 
-void* test_slwpcb() {
+void* test_slwpcb(void) {
   // CHECK-LABEL: @test_slwpcb
   // CHECK: call i8* @llvm.x86.slwpcb()
   return __slwpcb();

diff  --git a/clang/test/CodeGen/X86/pause.c b/clang/test/CodeGen/X86/pause.c
index 1a8e10aec043c..1321d9527225f 100644
--- a/clang/test/CodeGen/X86/pause.c
+++ b/clang/test/CodeGen/X86/pause.c
@@ -4,7 +4,7 @@
 
 #include <x86intrin.h>
 
-void test_mm_pause() {
+void test_mm_pause(void) {
   // CHECK-LABEL: test_mm_pause
   // CHECK: call void @llvm.x86.sse2.pause()
   return _mm_pause();

diff  --git a/clang/test/CodeGen/X86/pku.c b/clang/test/CodeGen/X86/pku.c
index cb02b03ffe0ec..0f73756fa5cca 100644
--- a/clang/test/CodeGen/X86/pku.c
+++ b/clang/test/CodeGen/X86/pku.c
@@ -3,7 +3,7 @@
 
 #include <immintrin.h>
 
-unsigned int test_rdpkru_u32() {
+unsigned int test_rdpkru_u32(void) {
   // CHECK-LABEL: @test_rdpkru_u32
   // CHECK: @llvm.x86.rdpkru
   return _rdpkru_u32(); 

diff  --git a/clang/test/CodeGen/X86/rd-builtins.c b/clang/test/CodeGen/X86/rd-builtins.c
index 38e0886f03258..03a5295a3bba6 100644
--- a/clang/test/CodeGen/X86/rd-builtins.c
+++ b/clang/test/CodeGen/X86/rd-builtins.c
@@ -9,7 +9,7 @@ unsigned long long test_rdpmc(int a) {
 // CHECK: call i64 @llvm.x86.rdpmc
 }
 
-int test_rdtsc() {
+int test_rdtsc(void) {
   return _rdtsc();
 // CHECK: @test_rdtsc
 // CHECK: call i64 @llvm.x86.rdtsc

diff  --git a/clang/test/CodeGen/X86/sse-builtins.c b/clang/test/CodeGen/X86/sse-builtins.c
index ccbeb68e18488..6709fe12e7123 100644
--- a/clang/test/CodeGen/X86/sse-builtins.c
+++ b/clang/test/CodeGen/X86/sse-builtins.c
@@ -331,35 +331,35 @@ __m128 test_mm_div_ss(__m128 A, __m128 B) {
   return _mm_div_ss(A, B);
 }
 
-unsigned int test_MM_GET_EXCEPTION_MASK() {
+unsigned int test_MM_GET_EXCEPTION_MASK(void) {
   // CHECK-LABEL: test_MM_GET_EXCEPTION_MASK
   // CHECK: call void @llvm.x86.sse.stmxcsr(i8* %{{.*}})
   // CHECK: and i32 %{{.*}}, 8064
   return _MM_GET_EXCEPTION_MASK();
 }
 
-unsigned int test_MM_GET_EXCEPTION_STATE() {
+unsigned int test_MM_GET_EXCEPTION_STATE(void) {
   // CHECK-LABEL: test_MM_GET_EXCEPTION_STATE
   // CHECK: call void @llvm.x86.sse.stmxcsr(i8* %{{.*}})
   // CHECK: and i32 %{{.*}}, 63
   return _MM_GET_EXCEPTION_STATE();
 }
 
-unsigned int test_MM_GET_FLUSH_ZERO_MODE() {
+unsigned int test_MM_GET_FLUSH_ZERO_MODE(void) {
   // CHECK-LABEL: test_MM_GET_FLUSH_ZERO_MODE
   // CHECK: call void @llvm.x86.sse.stmxcsr(i8* %{{.*}})
   // CHECK: and i32 %{{.*}}, 32768
   return _MM_GET_FLUSH_ZERO_MODE();
 }
 
-unsigned int test_MM_GET_ROUNDING_MODE() {
+unsigned int test_MM_GET_ROUNDING_MODE(void) {
   // CHECK-LABEL: test_MM_GET_ROUNDING_MODE
   // CHECK: call void @llvm.x86.sse.stmxcsr(i8* %{{.*}})
   // CHECK: and i32 %{{.*}}, 24576
   return _MM_GET_ROUNDING_MODE();
 }
 
-unsigned int test_mm_getcsr() {
+unsigned int test_mm_getcsr(void) {
   // CHECK-LABEL: test_mm_getcsr
   // CHECK: call void @llvm.x86.sse.stmxcsr(i8* %{{.*}})
   // CHECK: load i32
@@ -627,13 +627,13 @@ __m128 test_mm_setr_ps(float A, float B, float C, float D) {
   return _mm_setr_ps(A, B, C, D);
 }
 
-__m128 test_mm_setzero_ps() {
+__m128 test_mm_setzero_ps(void) {
   // CHECK-LABEL: test_mm_setzero_ps
   // CHECK: store <4 x float> zeroinitializer
   return _mm_setzero_ps();
 }
 
-void test_mm_sfence() {
+void test_mm_sfence(void) {
   // CHECK-LABEL: test_mm_sfence
   // CHECK: call void @llvm.x86.sse.sfence()
   _mm_sfence();
@@ -784,7 +784,7 @@ int test_mm_ucomineq_ss(__m128 A, __m128 B) {
   return _mm_ucomineq_ss(A, B);
 }
 
-__m128 test_mm_undefined_ps() {
+__m128 test_mm_undefined_ps(void) {
   // CHECK-LABEL: test_mm_undefined_ps
   // CHECK: ret <4 x float> zeroinitializer
   return _mm_undefined_ps();

diff  --git a/clang/test/CodeGen/X86/sse2-builtins.c b/clang/test/CodeGen/X86/sse2-builtins.c
index cde561a361f21..84a8ea74f55f4 100644
--- a/clang/test/CodeGen/X86/sse2-builtins.c
+++ b/clang/test/CodeGen/X86/sse2-builtins.c
@@ -623,7 +623,7 @@ __m128i test_mm_insert_epi16(__m128i A, int B) {
   return _mm_insert_epi16(A, B, 0);
 }
 
-void test_mm_lfence() {
+void test_mm_lfence(void) {
   // CHECK-LABEL: test_mm_lfence
   // CHECK: call void @llvm.x86.sse2.lfence()
   _mm_lfence();
@@ -774,7 +774,7 @@ __m128d test_mm_max_sd(__m128d A, __m128d B) {
   return _mm_max_sd(A, B);
 }
 
-void test_mm_mfence() {
+void test_mm_mfence(void) {
   // CHECK-LABEL: test_mm_mfence
   // CHECK: call void @llvm.x86.sse2.mfence()
   _mm_mfence();
@@ -917,7 +917,7 @@ __m128i test_mm_packus_epi16(__m128i A, __m128i B) {
   return _mm_packus_epi16(A, B);
 }
 
-void test_mm_pause() {
+void test_mm_pause(void) {
   // CHECK-LABEL: test_mm_pause
   // CHECK: call void @llvm.x86.sse2.pause()
   return _mm_pause();
@@ -1136,13 +1136,13 @@ __m128d test_mm_setr_pd(double A, double B) {
   return _mm_setr_pd(A, B);
 }
 
-__m128d test_mm_setzero_pd() {
+__m128d test_mm_setzero_pd(void) {
   // CHECK-LABEL: test_mm_setzero_pd
   // CHECK: store <2 x double> zeroinitializer
   return _mm_setzero_pd();
 }
 
-__m128i test_mm_setzero_si128() {
+__m128i test_mm_setzero_si128(void) {
   // CHECK-LABEL: test_mm_setzero_si128
   // CHECK: store <2 x i64> zeroinitializer
   return _mm_setzero_si128();
@@ -1628,13 +1628,13 @@ int test_mm_ucomineq_sd(__m128d A, __m128d B) {
   return _mm_ucomineq_sd(A, B);
 }
 
-__m128d test_mm_undefined_pd() {
+__m128d test_mm_undefined_pd(void) {
   // CHECK-LABEL: test_mm_undefined_pd
   // CHECK: ret <2 x double> zeroinitializer
   return _mm_undefined_pd();
 }
 
-__m128i test_mm_undefined_si128() {
+__m128i test_mm_undefined_si128(void) {
   // CHECK-LABEL: test_mm_undefined_si128
   // CHECK: ret <2 x i64> zeroinitializer
   return _mm_undefined_si128();

diff  --git a/clang/test/CodeGen/X86/x86-64-inline-asm.c b/clang/test/CodeGen/X86/x86-64-inline-asm.c
index 80ae0a46a25c6..89d1fac873310 100644
--- a/clang/test/CodeGen/X86/x86-64-inline-asm.c
+++ b/clang/test/CodeGen/X86/x86-64-inline-asm.c
@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 -triple x86_64 %s -S -o /dev/null -DWARN -verify
 // RUN: %clang_cc1 -triple x86_64 %s -S -o /dev/null -Werror -verify
 // RUN: %clang_cc1 -triple x86_64-linux-gnu %s -S -o - | FileCheck %s
-void f() {
+void f(void) {
   asm("movaps %xmm3, (%esi, 2)");
 // expected-note at 1 {{instantiated into assembly here}}
 #ifdef WARN

diff  --git a/clang/test/CodeGen/X86/x86-ssc-mark.c b/clang/test/CodeGen/X86/x86-ssc-mark.c
index a2a57a13d7d44..bcfee4fb3b0c5 100644
--- a/clang/test/CodeGen/X86/x86-ssc-mark.c
+++ b/clang/test/CodeGen/X86/x86-ssc-mark.c
@@ -5,7 +5,7 @@
 #include <immintrin.h>
 
 // The ebx may be use for base pointer, we need to restore it in time.
-void ssc_mark() {
+void ssc_mark(void) {
 // CHECK-LABEL: ssc_mark
 // CHECK: #APP
 // CHECK: movl    %ebx, %eax

diff  --git a/clang/test/CodeGen/X86/x86-tsxldtrk-builtins.c b/clang/test/CodeGen/X86/x86-tsxldtrk-builtins.c
index 96c53704e1e42..62f2c9e2bccf9 100644
--- a/clang/test/CodeGen/X86/x86-tsxldtrk-builtins.c
+++ b/clang/test/CodeGen/X86/x86-tsxldtrk-builtins.c
@@ -3,13 +3,13 @@
 
 #include <immintrin.h>
 
-void test_xsusldtrk() {
+void test_xsusldtrk(void) {
 // CHECK-LABEL: test_xsusldtrk
 // CHECK: call void @llvm.x86.xsusldtrk()
     _xsusldtrk();
 }
 
-void test_xresldtrk() {
+void test_xresldtrk(void) {
 // CHECK-LABEL: test_xresldtrk
 // CHECK: call void @llvm.x86.xresldtrk()
     _xresldtrk();

diff  --git a/clang/test/CodeGen/X86/x86-uintr-builtins.c b/clang/test/CodeGen/X86/x86-uintr-builtins.c
index ea937995a1e92..dccb7d42137dd 100644
--- a/clang/test/CodeGen/X86/x86-uintr-builtins.c
+++ b/clang/test/CodeGen/X86/x86-uintr-builtins.c
@@ -2,21 +2,21 @@
 
 #include <x86gprintrin.h>
 
-void test_clui() {
+void test_clui(void) {
 // CHECK-LABEL: @test_clui
 // CHECK: call void @llvm.x86.clui()
 // CHECK: ret
   _clui();
 }
 
-void test_stui() {
+void test_stui(void) {
 // CHECK-LABEL: @test_stui
 // CHECK: call void @llvm.x86.stui()
 // CHECK: ret
   _stui();
 }
 
-unsigned char test_testui() {
+unsigned char test_testui(void) {
 // CHECK-LABEL: @test_testui
 // CHECK: %[[TMP0:.+]] = call i8 @llvm.x86.testui()
 // CHECK: ret i8 %[[TMP0]]

diff  --git a/clang/test/CodeGen/X86/x86-vector-width.c b/clang/test/CodeGen/X86/x86-vector-width.c
index 7e03fedb78468..a0b7e03920c40 100644
--- a/clang/test/CodeGen/X86/x86-vector-width.c
+++ b/clang/test/CodeGen/X86/x86-vector-width.c
@@ -3,8 +3,8 @@
 typedef signed long long V2LLi __attribute__((vector_size(16)));
 typedef signed long long V4LLi __attribute__((vector_size(32)));
 
-V2LLi ret_128();
-V4LLi ret_256();
+V2LLi ret_128(void);
+V4LLi ret_256(void);
 void arg_128(V2LLi);
 void arg_256(V4LLi);
 

diff  --git a/clang/test/CodeGen/X86/x86.c b/clang/test/CodeGen/X86/x86.c
index e97d537d331be..6a3a1b499623c 100644
--- a/clang/test/CodeGen/X86/x86.c
+++ b/clang/test/CodeGen/X86/x86.c
@@ -8,7 +8,7 @@
 // RUN: grep "st" %t1
 // RUN: grep "st(1)" %t1
 
-void test1() {
+void test1(void) {
   int d1, d2;
   asm ("" : "=a" (d1), "=b" (d2) :
        "c" (0), "d" (0), "S" (0), "D" (0), "t" (0), "u" (0));

diff  --git a/clang/test/CodeGen/X86/x86_32-arguments-darwin.c b/clang/test/CodeGen/X86/x86_32-arguments-darwin.c
index 668bb5eb9aaa5..54b5ee35a3426 100644
--- a/clang/test/CodeGen/X86/x86_32-arguments-darwin.c
+++ b/clang/test/CodeGen/X86/x86_32-arguments-darwin.c
@@ -287,7 +287,7 @@ void f58(union u58 x) {}
 
 // CHECK-LABEL: define{{.*}} i64 @f59()
 struct s59 { float x __attribute((aligned(8))); };
-struct s59 f59() { while (1) {} }
+struct s59 f59(void) { while (1) {} }
 
 // CHECK-LABEL: define{{.*}} void @f60(%struct.s60* noundef byval(%struct.s60) align 4 %0, i32 noundef %y)
 struct s60 { int x __attribute((aligned(8))); };
@@ -323,7 +323,7 @@ void f64(struct s64 x) {}
 
 // CHECK-LABEL: define{{.*}} float @f65()
 struct s65 { signed char a[0]; float b; };
-struct s65 f65() { return (struct s65){{},2}; }
+struct s65 f65(void) { return (struct s65){{},2}; }
 
 // CHECK-LABEL: define{{.*}} <2 x i64> @f66
 // CHECK: ptrtoint

diff  --git a/clang/test/CodeGen/X86/x86_32-arguments-win32.c b/clang/test/CodeGen/X86/x86_32-arguments-win32.c
index 90d5c3aff3ac5..9924aa9a628be 100644
--- a/clang/test/CodeGen/X86/x86_32-arguments-win32.c
+++ b/clang/test/CodeGen/X86/x86_32-arguments-win32.c
@@ -77,7 +77,7 @@ void receive_vec_1024(__m1024 x, __m1024 y, __m1024 z, __m1024 w, __m1024 q) {
 // CHECK-LABEL: define dso_local void @receive_vec_512(<16 x float> inreg noundef %x, <16 x float> inreg noundef %y, <16 x float> inreg noundef %z, <16 x float>* noundef %0, <16 x float>* noundef %1)
 // CHECK-LABEL: define dso_local void @receive_vec_1024(<32 x float>* noundef %0, <32 x float>* noundef %1, <32 x float>* noundef %2, <32 x float>* noundef %3, <32 x float>* noundef %4)
 
-void pass_vec_128() {
+void pass_vec_128(void) {
   __m128 z = {0};
   receive_vec_128(z, z, z, z, z);
 }

diff  --git a/clang/test/CodeGen/X86/x86_32-inline-asm.c b/clang/test/CodeGen/X86/x86_32-inline-asm.c
index 5a69064abc034..feacc64299f2d 100644
--- a/clang/test/CodeGen/X86/x86_32-inline-asm.c
+++ b/clang/test/CodeGen/X86/x86_32-inline-asm.c
@@ -19,7 +19,7 @@ __m128 val128;
 __m256 val256;
 __m512 val512;
 
-int func1() {
+int func1(void) {
   // Error out if size is > 32-bits.
   uint32_t msr = 0x8b;
   uint64_t val = 0;
@@ -71,7 +71,7 @@ int func1() {
 #endif
 }
 
-int __attribute__((__target__("sse"))) _func2() {
+int __attribute__((__target__("sse"))) _func2(void) {
   __asm__ volatile("foo1 %0" : : "x" (val128)); // No error.
   __asm__ volatile("foo1 %0" : "=x" (val128));  // No error.
 #ifdef __AVX__
@@ -85,7 +85,7 @@ int __attribute__((__target__("sse"))) _func2() {
   __asm__ volatile("foo1 %0" : "=x" (val512)); // expected-error {{invalid output size for constraint '=x'}}
 }
 
-int __attribute__((__target__("avx"))) _func3() {
+int __attribute__((__target__("avx"))) _func3(void) {
   __asm__ volatile("foo1 %0" : : "x" (val128)); // No error.
   __asm__ volatile("foo1 %0" : "=x" (val128));  // No error.
   __asm__ volatile("foo1 %0" : : "x" (val256)); // No error.
@@ -94,7 +94,7 @@ int __attribute__((__target__("avx"))) _func3() {
   __asm__ volatile("foo1 %0" : "=x" (val512)); // expected-error {{invalid output size for constraint '=x'}}
 }
 
-int __attribute__((__target__("avx512f"))) _func4() {
+int __attribute__((__target__("avx512f"))) _func4(void) {
   __asm__ volatile("foo1 %0" : : "x" (val128)); // No error.
   __asm__ volatile("foo1 %0" : "=x" (val128));  // No error.
   __asm__ volatile("foo1 %0" : : "x" (val256)); // No error.

diff  --git a/clang/test/CodeGen/X86/x86_32-xsave.c b/clang/test/CodeGen/X86/x86_32-xsave.c
index 35cd273ffb830..d5d1717235ee7 100644
--- a/clang/test/CodeGen/X86/x86_32-xsave.c
+++ b/clang/test/CodeGen/X86/x86_32-xsave.c
@@ -17,7 +17,7 @@
 #define __MM_MALLOC_H
 #include <x86intrin.h>
 
-void test() {
+void test(void) {
   unsigned long long tmp_ULLi;
   unsigned int       tmp_Ui;
   void*              tmp_vp;

diff  --git a/clang/test/CodeGen/X86/x86_64-PR42672.c b/clang/test/CodeGen/X86/x86_64-PR42672.c
index b3b57ebf8ddde..2e8ec15b58525 100644
--- a/clang/test/CodeGen/X86/x86_64-PR42672.c
+++ b/clang/test/CodeGen/X86/x86_64-PR42672.c
@@ -73,7 +73,7 @@ void big_struct(void) {
 // CHECK-IMPOSSIBLE_BIG: impossible constraint in asm: can't store value into a register
 
 // Clang is able to emit LLVM IR for an 16-byte structure.
-void x_constraint_fit() {
+void x_constraint_fit(void) {
 #ifdef POSSIBLE_X
   struct S {
     unsigned x[4];
@@ -90,7 +90,7 @@ void x_constraint_fit() {
 // CHECK-X: ret
 
 // Clang is unable to emit LLVM IR for a 32-byte structure.
-void x_constraint_nofit() {
+void x_constraint_nofit(void) {
 #ifdef IMPOSSIBLE_X
   struct S {
     unsigned x[8];
@@ -106,7 +106,7 @@ void x_constraint_nofit() {
 // Clang used to report the following message:
 //   "impossible constraint in asm: can't store struct into a register"
 // for the assembly directive below, although there's no struct.
-void crbug_999160_regtest() {
+void crbug_999160_regtest(void) {
 #ifdef IMPOSSIBLE_9BYTES
   char buf[9];
   asm(""

diff  --git a/clang/test/CodeGen/X86/x86_64-arguments-darwin.c b/clang/test/CodeGen/X86/x86_64-arguments-darwin.c
index 2f804e6efc03b..fcf74778e8075 100644
--- a/clang/test/CodeGen/X86/x86_64-arguments-darwin.c
+++ b/clang/test/CodeGen/X86/x86_64-arguments-darwin.c
@@ -11,7 +11,7 @@ typedef struct _str {
 
 void func(str s);
 str ss;
-void f9122143()
+void f9122143(void)
 {
   func(ss);
 }

diff  --git a/clang/test/CodeGen/X86/x86_64-arguments-nacl.c b/clang/test/CodeGen/X86/x86_64-arguments-nacl.c
index bed6ca5518503..0cafc93be540d 100644
--- a/clang/test/CodeGen/X86/x86_64-arguments-nacl.c
+++ b/clang/test/CodeGen/X86/x86_64-arguments-nacl.c
@@ -16,7 +16,7 @@ struct PP_Var {
 };
 
 // CHECK: define{{.*}} { i64, i64 } @f0()
-struct PP_Var f0() {
+struct PP_Var f0(void) {
   struct PP_Var result = { 0, 0, 0 };
   return result;
 }
@@ -40,7 +40,7 @@ union u8 {
   long double a;
   int b;
 };
-union u8 f8_1() { while (1) {} }
+union u8 f8_1(void) { while (1) {} }
 void f8_2(union u8 a0) {}
 
 // CHECK-LABEL: define{{.*}} i64 @f9()
@@ -51,7 +51,7 @@ struct s10 { int a; int b; int : 0; };
 void f10(struct s10 a0) {}
 
 // CHECK-LABEL: define{{.*}} double @f11()
-union { long double a; float b; } f11() { while (1) {} }
+union { long double a; float b; } f11(void) { while (1) {} }
 
 // CHECK-LABEL: define{{.*}} i32 @f12_0()
 // CHECK-LABEL: define{{.*}} void @f12_1(i32 %a0.coerce)
@@ -86,7 +86,7 @@ typedef struct _str {
 
 void func(str s);
 str ss;
-void f9122143()
+void f9122143(void)
 {
   func(ss);
 }

diff  --git a/clang/test/CodeGen/X86/x86_64-arguments-win32.c b/clang/test/CodeGen/X86/x86_64-arguments-win32.c
index 69bc2d4e81f49..0a2ba4a527e5a 100644
--- a/clang/test/CodeGen/X86/x86_64-arguments-win32.c
+++ b/clang/test/CodeGen/X86/x86_64-arguments-win32.c
@@ -25,7 +25,7 @@ void f5(_Complex float a) {}
 void f6(_Complex double a) {}
 
 // CHECK-LABEL: define dso_local i64 @f7()
-_Complex float f7() { return 1.0; }
+_Complex float f7(void) { return 1.0; }
 
 // CHECK-LABEL: define dso_local void @f8({ double, double }* noalias sret({ double, double }) align 8 %agg.result)
-_Complex double f8() { return 1.0; }
+_Complex double f8(void) { return 1.0; }

diff  --git a/clang/test/CodeGen/X86/x86_64-arguments.c b/clang/test/CodeGen/X86/x86_64-arguments.c
index f45ee6db5e4ff..d22c8f44b5f57 100644
--- a/clang/test/CodeGen/X86/x86_64-arguments.c
+++ b/clang/test/CodeGen/X86/x86_64-arguments.c
@@ -53,7 +53,7 @@ union u8 {
   long double a;
   int b;
 };
-union u8 f8_1() { while (1) {} }
+union u8 f8_1(void) { while (1) {} }
 void f8_2(union u8 a0) {}
 
 // CHECK-LABEL: define{{.*}} i64 @f9()
@@ -64,7 +64,7 @@ struct s10 { int a; int b; int : 0; };
 void f10(struct s10 a0) {}
 
 // CHECK-LABEL: define{{.*}} void @f11(%union.anon* noalias sret(%union.anon) align 16 %agg.result)
-union { long double a; float b; } f11() { while (1) {} }
+union { long double a; float b; } f11(void) { while (1) {} }
 
 // CHECK-LABEL: define{{.*}} i32 @f12_0()
 // CHECK-LABEL: define{{.*}} void @f12_1(i32 %a0.coerce)
@@ -281,7 +281,7 @@ typedef struct _str {
 
 void func(str s);
 str ss;
-void f9122143()
+void f9122143(void)
 {
   func(ss);
 }
@@ -304,7 +304,7 @@ __m256 x37;
 
 void f38(s256 x);
 void f37(__m256 x);
-void f39() { f38(x38); f37(x37); }
+void f39(void) { f38(x38); f37(x37); }
 
 // The two next tests make sure that the struct below is passed
 // in the same way regardless of avx being used
@@ -363,7 +363,7 @@ int foo(long3 X)
 // AVX: call i32 bitcast (i32 (...)* @f45 to i32 (<8 x float>)*)
 int f45();
 __m256 x45;
-void test45() { f45(x45); }
+void test45(void) { f45(x45); }
 
 // Make sure we use byval to pass 64-bit vectors in memory; the LLVM call
 // lowering can't handle this case correctly because it runs after legalization.
@@ -371,7 +371,7 @@ void test45() { f45(x45); }
 // CHECK: call void @f46({{.*}}<2 x float>* noundef byval(<2 x float>) align 8 {{.*}}, <2 x float>* noundef byval(<2 x float>) align 8 {{.*}})
 typedef float v46 __attribute((vector_size(8)));
 void f46(v46,v46,v46,v46,v46,v46,v46,v46,v46,v46);
-void test46() { v46 x = {1,2}; f46(x,x,x,x,x,x,x,x,x,x); }
+void test46(void) { v46 x = {1,2}; f46(x,x,x,x,x,x,x,x,x,x); }
 
 // Check that we pass the struct below without using byval, which helps out
 // codegen.
@@ -441,7 +441,7 @@ void test51(struct test51_s *s, __builtin_va_list argList) {
 
 void test52_helper(int, ...);
 __m256 x52;
-void test52() {
+void test52(void) {
   test52_helper(0, x52, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0i);
 }
 // AVX: @test52_helper(i32 noundef 0, <8 x float> noundef {{%[a-zA-Z0-9]+}}, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef {{%[a-zA-Z0-9]+}}, double noundef {{%[a-zA-Z0-9]+}})
@@ -455,7 +455,7 @@ void test53(__m256 *m, __builtin_va_list argList) {
 
 void test54_helper(__m256, ...);
 __m256 x54;
-void test54() {
+void test54(void) {
   test54_helper(x54, x54, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0i);
   test54_helper(x54, x54, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0i);
 }
@@ -482,7 +482,7 @@ void f55(s512 x);
 // AVX512: declare void @f56(<16 x float> noundef)
 // NO-AVX512: declare void @f56(<16 x float>* noundef byval(<16 x float>) align 64)
 void f56(__m512 x);
-void f57() { f55(x55); f56(x56); }
+void f57(void) { f55(x55); f56(x56); }
 
 // Like for __m128 on AVX, check that the struct below is passed
 // in the same way regardless of AVX512 being used.
@@ -514,7 +514,7 @@ void f61(SAtwo256 s) {
 // AVX512: @f62_helper(i32 noundef 0, <16 x float> noundef {{%[a-zA-Z0-9]+}}, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef {{%[a-zA-Z0-9]+}}, double noundef {{%[a-zA-Z0-9]+}})
 void f62_helper(int, ...);
 __m512 x62;
-void f62() {
+void f62(void) {
   f62_helper(0, x62, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0i);
 }
 
@@ -532,7 +532,7 @@ void f63(__m512 *m, __builtin_va_list argList) {
 // AVX512: @f64_helper(<16 x float> noundef {{%[a-zA-Z0-9]+}}, <16 x float> noundef {{%[a-zA-Z0-9]+}}, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, double noundef 1.000000e+00, { double, double }* noundef byval({ double, double }) align 8 {{%[^)]+}})
 void f64_helper(__m512, ...);
 __m512 x64;
-void f64() {
+void f64(void) {
   f64_helper(x64, x64, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0i);
   f64_helper(x64, x64, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0i);
 }

diff  --git a/clang/test/CodeGen/X86/x86_64-mno-sse2.c b/clang/test/CodeGen/X86/x86_64-mno-sse2.c
index 0c8e78edb9951..b3714d440f900 100644
--- a/clang/test/CodeGen/X86/x86_64-mno-sse2.c
+++ b/clang/test/CodeGen/X86/x86_64-mno-sse2.c
@@ -14,7 +14,7 @@ void pass_double(void) {
   //take_double(1.5);
 }
 
-double return_double();
+double return_double(void);
 void call_double(double *a) { // expected-error {{SSE2 register return with SSE2 disabled}}
   *a = return_double();
 }

diff  --git a/clang/test/CodeGen/X86/x86_64-xsave.c b/clang/test/CodeGen/X86/x86_64-xsave.c
index 33be2cceb453f..0d6b804581ea1 100644
--- a/clang/test/CodeGen/X86/x86_64-xsave.c
+++ b/clang/test/CodeGen/X86/x86_64-xsave.c
@@ -18,7 +18,7 @@
 #include <x86intrin.h>
 
 
-void test() {
+void test(void) {
   unsigned long long tmp_ULLi;
   unsigned int       tmp_Ui;
   void*              tmp_vp;

diff  --git a/clang/test/CodeGen/X86/x86_inlineasm_curly_bracket_escape.c b/clang/test/CodeGen/X86/x86_inlineasm_curly_bracket_escape.c
index 503c13e613791..6599a657fbfe6 100644
--- a/clang/test/CodeGen/X86/x86_inlineasm_curly_bracket_escape.c
+++ b/clang/test/CodeGen/X86/x86_inlineasm_curly_bracket_escape.c
@@ -2,7 +2,7 @@
 // This test checks validity of inline assembly using curly brackets syntax
 // for extended inline asm.
 
-void test_curly_brackets() {
+void test_curly_brackets(void) {
     //CHECK:  %xmm1,%xmm0,%xmm1 {%k1}{z}
     asm("vpaddb\t %%xmm1,%%xmm0,%%xmm1 %{%%k1%}%{z%}\t":::);
 }
\ No newline at end of file

diff  --git a/clang/test/CodeGenCXX/debug-info-composite-triviality-fwd-decl.cpp b/clang/test/CodeGenCXX/debug-info-composite-triviality-fwd-decl.cpp
index 4bf18279b3d54..812e3ed5f582d 100644
--- a/clang/test/CodeGenCXX/debug-info-composite-triviality-fwd-decl.cpp
+++ b/clang/test/CodeGenCXX/debug-info-composite-triviality-fwd-decl.cpp
@@ -4,7 +4,7 @@
 // Test for DIFlagNonTrivial on forward declared DICompositeTypes.
 
 struct Incomplete;
-struct Incomplete (*func_ptr)() = 0;
+struct Incomplete (*func_ptr)(void) = 0;
 // CHECK-C: !DICompositeType({{.*}}name: "Incomplete"
 // CHECK-C-NOT: DIFlagNonTrivial
 // CHECK-CXX: !DICompositeType({{.*}}name: "Incomplete"

diff  --git a/clang/test/CodeGenCoroutines/coro-builtins-err.c b/clang/test/CodeGenCoroutines/coro-builtins-err.c
index dfd2542886bc2..17a29dd04ca20 100644
--- a/clang/test/CodeGenCoroutines/coro-builtins-err.c
+++ b/clang/test/CodeGenCoroutines/coro-builtins-err.c
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -triple x86_64-pc-windows-msvc18.0.0 -fcoroutines-ts -emit-llvm %s -o - -verify
 
-void f() {
+void f(void) {
   __builtin_coro_alloc(); // expected-error {{this builtin expect that __builtin_coro_id}}
   __builtin_coro_begin(0); // expected-error {{this builtin expect that __builtin_coro_id}}
   __builtin_coro_free(0); // expected-error {{this builtin expect that __builtin_coro_id}}

diff  --git a/clang/test/CodeGenOpenCL/func-call-dbg-loc.cl b/clang/test/CodeGenOpenCL/func-call-dbg-loc.cl
index 117e69ae92dd2..6b56cbb35f3fd 100644
--- a/clang/test/CodeGenOpenCL/func-call-dbg-loc.cl
+++ b/clang/test/CodeGenOpenCL/func-call-dbg-loc.cl
@@ -5,11 +5,11 @@ typedef struct
     int a;
 } Struct;
 
-Struct func1();
+Struct func1(void);
 
 void func2(Struct S);
 
-void func3()
+void func3(void)
 {
     // CHECK: call i32 @func1() #{{[0-9]+}}, !dbg ![[LOC:[0-9]+]]
     // CHECK: call void @func2(i32 %{{[0-9]+}}) #{{[0-9]+}}, !dbg ![[LOC]]

diff  --git a/clang/test/CodeGenOpenCL/null_queue.cl b/clang/test/CodeGenOpenCL/null_queue.cl
index cdcd7eef2ed46..e52591e58b31c 100644
--- a/clang/test/CodeGenOpenCL/null_queue.cl
+++ b/clang/test/CodeGenOpenCL/null_queue.cl
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -O0 -cl-std=CL2.0  -emit-llvm %s -o - | FileCheck %s
-extern queue_t get_default_queue();
+extern queue_t get_default_queue(void);
 
-bool compare() {
+bool compare(void) {
   return 0 == get_default_queue() &&
          get_default_queue() == 0;
   // CHECK: icmp eq %opencl.queue_t* null, %{{.*}}
@@ -10,7 +10,7 @@ bool compare() {
 
 void func(queue_t q);
 
-void init() {
+void init(void) {
   queue_t q = 0;
   func(0);
   // CHECK: store %opencl.queue_t* null, %opencl.queue_t** %q


        


More information about the cfe-commits mailing list