From c8a694ddbcda17fc90121d7e7985d90d3860a60c Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 17 Jan 2022 17:12:38 +0000 Subject: Reland "Use InitializeMethodsCode when we need to reinitialize a method entrypoint." This reverts commit b0f63c93e44bf53a34dda90c74b8725a932922da. Reason for revert: Fix For proxy init. Test: test.py Change-Id: I6b4796115d73a093f86309cec1f03cafd981c2e9 --- runtime/common_runtime_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/common_runtime_test.cc') diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index c8cd15115e..d7c77e8ffd 100644 --- a/runtime/common_runtime_test.cc +++ b/runtime/common_runtime_test.cc @@ -406,7 +406,7 @@ void CommonRuntimeTestImpl::SetUpRuntimeOptionsForFillHeap(RuntimeOptions *optio void CommonRuntimeTestImpl::MakeInterpreted(ObjPtr klass) { PointerSize pointer_size = class_linker_->GetImagePointerSize(); for (ArtMethod& method : klass->GetMethods(pointer_size)) { - class_linker_->SetEntryPointsToInterpreter(&method); + Runtime::Current()->GetInstrumentation()->InitializeMethodsCode(&method, /*aot_code=*/ nullptr); } } -- cgit v1.2.3-59-g8ed1b