@@ -30,7 +30,6 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 #include "buffers.h"
-#include "classRefCache.h"
 #include "context.h"
 #include "counters.h"
 #include "flightRecorder.h"
@@ -364,11 +363,6 @@ off_t Recording::finishChunk(bool end_recording) {
 }
 
 void Recording::switchChunk(int fd) {
-    // This will switch the epoch immediately ...
-    ClearTask cc = ClassRefCache::instance()->clear();
-    // ... and release the cached references when the Cleaner RAII is going out of scope
-    Cleaner cleaner(cc);
-    writeClassRefCacheStats(_buf, cc.size());
     _chunk_start = finishChunk(fd > -1);
     _start_time = _stop_time;
     _start_ticks = _stop_ticks;
@@ -1284,7 +1278,7 @@ void FlightRecorder::stop() {
         // NULL first, deallocate later
         _rec = NULL;
         delete tmp;
-        ClassRefCache::instance()->destroy();
+//        ClassRefCache::instance()->destroy();
     }
 }
 
 
@@ -19,7 +19,6 @@
 #include <jni.h>
 #include <string.h>
 #include "arch.h"
-#include "classRefCache.h"
 #include "context.h"
 #include "incbin.h"
 #include "livenessTracker.h"
@@ -32,7 +31,7 @@
 
 LivenessTracker* const LivenessTracker::_instance = new LivenessTracker();
 
-void LivenessTracker::cleanup_table(bool update_class_ref_cache) {
+void LivenessTracker::cleanup_table() {
     u64 current = loadAcquire(_last_gc_epoch);
     u64 target_gc_epoch = loadAcquire(_gc_epoch);
 
@@ -52,15 +51,6 @@ void LivenessTracker::cleanup_table(bool update_class_ref_cache) {
     std::set<jclass> kept_classes;
     for (u32 i = 0; i < (sz = _table_size); i++) {
         if (!env->IsSameObject(_table[i].ref, NULL)) {
-            if (update_class_ref_cache) {
-                // collect referenced classes
-                jclass klass;
-                for (int f_idx = 0; f_idx < _table[i].frames_size; f_idx++) {
-                    if (jvmti->GetMethodDeclaringClass(_table[i].frames[f_idx].method, &klass) == 0) {
-                        kept_classes.insert(klass);
-                    }
-                }
-            }
             // it survived one more GarbageCollectionFinish event
             _table[i].age += epoch_diff;
             _table[newsz++] = _table[i];
@@ -74,10 +64,6 @@ void LivenessTracker::cleanup_table(bool update_class_ref_cache) {
 
     _table_size = newsz;
 
-    if (update_class_ref_cache) {
-        ClassRefCache::instance()->keep(env, kept_classes);
-    }
-
     _table_lock.unlock();
     end = OS::nanotime();
     Log::debug("Liveness tracker cleanup took %.2fms (%.2fus/element)",
@@ -94,7 +80,7 @@ void LivenessTracker::flush_table(std::set<int> *tracked_thread_ids) {
 
     // make sure that the tracking table is cleaned up before we start flushing it
     // this is to make sure we are including as few false 'live' objects as possible
-    cleanup_table(true);
+    cleanup_table();
 
     _table_lock.lockShared();
 
@@ -185,7 +171,7 @@ Error LivenessTracker::start(Arguments& args) {
 }
 
 void LivenessTracker::stop() {
-    cleanup_table(false);
+    cleanup_table();
     flush_table(NULL);
 
     // do not disable GC notifications here - the tracker is supposed to survive multiple recordings
@@ -292,7 +278,7 @@ void LivenessTracker::track(JNIEnv* env, AllocEvent &event, jint tid, jobject ob
             retried = true;
 
             // try cleanup before resizing - there is a good chance it will free some space
-            cleanup_table(false);
+            cleanup_table();
 
             if (_table_cap < _table_max_cap) {
 
 
@@ -68,7 +68,7 @@ class LivenessTracker  {
     Error initialize(Arguments& args);
     Error initialize_table(int sampling_interval);
 
-    void cleanup_table(bool update_class_ref_cache);
+    void cleanup_table();
 
     void flush_table(std::set<int> *tracked_thread_ids);
 
 
@@ -20,7 +20,6 @@
 
 #include <jni.h>
 #include <string.h>
-#include "classRefCache.h"
 #include "objectSampler.h"
 #include "pidController.h"
 #include "profiler.h"
@@ -81,8 +80,6 @@ void ObjectSampler::recordAllocation(jvmtiEnv* jvmti, JNIEnv* jni, jthread threa
                 classes.insert(method_class);
             }
         }
-
-        ClassRefCache::instance()->store(jni, classes);
     }
 
 
@@ -163,10 +160,6 @@ Error ObjectSampler::start(Arguments& args) {
 void ObjectSampler::stop() {
     jvmtiEnv* jvmti = VM::jvmti();
     jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_SAMPLED_OBJECT_ALLOC, NULL);
-
-    if (_record_liveness) {
-        LivenessTracker::instance()->stop();
-    }
 }
 
 Error ObjectSampler::updateConfiguration(u64 events, double time_coefficient) {
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`
`21`	`21`	`#include <jni.h>`
`22`	`22`	`#include <string.h>`
`23`		`-#include "classRefCache.h"`
`24`	`23`	`#include "objectSampler.h"`
`25`	`24`	`#include "pidController.h"`
`26`	`25`	`#include "profiler.h"`
`@@ -81,8 +80,6 @@ void ObjectSampler::recordAllocation(jvmtiEnv* jvmti, JNIEnv* jni, jthread threa`
`81`	`80`	`classes.insert(method_class);`
`82`	`81`	`}`
`83`	`82`	`}`
`84`		`-`
`85`		`- ClassRefCache::instance()->store(jni, classes);`
`86`	`83`	`}`
`87`	`84`
`88`	`85`
`@@ -163,10 +160,6 @@ Error ObjectSampler::start(Arguments& args) {`
`163`	`160`	`void ObjectSampler::stop() {`
`164`	`161`	`jvmtiEnv* jvmti = VM::jvmti();`
`165`	`162`	`jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_SAMPLED_OBJECT_ALLOC, NULL);`
`166`		`-`
`167`		`- if (_record_liveness) {`
`168`		`- LivenessTracker::instance()->stop();`
`169`		`- }`
`170`	`163`	`}`
`171`	`164`
`172`	`165`	`Error ObjectSampler::updateConfiguration(u64 events, double time_coefficient) {`