Revert "Declare to heap that switching from zygote to its child in test 2031"
This reverts commit 80eeb4f3a06431e66b15950498487f68f7c6ded1.
Reason for revert: In local testing realized that ScopedSuspendAll doesn't like doing a GC (as part of heap->PreZygoteFork()) before. Reverting to solidify the logic.
Change-Id: I682bec08cb7c30e20016348904eb44156d1864d6
diff --git a/test/2031-zygote-compiled-frame-deopt/native-wait.cc b/test/2031-zygote-compiled-frame-deopt/native-wait.cc
index c256d59..1c8af24 100644
--- a/test/2031-zygote-compiled-frame-deopt/native-wait.cc
+++ b/test/2031-zygote-compiled-frame-deopt/native-wait.cc
@@ -40,7 +40,6 @@
if (has_jit) {
runtime->GetJit()->PreZygoteFork();
}
- runtime->GetHeap()->PreZygoteFork();
runtime->SetAsZygoteChild(/*is_system_server=*/false, /*is_zygote=*/false);
runtime->AddCompilerOption("--debuggable");
runtime->SetRuntimeDebugState(Runtime::RuntimeDebugState::kJavaDebuggableAtInit);
@@ -56,7 +55,6 @@
// We have "zygote" code that isn't really part of the BCP. just don't collect it.
runtime->GetJitCodeCache()->SetGarbageCollectCode(false);
}
- runtime->GetHeap()->PostForkChildAction(Thread::Current());
}
extern "C" JNIEXPORT void JNICALL Java_art_Test2031_setupJvmti(JNIEnv* env,