Revert^6 "Prevent UAF issues caused by static destructors"
This reverts commit 4798222e3b3c22435d0a8d915d272fe67c80bd01.
Reason for revert: Fixed issue in underlying change.
Bug: 69591477
Test: ./test.py --host -j50
Change-Id: I31f0ba00ade607f388e248f287801ff878c7296f
diff --git a/openjdkjvmti/deopt_manager.cc b/openjdkjvmti/deopt_manager.cc
index 9f5db7e..6d84ffa 100644
--- a/openjdkjvmti/deopt_manager.cc
+++ b/openjdkjvmti/deopt_manager.cc
@@ -343,9 +343,9 @@
art::Runtime::Current()->GetInstrumentation()->InstrumentThreadStack(target);
}
-extern DeoptManager gDeoptManager;
+extern DeoptManager* gDeoptManager;
DeoptManager* DeoptManager::Get() {
- return &gDeoptManager;
+ return gDeoptManager;
}
} // namespace openjdkjvmti