-From e7b02154a90480ed6bca8ba7203c70e7b5a27203 Mon Sep 17 00:00:00 2001
-From: Alan32Liu <donggeliu@google.com>
-Date: Wed, 23 Feb 2022 15:55:17 +1100
-Subject: [PATCH 1/3] Trace store and load commands
-
-Signed-off-by: Alan32Liu <donggeliu@google.com>
----
- compiler-rt/lib/fuzzer/FuzzerMain.cpp    |   2 +
- compiler-rt/lib/fuzzer/FuzzerTracePC.cpp | 108 +++++++++++++++++++++++
- compiler-rt/lib/fuzzer/FuzzerTracePC.h   |  15 ++++
- 3 files changed, 125 insertions(+)
-
+diff --git a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
+index 6b007f2ad45c..23299e36b5e8 100644
+--- a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
++++ b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
+@@ -640,6 +640,7 @@ ReadCorpora(const std::vector<std::string> &CorpusDirs,
+ }
+ 
+ int FuzzerDriver(int *argc, char ***argv, UserCallback Callback) {
++  fuzzer::TPC.InitializeMainObjectInformation();
+   using namespace fuzzer;
+   assert(argc && argv && "Argument pointers cannot be nullptr");
+   std::string Argv0((*argv)[0]);
 diff --git a/compiler-rt/lib/fuzzer/FuzzerMain.cpp b/compiler-rt/lib/fuzzer/FuzzerMain.cpp
-index 75f2f8e75c9b..761bb82ff602 100644
+index 75f2f8e75c9b..120923992f9f 100644
 --- a/compiler-rt/lib/fuzzer/FuzzerMain.cpp
 +++ b/compiler-rt/lib/fuzzer/FuzzerMain.cpp
 @@ -10,6 +10,7 @@

+}
 }  // extern "C"
diff --git a/compiler-rt/lib/fuzzer/FuzzerTracePC.h b/compiler-rt/lib/fuzzer/FuzzerTracePC.h
index af1f9d81e950..d9e82f1a92b3 100644
--- a/compiler-rt/lib/fuzzer/FuzzerTracePC.h
+++ b/compiler-rt/lib/fuzzer/FuzzerTracePC.h
@@ -11,6 +11,8 @@

 
 extern "C" {
 // This function should be defined by the user.
diff --git a/compiler-rt/lib/fuzzer/FuzzerTracePC.cpp b/compiler-rt/lib/fuzzer/FuzzerTracePC.cpp
index f12f7aa61bc4..c45178254383 100644
--- a/compiler-rt/lib/fuzzer/FuzzerTracePC.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerTracePC.cpp
@@ -27,6 +27,14 @@
