From b52df537b8ade1bfe936a27f4bf0ae8a2cdfc9b4 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 9 Apr 2019 14:10:59 -0700 Subject: Revert^2 "Remove support for moving GC collector transitions" Fixed incorrect LOG(FATAL) for no-op collector transitions. Bug: 78286368 Bug: 130236304 Test: booting This reverts commit 8f88207206fe39f6dcb4e76e24716c81566f26cc. Change-Id: I565124330478fad9fb50fe1caf9442ec05f13a46 --- test/1337-gc-coverage/gc_coverage.cc | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'test/1337-gc-coverage/gc_coverage.cc') diff --git a/test/1337-gc-coverage/gc_coverage.cc b/test/1337-gc-coverage/gc_coverage.cc index ac959f68e8..eb8ec0e0ca 100644 --- a/test/1337-gc-coverage/gc_coverage.cc +++ b/test/1337-gc-coverage/gc_coverage.cc @@ -46,19 +46,5 @@ extern "C" JNIEXPORT jlong JNICALL Java_Main_objectAddress(JNIEnv* env, jclass, return reinterpret_cast(soa.Decode(object).Ptr()); } -extern "C" JNIEXPORT jboolean JNICALL Java_Main_supportCollectorTransition(JNIEnv*, jclass) { - // Same as supportHomogeneousSpaceCompact for now. - return Runtime::Current()->GetHeap()->SupportHomogeneousSpaceCompactAndCollectorTransitions() ? - JNI_TRUE : JNI_FALSE; -} - -extern "C" JNIEXPORT void JNICALL Java_Main_transitionToSS(JNIEnv*, jclass) { - Runtime::Current()->GetHeap()->TransitionCollector(gc::kCollectorTypeSS); -} - -extern "C" JNIEXPORT void JNICALL Java_Main_transitionToCMS(JNIEnv*, jclass) { - Runtime::Current()->GetHeap()->TransitionCollector(gc::kCollectorTypeCMS); -} - } // namespace } // namespace art -- cgit v1.2.3-59-g8ed1b