12 files changed, 15 insertions, 15 deletions
diff --git a/llvm/lib/Fuzzer/FuzzerMain.cpp b/llvm/lib/Fuzzer/FuzzerMain.cpp
index d0c3df3b6b5..c4dffb45d16 100644
--- a/llvm/lib/Fuzzer/FuzzerMain.cpp
+++ b/llvm/lib/Fuzzer/FuzzerMain.cpp
@@ -13,8 +13,8 @@
 #include "FuzzerInternal.h"
 
 // This function should be defined by the user.
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size);
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size);
 
 int main(int argc, char **argv) {
-  return fuzzer::FuzzerDriver(argc, argv, TestOneInput);
+  return fuzzer::FuzzerDriver(argc, argv, LLVMFuzzerTestOneInput);
 }
diff --git a/llvm/lib/Fuzzer/dfsan_fuzzer_abi.list b/llvm/lib/Fuzzer/dfsan_fuzzer_abi.list
index 7da752278f7..6cc684368a6 100644
--- a/llvm/lib/Fuzzer/dfsan_fuzzer_abi.list
+++ b/llvm/lib/Fuzzer/dfsan_fuzzer_abi.list
@@ -9,4 +9,4 @@ fun:__sanitizer_cov_module_init=uninstrumented
 fun:__sanitizer_cov_module_init=discard
 
 # Don't add extra parameters to the Fuzzer callback.
-fun:TestOneInput=uninstrumented
+fun:LLVMFuzzerTestOneInput=uninstrumented
diff --git a/llvm/lib/Fuzzer/test/CounterTest.cpp b/llvm/lib/Fuzzer/test/CounterTest.cpp
index 332ccfe7b02..29ddb02ebae 100644
--- a/llvm/lib/Fuzzer/test/CounterTest.cpp
+++ b/llvm/lib/Fuzzer/test/CounterTest.cpp
@@ -2,7 +2,7 @@
 // executed many times.
 #include <iostream>
 
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size) {
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   int Num = 0;
   for (size_t i = 0; i < Size; i++)
     if (Data[i] == 'A' + i)
diff --git a/llvm/lib/Fuzzer/test/CxxTokensTest.cpp b/llvm/lib/Fuzzer/test/CxxTokensTest.cpp
index 1addccb4bf9..682ceb4f978 100644
--- a/llvm/lib/Fuzzer/test/CxxTokensTest.cpp
+++ b/llvm/lib/Fuzzer/test/CxxTokensTest.cpp
@@ -10,7 +10,7 @@ static void Found() {
   exit(1);
 }
 
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size) {
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   // looking for "thread_local unsigned A;"
   if (Size < 24) return;
   if (0 == memcmp(&Data[0], "thread_local", 12))
diff --git a/llvm/lib/Fuzzer/test/FourIndependentBranchesTest.cpp b/llvm/lib/Fuzzer/test/FourIndependentBranchesTest.cpp
index 171668bf764..e0b7509b8d6 100644
--- a/llvm/lib/Fuzzer/test/FourIndependentBranchesTest.cpp
+++ b/llvm/lib/Fuzzer/test/FourIndependentBranchesTest.cpp
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <iostream>
 
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size) {
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   int bits = 0;
   if (Size > 0 && Data[0] == 'F') bits |= 1;
   if (Size > 1 && Data[1] == 'U') bits |= 2;
diff --git a/llvm/lib/Fuzzer/test/FullCoverageSetTest.cpp b/llvm/lib/Fuzzer/test/FullCoverageSetTest.cpp
index d4f8c115abc..2c6ff98db00 100644
--- a/llvm/lib/Fuzzer/test/FullCoverageSetTest.cpp
+++ b/llvm/lib/Fuzzer/test/FullCoverageSetTest.cpp
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <iostream>
 
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size) {
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   int bits = 0;
   if (Size > 0 && Data[0] == 'F') bits |= 1;
   if (Size > 1 && Data[1] == 'U') bits |= 2;
diff --git a/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp b/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp
index 368a0f2bf00..e337ca851bf 100644
--- a/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp
+++ b/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp
@@ -2,9 +2,9 @@
 #include "gtest/gtest.h"
 #include <set>
 
-// For now, have TestOneInput just to make it link.
-// Later we may want to make unittests that actually call TestOneInput.
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size) {
+// For now, have LLVMFuzzerTestOneInput just to make it link.
+// Later we may want to make unittests that actually call LLVMFuzzerTestOneInput.
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   abort();
 }
 
diff --git a/llvm/lib/Fuzzer/test/InfiniteTest.cpp b/llvm/lib/Fuzzer/test/InfiniteTest.cpp
index dcb3030413b..7c5c8c12713 100644
--- a/llvm/lib/Fuzzer/test/InfiniteTest.cpp
+++ b/llvm/lib/Fuzzer/test/InfiniteTest.cpp
@@ -6,7 +6,7 @@
 
 static volatile int Sink;
 
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size) {
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   if (Size > 0 && Data[0] == 'H') {
     Sink = 1;
     if (Size > 1 && Data[1] == 'i') {
diff --git a/llvm/lib/Fuzzer/test/NullDerefTest.cpp b/llvm/lib/Fuzzer/test/NullDerefTest.cpp
index 8811e386f9d..0cff6617a31 100644
--- a/llvm/lib/Fuzzer/test/NullDerefTest.cpp
+++ b/llvm/lib/Fuzzer/test/NullDerefTest.cpp
@@ -7,7 +7,7 @@
 static volatile int Sink;
 static volatile int *Null = 0;
 
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size) {
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   if (Size > 0 && Data[0] == 'H') {
     Sink = 1;
     if (Size > 1 && Data[1] == 'i') {
diff --git a/llvm/lib/Fuzzer/test/SimpleTest.cpp b/llvm/lib/Fuzzer/test/SimpleTest.cpp
index adb90cebe86..4e3501882d0 100644
--- a/llvm/lib/Fuzzer/test/SimpleTest.cpp
+++ b/llvm/lib/Fuzzer/test/SimpleTest.cpp
@@ -6,7 +6,7 @@
 
 static volatile int Sink;
 
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size) {
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   if (Size > 0 && Data[0] == 'H') {
     Sink = 1;
     if (Size > 1 && Data[1] == 'i') {
diff --git a/llvm/lib/Fuzzer/test/TimeoutTest.cpp b/llvm/lib/Fuzzer/test/TimeoutTest.cpp
index 23683ce866c..d541c058b64 100644
--- a/llvm/lib/Fuzzer/test/TimeoutTest.cpp
+++ b/llvm/lib/Fuzzer/test/TimeoutTest.cpp
@@ -6,7 +6,7 @@
 
 static volatile int Sink;
 
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size) {
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   if (Size > 0 && Data[0] == 'H') {
     Sink = 1;
     if (Size > 1 && Data[1] == 'i') {
diff --git a/llvm/lib/Fuzzer/test/dfsan/DFSanSimpleCmpTest.cpp b/llvm/lib/Fuzzer/test/dfsan/DFSanSimpleCmpTest.cpp
index 11620929a42..d94d1defa00 100644
--- a/llvm/lib/Fuzzer/test/dfsan/DFSanSimpleCmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/dfsan/DFSanSimpleCmpTest.cpp
@@ -4,7 +4,7 @@
 #include <cstring>
 #include <cstdio>
 
-extern "C" void TestOneInput(const uint8_t *Data, size_t Size) {
+extern "C" void LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   if (Size < 14) return;
   uint64_t x = 0;
   int64_t  y = 0;