summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Fuzzer
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib/Fuzzer')
-rw-r--r--llvm/lib/Fuzzer/FuzzerDriver.cpp2
-rw-r--r--llvm/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp2
-rw-r--r--llvm/lib/Fuzzer/FuzzerLoop.cpp2
-rw-r--r--llvm/lib/Fuzzer/FuzzerMerge.cpp4
-rw-r--r--llvm/lib/Fuzzer/FuzzerMutate.cpp2
-rw-r--r--llvm/lib/Fuzzer/FuzzerShmemPosix.cpp6
-rw-r--r--llvm/lib/Fuzzer/FuzzerShmemWindows.cpp4
-rw-r--r--llvm/lib/Fuzzer/FuzzerTracePC.cpp2
-rw-r--r--llvm/lib/Fuzzer/FuzzerTraceState.cpp2
-rw-r--r--llvm/lib/Fuzzer/FuzzerUtilWindows.cpp2
-rw-r--r--llvm/lib/Fuzzer/afl/afl_driver.cpp12
-rw-r--r--llvm/lib/Fuzzer/test/AFLDriverTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp6
-rw-r--r--llvm/lib/Fuzzer/test/AbsNegAndConstantTest.cpp6
-rw-r--r--llvm/lib/Fuzzer/test/AccumulateAllocationsTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/BadStrcmpTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/BufferOverflowOnInput.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/CallerCalleeTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/CleanseTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/CustomMutatorTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/CxxStringEqTest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/DSOTestMain.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/DivTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/FourIndependentBranchesTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/FullCoverageSetTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/FuzzerUnittest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/LeakTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/LeakTimeoutTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/LoadTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/Memcmp64BytesTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/MemcmpTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/NotinstrumentedTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/NthRunCrashTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/NullDerefOnEmptyTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/NullDerefTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/OneHugeAllocTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/OutOfMemoryTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/RepeatedBytesTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/RepeatedMemcmp.cpp3
-rw-r--r--llvm/lib/Fuzzer/test/ShrinkControlFlowTest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/ShrinkValueProfileTest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/SignedIntOverflowTest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/SimpleCmpTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/SimpleDictionaryTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/SimpleHashTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/SimpleTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/SimpleThreadedTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/SingleByteInputTest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/SingleMemcmpTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/SingleStrcmpTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/SingleStrncmpTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/SpamyTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/StrcmpTest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/StrncmpOOBTest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/StrncmpTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/StrstrTest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/SwapCmpTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/Switch2Test.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/SwitchTest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/TableLookupTest.cpp4
-rw-r--r--llvm/lib/Fuzzer/test/ThreadedLeakTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/ThreadedTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/TimeoutEmptyTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/TimeoutTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/TraceMallocTest.cpp2
-rw-r--r--llvm/lib/Fuzzer/test/TwoDifferentBugsTest.cpp2
67 files changed, 92 insertions, 93 deletions
diff --git a/llvm/lib/Fuzzer/FuzzerDriver.cpp b/llvm/lib/Fuzzer/FuzzerDriver.cpp
index f9f8a8064a7..9aad3771784 100644
--- a/llvm/lib/Fuzzer/FuzzerDriver.cpp
+++ b/llvm/lib/Fuzzer/FuzzerDriver.cpp
@@ -10,9 +10,9 @@
//===----------------------------------------------------------------------===//
#include "FuzzerCorpus.h"
+#include "FuzzerIO.h"
#include "FuzzerInterface.h"
#include "FuzzerInternal.h"
-#include "FuzzerIO.h"
#include "FuzzerMutate.h"
#include "FuzzerRandom.h"
#include "FuzzerShmem.h"
diff --git a/llvm/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp b/llvm/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp
index 77521698c80..f6c7e07cc61 100644
--- a/llvm/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp
+++ b/llvm/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp
@@ -13,8 +13,8 @@
#include "FuzzerExtFunctions.h"
#include "FuzzerIO.h"
-#include "Windows.h"
#include "Psapi.h"
+#include "Windows.h"
namespace fuzzer {
diff --git a/llvm/lib/Fuzzer/FuzzerLoop.cpp b/llvm/lib/Fuzzer/FuzzerLoop.cpp
index 14caa203c5e..f6083282ab6 100644
--- a/llvm/lib/Fuzzer/FuzzerLoop.cpp
+++ b/llvm/lib/Fuzzer/FuzzerLoop.cpp
@@ -10,8 +10,8 @@
//===----------------------------------------------------------------------===//
#include "FuzzerCorpus.h"
-#include "FuzzerInternal.h"
#include "FuzzerIO.h"
+#include "FuzzerInternal.h"
#include "FuzzerMutate.h"
#include "FuzzerRandom.h"
#include "FuzzerShmem.h"
diff --git a/llvm/lib/Fuzzer/FuzzerMerge.cpp b/llvm/lib/Fuzzer/FuzzerMerge.cpp
index e66460c29e2..612f4bbb28f 100644
--- a/llvm/lib/Fuzzer/FuzzerMerge.cpp
+++ b/llvm/lib/Fuzzer/FuzzerMerge.cpp
@@ -9,9 +9,9 @@
// Merging corpora.
//===----------------------------------------------------------------------===//
-#include "FuzzerInternal.h"
-#include "FuzzerIO.h"
#include "FuzzerMerge.h"
+#include "FuzzerIO.h"
+#include "FuzzerInternal.h"
#include "FuzzerTracePC.h"
#include "FuzzerUtil.h"
diff --git a/llvm/lib/Fuzzer/FuzzerMutate.cpp b/llvm/lib/Fuzzer/FuzzerMutate.cpp
index e60d4130de1..53cb9027e45 100644
--- a/llvm/lib/Fuzzer/FuzzerMutate.cpp
+++ b/llvm/lib/Fuzzer/FuzzerMutate.cpp
@@ -9,11 +9,11 @@
// Mutate a test input.
//===----------------------------------------------------------------------===//
+#include "FuzzerMutate.h"
#include "FuzzerCorpus.h"
#include "FuzzerDefs.h"
#include "FuzzerExtFunctions.h"
#include "FuzzerIO.h"
-#include "FuzzerMutate.h"
#include "FuzzerOptions.h"
namespace fuzzer {
diff --git a/llvm/lib/Fuzzer/FuzzerShmemPosix.cpp b/llvm/lib/Fuzzer/FuzzerShmemPosix.cpp
index 2723bdd86f4..50cdcfb509d 100644
--- a/llvm/lib/Fuzzer/FuzzerShmemPosix.cpp
+++ b/llvm/lib/Fuzzer/FuzzerShmemPosix.cpp
@@ -14,14 +14,14 @@
#include "FuzzerIO.h"
#include "FuzzerShmem.h"
-#include <sys/types.h>
-#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
-#include <sys/mman.h>
#include <semaphore.h>
#include <stdio.h>
#include <stdlib.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
namespace fuzzer {
diff --git a/llvm/lib/Fuzzer/FuzzerShmemWindows.cpp b/llvm/lib/Fuzzer/FuzzerShmemWindows.cpp
index 6325b4b8e5b..d330ebf4fd0 100644
--- a/llvm/lib/Fuzzer/FuzzerShmemWindows.cpp
+++ b/llvm/lib/Fuzzer/FuzzerShmemWindows.cpp
@@ -14,10 +14,10 @@
#include "FuzzerIO.h"
#include "FuzzerShmem.h"
-#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
namespace fuzzer {
diff --git a/llvm/lib/Fuzzer/FuzzerTracePC.cpp b/llvm/lib/Fuzzer/FuzzerTracePC.cpp
index ce0f7a47eee..ea93468ea0e 100644
--- a/llvm/lib/Fuzzer/FuzzerTracePC.cpp
+++ b/llvm/lib/Fuzzer/FuzzerTracePC.cpp
@@ -12,12 +12,12 @@
//
//===----------------------------------------------------------------------===//
+#include "FuzzerTracePC.h"
#include "FuzzerCorpus.h"
#include "FuzzerDefs.h"
#include "FuzzerDictionary.h"
#include "FuzzerExtFunctions.h"
#include "FuzzerIO.h"
-#include "FuzzerTracePC.h"
#include "FuzzerUtil.h"
#include "FuzzerValueBitMap.h"
#include <map>
diff --git a/llvm/lib/Fuzzer/FuzzerTraceState.cpp b/llvm/lib/Fuzzer/FuzzerTraceState.cpp
index a486223d650..8670e2ad672 100644
--- a/llvm/lib/Fuzzer/FuzzerTraceState.cpp
+++ b/llvm/lib/Fuzzer/FuzzerTraceState.cpp
@@ -10,8 +10,8 @@
//===----------------------------------------------------------------------===//
#include "FuzzerDictionary.h"
-#include "FuzzerInternal.h"
#include "FuzzerIO.h"
+#include "FuzzerInternal.h"
#include "FuzzerMutate.h"
#include "FuzzerTracePC.h"
#include <algorithm>
diff --git a/llvm/lib/Fuzzer/FuzzerUtilWindows.cpp b/llvm/lib/Fuzzer/FuzzerUtilWindows.cpp
index 08bb3cf3be1..8d0678d7bf7 100644
--- a/llvm/lib/Fuzzer/FuzzerUtilWindows.cpp
+++ b/llvm/lib/Fuzzer/FuzzerUtilWindows.cpp
@@ -12,6 +12,7 @@
#if LIBFUZZER_WINDOWS
#include "FuzzerIO.h"
#include "FuzzerInternal.h"
+#include <Psapi.h>
#include <cassert>
#include <chrono>
#include <cstring>
@@ -22,7 +23,6 @@
#include <stdio.h>
#include <sys/types.h>
#include <windows.h>
-#include <Psapi.h>
namespace fuzzer {
diff --git a/llvm/lib/Fuzzer/afl/afl_driver.cpp b/llvm/lib/Fuzzer/afl/afl_driver.cpp
index 3815ed11cf6..d0521bdfdd6 100644
--- a/llvm/lib/Fuzzer/afl/afl_driver.cpp
+++ b/llvm/lib/Fuzzer/afl/afl_driver.cpp
@@ -12,8 +12,8 @@
Usage:
################################################################################
cat << EOF > test_fuzzer.cc
-#include <stdint.h>
#include <stddef.h>
+#include <stdint.h>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
if (size > 0 && data[0] == 'H')
if (size > 1 && data[1] == 'I')
@@ -50,18 +50,18 @@ statistics from the file. If that fails then the process will quit.
*/
#include <assert.h>
-#include <stdio.h>
+#include <errno.h>
+#include <signal.h>
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <signal.h>
#include <sys/resource.h>
#include <sys/time.h>
+#include <unistd.h>
-#include <iostream>
#include <fstream>
+#include <iostream>
#include <vector>
// Platform detection. Copied from FuzzerInternal.h
diff --git a/llvm/lib/Fuzzer/test/AFLDriverTest.cpp b/llvm/lib/Fuzzer/test/AFLDriverTest.cpp
index e3f5f710088..b949adc7de1 100644
--- a/llvm/lib/Fuzzer/test/AFLDriverTest.cpp
+++ b/llvm/lib/Fuzzer/test/AFLDriverTest.cpp
@@ -3,8 +3,8 @@
// Contains dummy functions used to avoid dependency on AFL.
#include <stdint.h>
-#include <stdlib.h>
#include <stdio.h>
+#include <stdlib.h>
extern "C" void __afl_manual_init() {}
diff --git a/llvm/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp b/llvm/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp
index 69b0d59fb8e..dfb6007b797 100644
--- a/llvm/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp
+++ b/llvm/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp
@@ -2,11 +2,11 @@
// License. See LICENSE.TXT for details.
// abs(x) < 0 and y == Const puzzle, 64-bit variant.
-#include <cstring>
-#include <cstdint>
-#include <cstdlib>
#include <cstddef>
+#include <cstdint>
#include <cstdio>
+#include <cstdlib>
+#include <cstring>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
if (Size < 16) return 0;
diff --git a/llvm/lib/Fuzzer/test/AbsNegAndConstantTest.cpp b/llvm/lib/Fuzzer/test/AbsNegAndConstantTest.cpp
index 69075a454c9..e9d983ff1eb 100644
--- a/llvm/lib/Fuzzer/test/AbsNegAndConstantTest.cpp
+++ b/llvm/lib/Fuzzer/test/AbsNegAndConstantTest.cpp
@@ -2,11 +2,11 @@
// License. See LICENSE.TXT for details.
// abs(x) < 0 and y == Const puzzle.
-#include <cstring>
-#include <cstdint>
-#include <cstdlib>
#include <cstddef>
+#include <cstdint>
#include <cstdio>
+#include <cstdlib>
+#include <cstring>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
if (Size < 8) return 0;
diff --git a/llvm/lib/Fuzzer/test/AccumulateAllocationsTest.cpp b/llvm/lib/Fuzzer/test/AccumulateAllocationsTest.cpp
index 604d8fa299a..e9acd7ccbd3 100644
--- a/llvm/lib/Fuzzer/test/AccumulateAllocationsTest.cpp
+++ b/llvm/lib/Fuzzer/test/AccumulateAllocationsTest.cpp
@@ -2,8 +2,8 @@
// License. See LICENSE.TXT for details.
// Test with a more mallocs than frees, but no leak.
-#include <cstdint>
#include <cstddef>
+#include <cstdint>
const int kAllocatedPointersSize = 10000;
int NumAllocatedPointers = 0;
diff --git a/llvm/lib/Fuzzer/test/BadStrcmpTest.cpp b/llvm/lib/Fuzzer/test/BadStrcmpTest.cpp
index 159cd7ea5f7..ba2b068f741 100644
--- a/llvm/lib/Fuzzer/test/BadStrcmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/BadStrcmpTest.cpp
@@ -2,9 +2,9 @@
// License. See LICENSE.TXT for details.
// Test that we don't creash in case of bad strcmp params.
+#include <cstddef>
#include <cstdint>
#include <cstring>
-#include <cstddef>
static volatile int Sink;
diff --git a/llvm/lib/Fuzzer/test/BufferOverflowOnInput.cpp b/llvm/lib/Fuzzer/test/BufferOverflowOnInput.cpp
index b9d14052aee..75e1fb90a19 100644
--- a/llvm/lib/Fuzzer/test/BufferOverflowOnInput.cpp
+++ b/llvm/lib/Fuzzer/test/BufferOverflowOnInput.cpp
@@ -3,9 +3,9 @@
// Simple test for a fuzzer. The fuzzer must find the string "Hi!".
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
static volatile bool SeedLargeBuffer;
diff --git a/llvm/lib/Fuzzer/test/CallerCalleeTest.cpp b/llvm/lib/Fuzzer/test/CallerCalleeTest.cpp
index 3ec025d0230..ed9f37cc152 100644
--- a/llvm/lib/Fuzzer/test/CallerCalleeTest.cpp
+++ b/llvm/lib/Fuzzer/test/CallerCalleeTest.cpp
@@ -3,9 +3,9 @@
// Simple test for a fuzzer.
// Try to find the target using the indirect caller-callee pairs.
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <cstring>
#include <iostream>
diff --git a/llvm/lib/Fuzzer/test/CleanseTest.cpp b/llvm/lib/Fuzzer/test/CleanseTest.cpp
index faea8dcb3c3..ee184570126 100644
--- a/llvm/lib/Fuzzer/test/CleanseTest.cpp
+++ b/llvm/lib/Fuzzer/test/CleanseTest.cpp
@@ -3,9 +3,9 @@
// Test the the fuzzer is able to 'cleanse' the reproducer
// by replacing all irrelevant bytes with garbage.
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
if (Size >= 20 && Data[1] == '1' && Data[5] == '5' && Data[10] == 'A' &&
diff --git a/llvm/lib/Fuzzer/test/CustomMutatorTest.cpp b/llvm/lib/Fuzzer/test/CustomMutatorTest.cpp
index 4f84519a90e..521d7f506b4 100644
--- a/llvm/lib/Fuzzer/test/CustomMutatorTest.cpp
+++ b/llvm/lib/Fuzzer/test/CustomMutatorTest.cpp
@@ -3,9 +3,9 @@
// Simple test for a cutom mutator.
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
#include "FuzzerInterface.h"
diff --git a/llvm/lib/Fuzzer/test/CxxStringEqTest.cpp b/llvm/lib/Fuzzer/test/CxxStringEqTest.cpp
index e0e23c972cc..924851c5ad5 100644
--- a/llvm/lib/Fuzzer/test/CxxStringEqTest.cpp
+++ b/llvm/lib/Fuzzer/test/CxxStringEqTest.cpp
@@ -3,11 +3,11 @@
// Simple test for a fuzzer. Must find a specific string
// used in std::string operator ==.
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
-#include <string>
#include <iostream>
+#include <string>
static volatile int Sink;
diff --git a/llvm/lib/Fuzzer/test/DSOTestMain.cpp b/llvm/lib/Fuzzer/test/DSOTestMain.cpp
index 3e225d88612..e0c857d4fde 100644
--- a/llvm/lib/Fuzzer/test/DSOTestMain.cpp
+++ b/llvm/lib/Fuzzer/test/DSOTestMain.cpp
@@ -4,9 +4,9 @@
// Source code for a simple DSO.
#include <cstdint>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
-#include <cstdio>
extern int DSO1(int a);
extern int DSO2(int a);
extern int DSOTestExtra(int a);
diff --git a/llvm/lib/Fuzzer/test/DivTest.cpp b/llvm/lib/Fuzzer/test/DivTest.cpp
index 63f6960f4e9..bce13feb790 100644
--- a/llvm/lib/Fuzzer/test/DivTest.cpp
+++ b/llvm/lib/Fuzzer/test/DivTest.cpp
@@ -3,9 +3,9 @@
// Simple test for a fuzzer: find the interesting argument for div.
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstring>
-#include <cstddef>
#include <iostream>
static volatile int Sink;
diff --git a/llvm/lib/Fuzzer/test/FourIndependentBranchesTest.cpp b/llvm/lib/Fuzzer/test/FourIndependentBranchesTest.cpp
index 62b3be76e3a..bbf5ea235c7 100644
--- a/llvm/lib/Fuzzer/test/FourIndependentBranchesTest.cpp
+++ b/llvm/lib/Fuzzer/test/FourIndependentBranchesTest.cpp
@@ -2,9 +2,9 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find the string "FUZZ".
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
diff --git a/llvm/lib/Fuzzer/test/FullCoverageSetTest.cpp b/llvm/lib/Fuzzer/test/FullCoverageSetTest.cpp
index 415e0b4760c..6d7e48fe51f 100644
--- a/llvm/lib/Fuzzer/test/FullCoverageSetTest.cpp
+++ b/llvm/lib/Fuzzer/test/FullCoverageSetTest.cpp
@@ -2,9 +2,9 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find the string "FUZZER".
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
diff --git a/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp b/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp
index 78ea874f2ce..c8beb4331bf 100644
--- a/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp
+++ b/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp
@@ -6,12 +6,12 @@
#define _LIBCPP_HAS_NO_ASAN
#include "FuzzerCorpus.h"
-#include "FuzzerInternal.h"
#include "FuzzerDictionary.h"
+#include "FuzzerInternal.h"
#include "FuzzerMerge.h"
#include "FuzzerMutate.h"
-#include "FuzzerTracePC.h"
#include "FuzzerRandom.h"
+#include "FuzzerTracePC.h"
#include "gtest/gtest.h"
#include <memory>
#include <set>
diff --git a/llvm/lib/Fuzzer/test/LeakTest.cpp b/llvm/lib/Fuzzer/test/LeakTest.cpp
index 22e5164050e..ea89e390105 100644
--- a/llvm/lib/Fuzzer/test/LeakTest.cpp
+++ b/llvm/lib/Fuzzer/test/LeakTest.cpp
@@ -2,8 +2,8 @@
// License. See LICENSE.TXT for details.
// Test with a leak.
-#include <cstdint>
#include <cstddef>
+#include <cstdint>
static volatile void *Sink;
diff --git a/llvm/lib/Fuzzer/test/LeakTimeoutTest.cpp b/llvm/lib/Fuzzer/test/LeakTimeoutTest.cpp
index 4f31b3e52c1..92526194a50 100644
--- a/llvm/lib/Fuzzer/test/LeakTimeoutTest.cpp
+++ b/llvm/lib/Fuzzer/test/LeakTimeoutTest.cpp
@@ -2,8 +2,8 @@
// License. See LICENSE.TXT for details.
// Test with a leak.
-#include <cstdint>
#include <cstddef>
+#include <cstdint>
static volatile int *Sink;
diff --git a/llvm/lib/Fuzzer/test/LoadTest.cpp b/llvm/lib/Fuzzer/test/LoadTest.cpp
index eef16c7be51..67a28c7cb22 100644
--- a/llvm/lib/Fuzzer/test/LoadTest.cpp
+++ b/llvm/lib/Fuzzer/test/LoadTest.cpp
@@ -3,9 +3,9 @@
// Simple test for a fuzzer: find interesting value of array index.
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstring>
-#include <cstddef>
#include <iostream>
static volatile int Sink;
diff --git a/llvm/lib/Fuzzer/test/Memcmp64BytesTest.cpp b/llvm/lib/Fuzzer/test/Memcmp64BytesTest.cpp
index e81526b578a..5b6cb707173 100644
--- a/llvm/lib/Fuzzer/test/Memcmp64BytesTest.cpp
+++ b/llvm/lib/Fuzzer/test/Memcmp64BytesTest.cpp
@@ -3,10 +3,10 @@
// Simple test for a fuzzer. The fuzzer must find a particular string.
#include <cassert>
-#include <cstring>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
+#include <cstring>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
const char kString64Bytes[] =
diff --git a/llvm/lib/Fuzzer/test/MemcmpTest.cpp b/llvm/lib/Fuzzer/test/MemcmpTest.cpp
index fdbf94683f7..8dbb7d84fbb 100644
--- a/llvm/lib/Fuzzer/test/MemcmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/MemcmpTest.cpp
@@ -2,10 +2,10 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find a particular string.
-#include <cstring>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
+#include <cstring>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
// TODO: check other sizes.
diff --git a/llvm/lib/Fuzzer/test/NotinstrumentedTest.cpp b/llvm/lib/Fuzzer/test/NotinstrumentedTest.cpp
index ffe952c749d..91418990b19 100644
--- a/llvm/lib/Fuzzer/test/NotinstrumentedTest.cpp
+++ b/llvm/lib/Fuzzer/test/NotinstrumentedTest.cpp
@@ -2,8 +2,8 @@
// License. See LICENSE.TXT for details.
// This test should not be instrumented.
-#include <cstdint>
#include <cstddef>
+#include <cstdint>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
return 0;
diff --git a/llvm/lib/Fuzzer/test/NthRunCrashTest.cpp b/llvm/lib/Fuzzer/test/NthRunCrashTest.cpp
index b43e69e51b2..da5fbd33e96 100644
--- a/llvm/lib/Fuzzer/test/NthRunCrashTest.cpp
+++ b/llvm/lib/Fuzzer/test/NthRunCrashTest.cpp
@@ -2,8 +2,8 @@
// License. See LICENSE.TXT for details.
// Crash on the N-th execution.
-#include <cstdint>
#include <cstddef>
+#include <cstdint>
#include <iostream>
static int Counter;
diff --git a/llvm/lib/Fuzzer/test/NullDerefOnEmptyTest.cpp b/llvm/lib/Fuzzer/test/NullDerefOnEmptyTest.cpp
index 153710920a5..459db51f8a3 100644
--- a/llvm/lib/Fuzzer/test/NullDerefOnEmptyTest.cpp
+++ b/llvm/lib/Fuzzer/test/NullDerefOnEmptyTest.cpp
@@ -2,9 +2,9 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find the empty string.
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
static volatile int *Null = 0;
diff --git a/llvm/lib/Fuzzer/test/NullDerefTest.cpp b/llvm/lib/Fuzzer/test/NullDerefTest.cpp
index 3f03d249819..1b44b682ace 100644
--- a/llvm/lib/Fuzzer/test/NullDerefTest.cpp
+++ b/llvm/lib/Fuzzer/test/NullDerefTest.cpp
@@ -2,9 +2,9 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find the string "Hi!".
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
static volatile int Sink;
diff --git a/llvm/lib/Fuzzer/test/OneHugeAllocTest.cpp b/llvm/lib/Fuzzer/test/OneHugeAllocTest.cpp
index 8d3d1d6d302..32a55787100 100644
--- a/llvm/lib/Fuzzer/test/OneHugeAllocTest.cpp
+++ b/llvm/lib/Fuzzer/test/OneHugeAllocTest.cpp
@@ -3,9 +3,9 @@
// Tests OOM handling when there is a single large allocation.
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <cstring>
#include <iostream>
diff --git a/llvm/lib/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp b/llvm/lib/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp
index 316b7682b8e..a07795a08df 100644
--- a/llvm/lib/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp
+++ b/llvm/lib/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp
@@ -3,9 +3,9 @@
// Tests OOM handling.
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <cstring>
#include <iostream>
diff --git a/llvm/lib/Fuzzer/test/OutOfMemoryTest.cpp b/llvm/lib/Fuzzer/test/OutOfMemoryTest.cpp
index 078a39ee1fe..5e59bde0985 100644
--- a/llvm/lib/Fuzzer/test/OutOfMemoryTest.cpp
+++ b/llvm/lib/Fuzzer/test/OutOfMemoryTest.cpp
@@ -3,9 +3,9 @@
// Tests OOM handling.
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <cstring>
#include <iostream>
#include <thread>
diff --git a/llvm/lib/Fuzzer/test/RepeatedBytesTest.cpp b/llvm/lib/Fuzzer/test/RepeatedBytesTest.cpp
index 2fa6c78c26d..14222f28474 100644
--- a/llvm/lib/Fuzzer/test/RepeatedBytesTest.cpp
+++ b/llvm/lib/Fuzzer/test/RepeatedBytesTest.cpp
@@ -3,9 +3,9 @@
// Simple test for a fuzzer. The fuzzer must find repeated bytes.
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
diff --git a/llvm/lib/Fuzzer/test/RepeatedMemcmp.cpp b/llvm/lib/Fuzzer/test/RepeatedMemcmp.cpp
index 7377f65ed76..18369deac3b 100644
--- a/llvm/lib/Fuzzer/test/RepeatedMemcmp.cpp
+++ b/llvm/lib/Fuzzer/test/RepeatedMemcmp.cpp
@@ -1,11 +1,10 @@
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-
-#include <cstring>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
+#include <cstring>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
int Matches1 = 0;
diff --git a/llvm/lib/Fuzzer/test/ShrinkControlFlowTest.cpp b/llvm/lib/Fuzzer/test/ShrinkControlFlowTest.cpp
index 0fd7c5e9a1f..d0954296362 100644
--- a/llvm/lib/Fuzzer/test/ShrinkControlFlowTest.cpp
+++ b/llvm/lib/Fuzzer/test/ShrinkControlFlowTest.cpp
@@ -2,11 +2,11 @@
// License. See LICENSE.TXT for details.
// Test that we can find the minimal item in the corpus (3 bytes: "FUZ").
+#include <cstddef>
#include <cstdint>
+#include <cstdio>
#include <cstdlib>
-#include <cstddef>
#include <cstring>
-#include <cstdio>
static volatile int Sink;
diff --git a/llvm/lib/Fuzzer/test/ShrinkValueProfileTest.cpp b/llvm/lib/Fuzzer/test/ShrinkValueProfileTest.cpp
index 026b8ce2659..86e4e3cb0d9 100644
--- a/llvm/lib/Fuzzer/test/ShrinkValueProfileTest.cpp
+++ b/llvm/lib/Fuzzer/test/ShrinkValueProfileTest.cpp
@@ -2,11 +2,11 @@
// License. See LICENSE.TXT for details.
// Test that we can find the minimal item in the corpus (3 bytes: "FUZ").
+#include <cstddef>
#include <cstdint>
+#include <cstdio>
#include <cstdlib>
-#include <cstddef>
#include <cstring>
-#include <cstdio>
static volatile uint32_t Sink;
diff --git a/llvm/lib/Fuzzer/test/SignedIntOverflowTest.cpp b/llvm/lib/Fuzzer/test/SignedIntOverflowTest.cpp
index 7df32ad5793..d80060207de 100644
--- a/llvm/lib/Fuzzer/test/SignedIntOverflowTest.cpp
+++ b/llvm/lib/Fuzzer/test/SignedIntOverflowTest.cpp
@@ -3,11 +3,11 @@
// Test for signed-integer-overflow.
#include <assert.h>
+#include <climits>
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
-#include <climits>
static volatile int Sink;
static int Large = INT_MAX;
diff --git a/llvm/lib/Fuzzer/test/SimpleCmpTest.cpp b/llvm/lib/Fuzzer/test/SimpleCmpTest.cpp
index 12b5cdda066..8acad4ac77e 100644
--- a/llvm/lib/Fuzzer/test/SimpleCmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/SimpleCmpTest.cpp
@@ -3,9 +3,9 @@
// Simple test for a fuzzer. The fuzzer must find several narrow ranges.
#include <cstdint>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
-#include <cstdio>
extern int AllLines[];
diff --git a/llvm/lib/Fuzzer/test/SimpleDictionaryTest.cpp b/llvm/lib/Fuzzer/test/SimpleDictionaryTest.cpp
index cd7292bd006..a1cd2004722 100644
--- a/llvm/lib/Fuzzer/test/SimpleDictionaryTest.cpp
+++ b/llvm/lib/Fuzzer/test/SimpleDictionaryTest.cpp
@@ -5,9 +5,9 @@
// The fuzzer must find a string based on dictionary words:
// "Elvis"
// "Presley"
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <cstring>
#include <iostream>
diff --git a/llvm/lib/Fuzzer/test/SimpleHashTest.cpp b/llvm/lib/Fuzzer/test/SimpleHashTest.cpp
index 00599de78eb..99e96cb25dc 100644
--- a/llvm/lib/Fuzzer/test/SimpleHashTest.cpp
+++ b/llvm/lib/Fuzzer/test/SimpleHashTest.cpp
@@ -5,9 +5,9 @@
// and then compares the last 4 bytes with the computed value.
// A fuzzer with cmp traces is expected to defeat this check.
#include <cstdint>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
-#include <cstdio>
// A modified jenkins_one_at_a_time_hash initialized by non-zero,
// so that simple_hash(0) != 0. See also
diff --git a/llvm/lib/Fuzzer/test/SimpleTest.cpp b/llvm/lib/Fuzzer/test/SimpleTest.cpp
index e53ea160ed8..a8b4988dff1 100644
--- a/llvm/lib/Fuzzer/test/SimpleTest.cpp
+++ b/llvm/lib/Fuzzer/test/SimpleTest.cpp
@@ -3,9 +3,9 @@
// Simple test for a fuzzer. The fuzzer must find the string "Hi!".
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
static volatile int Sink;
diff --git a/llvm/lib/Fuzzer/test/SimpleThreadedTest.cpp b/llvm/lib/Fuzzer/test/SimpleThreadedTest.cpp
index 5f02d3f8457..1abdc3fc6d6 100644
--- a/llvm/lib/Fuzzer/test/SimpleThreadedTest.cpp
+++ b/llvm/lib/Fuzzer/test/SimpleThreadedTest.cpp
@@ -3,8 +3,8 @@
// Threaded test for a fuzzer. The fuzzer should find "H"
#include <assert.h>
-#include <cstdint>
#include <cstddef>
+#include <cstdint>
#include <cstring>
#include <iostream>
#include <thread>
diff --git a/llvm/lib/Fuzzer/test/SingleByteInputTest.cpp b/llvm/lib/Fuzzer/test/SingleByteInputTest.cpp
index 4ce819d230c..72b58ba912e 100644
--- a/llvm/lib/Fuzzer/test/SingleByteInputTest.cpp
+++ b/llvm/lib/Fuzzer/test/SingleByteInputTest.cpp
@@ -2,10 +2,10 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer, need just one byte to crash.
-#include <cstdint>
-#include <cstdlib>
#include <cstddef>
+#include <cstdint>
#include <cstdio>
+#include <cstdlib>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
if (Size > 0 && Data[Size/2] == 42) {
diff --git a/llvm/lib/Fuzzer/test/SingleMemcmpTest.cpp b/llvm/lib/Fuzzer/test/SingleMemcmpTest.cpp
index c73f68a7ee6..83c09e0428e 100644
--- a/llvm/lib/Fuzzer/test/SingleMemcmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/SingleMemcmpTest.cpp
@@ -2,10 +2,10 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find a particular string.
-#include <cstring>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
+#include <cstring>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
char *S = (char*)Data;
diff --git a/llvm/lib/Fuzzer/test/SingleStrcmpTest.cpp b/llvm/lib/Fuzzer/test/SingleStrcmpTest.cpp
index 48f481dfc51..149073444c9 100644
--- a/llvm/lib/Fuzzer/test/SingleStrcmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/SingleStrcmpTest.cpp
@@ -2,10 +2,10 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find a particular string.
-#include <cstring>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
+#include <cstring>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
if (Size >= 7) {
diff --git a/llvm/lib/Fuzzer/test/SingleStrncmpTest.cpp b/llvm/lib/Fuzzer/test/SingleStrncmpTest.cpp
index e5601da8632..b302670fb74 100644
--- a/llvm/lib/Fuzzer/test/SingleStrncmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/SingleStrncmpTest.cpp
@@ -2,10 +2,10 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find a particular string.
-#include <cstring>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
+#include <cstring>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
char *S = (char*)Data;
diff --git a/llvm/lib/Fuzzer/test/SpamyTest.cpp b/llvm/lib/Fuzzer/test/SpamyTest.cpp
index d294d4dc53e..721134e1841 100644
--- a/llvm/lib/Fuzzer/test/SpamyTest.cpp
+++ b/llvm/lib/Fuzzer/test/SpamyTest.cpp
@@ -3,9 +3,9 @@
// The test spams to stderr and stdout.
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstdio>
-#include <cstddef>
#include <iostream>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
diff --git a/llvm/lib/Fuzzer/test/StrcmpTest.cpp b/llvm/lib/Fuzzer/test/StrcmpTest.cpp
index cd91dda76f3..e7636e8812f 100644
--- a/llvm/lib/Fuzzer/test/StrcmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/StrcmpTest.cpp
@@ -2,11 +2,11 @@
// License. See LICENSE.TXT for details.
// Break through a series of strcmp.
-#include <cstring>
+#include <cassert>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
-#include <cassert>
+#include <cstring>
bool Eq(const uint8_t *Data, size_t Size, const char *Str) {
char Buff[1024];
diff --git a/llvm/lib/Fuzzer/test/StrncmpOOBTest.cpp b/llvm/lib/Fuzzer/test/StrncmpOOBTest.cpp
index f70b003afad..4ed71d9d021 100644
--- a/llvm/lib/Fuzzer/test/StrncmpOOBTest.cpp
+++ b/llvm/lib/Fuzzer/test/StrncmpOOBTest.cpp
@@ -3,10 +3,10 @@
// Test that libFuzzer itself does not read out of bounds.
#include <assert.h>
+#include <cstddef>
#include <cstdint>
-#include <cstring>
#include <cstdlib>
-#include <cstddef>
+#include <cstring>
#include <iostream>
static volatile int Sink;
diff --git a/llvm/lib/Fuzzer/test/StrncmpTest.cpp b/llvm/lib/Fuzzer/test/StrncmpTest.cpp
index 5ffd011dcdf..f71f01ee309 100644
--- a/llvm/lib/Fuzzer/test/StrncmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/StrncmpTest.cpp
@@ -2,10 +2,10 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find a particular string.
-#include <cstring>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
+#include <cstring>
static volatile int sink;
diff --git a/llvm/lib/Fuzzer/test/StrstrTest.cpp b/llvm/lib/Fuzzer/test/StrstrTest.cpp
index f021e75ec0f..a3ea4e03b3d 100644
--- a/llvm/lib/Fuzzer/test/StrstrTest.cpp
+++ b/llvm/lib/Fuzzer/test/StrstrTest.cpp
@@ -2,11 +2,11 @@
// License. See LICENSE.TXT for details.
// Test strstr and strcasestr hooks.
-#include <string>
-#include <string.h>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
+#include <string.h>
+#include <string>
// Windows does not have strcasestr and memmem, so we are not testing them.
#ifdef _WIN32
diff --git a/llvm/lib/Fuzzer/test/SwapCmpTest.cpp b/llvm/lib/Fuzzer/test/SwapCmpTest.cpp
index b90ac72c22c..bbfbefe6ab7 100644
--- a/llvm/lib/Fuzzer/test/SwapCmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/SwapCmpTest.cpp
@@ -3,9 +3,9 @@
// The fuzzer must find several constants with swapped bytes.
#include <cstdint>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
-#include <cstdio>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
if (Size < 14) return 0;
diff --git a/llvm/lib/Fuzzer/test/Switch2Test.cpp b/llvm/lib/Fuzzer/test/Switch2Test.cpp
index 3c6a3004907..5f66ac8b499 100644
--- a/llvm/lib/Fuzzer/test/Switch2Test.cpp
+++ b/llvm/lib/Fuzzer/test/Switch2Test.cpp
@@ -2,11 +2,11 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find the interesting switch value.
+#include <cstddef>
#include <cstdint>
-#include <cstdlib>
#include <cstdio>
+#include <cstdlib>
#include <cstring>
-#include <cstddef>
int Switch(int a) {
switch(a) {
diff --git a/llvm/lib/Fuzzer/test/SwitchTest.cpp b/llvm/lib/Fuzzer/test/SwitchTest.cpp
index 3dc051ff7b5..86944cad21c 100644
--- a/llvm/lib/Fuzzer/test/SwitchTest.cpp
+++ b/llvm/lib/Fuzzer/test/SwitchTest.cpp
@@ -2,11 +2,11 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find the interesting switch value.
+#include <cstddef>
#include <cstdint>
-#include <cstdlib>
#include <cstdio>
+#include <cstdlib>
#include <cstring>
-#include <cstddef>
static volatile int Sink;
diff --git a/llvm/lib/Fuzzer/test/TableLookupTest.cpp b/llvm/lib/Fuzzer/test/TableLookupTest.cpp
index f9d5610820f..8126eeabaf4 100644
--- a/llvm/lib/Fuzzer/test/TableLookupTest.cpp
+++ b/llvm/lib/Fuzzer/test/TableLookupTest.cpp
@@ -3,11 +3,11 @@
// Make sure the fuzzer eventually finds all possible values of a variable
// within a range.
-#include <cstring>
+#include <cassert>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
-#include <cassert>
+#include <cstring>
#include <set>
const size_t N = 1 << 12;
diff --git a/llvm/lib/Fuzzer/test/ThreadedLeakTest.cpp b/llvm/lib/Fuzzer/test/ThreadedLeakTest.cpp
index 75110711087..538d3b43480 100644
--- a/llvm/lib/Fuzzer/test/ThreadedLeakTest.cpp
+++ b/llvm/lib/Fuzzer/test/ThreadedLeakTest.cpp
@@ -2,8 +2,8 @@
// License. See LICENSE.TXT for details.
// The fuzzer should find a leak in a non-main thread.
-#include <cstdint>
#include <cstddef>
+#include <cstdint>
#include <thread>
static volatile int *Sink;
diff --git a/llvm/lib/Fuzzer/test/ThreadedTest.cpp b/llvm/lib/Fuzzer/test/ThreadedTest.cpp
index 09137a9a70c..bb51ba764eb 100644
--- a/llvm/lib/Fuzzer/test/ThreadedTest.cpp
+++ b/llvm/lib/Fuzzer/test/ThreadedTest.cpp
@@ -3,8 +3,8 @@
// Threaded test for a fuzzer. The fuzzer should not crash.
#include <assert.h>
-#include <cstdint>
#include <cstddef>
+#include <cstdint>
#include <cstring>
#include <thread>
diff --git a/llvm/lib/Fuzzer/test/TimeoutEmptyTest.cpp b/llvm/lib/Fuzzer/test/TimeoutEmptyTest.cpp
index 8066f480b65..1ddf1fa3458 100644
--- a/llvm/lib/Fuzzer/test/TimeoutEmptyTest.cpp
+++ b/llvm/lib/Fuzzer/test/TimeoutEmptyTest.cpp
@@ -2,8 +2,8 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find the empty string.
-#include <cstdint>
#include <cstddef>
+#include <cstdint>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
static volatile int Zero = 0;
diff --git a/llvm/lib/Fuzzer/test/TimeoutTest.cpp b/llvm/lib/Fuzzer/test/TimeoutTest.cpp
index f8107012c84..e3cdba3eec3 100644
--- a/llvm/lib/Fuzzer/test/TimeoutTest.cpp
+++ b/llvm/lib/Fuzzer/test/TimeoutTest.cpp
@@ -2,9 +2,9 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. The fuzzer must find the string "Hi!".
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
static volatile int Sink;
diff --git a/llvm/lib/Fuzzer/test/TraceMallocTest.cpp b/llvm/lib/Fuzzer/test/TraceMallocTest.cpp
index 43e6950e185..af9975603aa 100644
--- a/llvm/lib/Fuzzer/test/TraceMallocTest.cpp
+++ b/llvm/lib/Fuzzer/test/TraceMallocTest.cpp
@@ -3,9 +3,9 @@
// Tests -trace_malloc
#include <assert.h>
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
int *Ptr;
diff --git a/llvm/lib/Fuzzer/test/TwoDifferentBugsTest.cpp b/llvm/lib/Fuzzer/test/TwoDifferentBugsTest.cpp
index 42c0d192ba8..77d2cb1a25f 100644
--- a/llvm/lib/Fuzzer/test/TwoDifferentBugsTest.cpp
+++ b/llvm/lib/Fuzzer/test/TwoDifferentBugsTest.cpp
@@ -2,9 +2,9 @@
// License. See LICENSE.TXT for details.
// Simple test for a fuzzer. This test may trigger two different bugs.
+#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include <cstddef>
#include <iostream>
static volatile int *Null = 0;
OpenPOWER on IntegriCloud