Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: runtime/vm/stub_code_arm.cc

Issue 2418673002: Fix unoptimized code calling a disabled code when --verify-on-transition is enabled. (Closed)
Patch Set: dbc Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/simulator_dbc.cc ('k') | runtime/vm/stub_code_arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_arm.cc
diff --git a/runtime/vm/stub_code_arm.cc b/runtime/vm/stub_code_arm.cc
index d9ff9560014c6b0d925b2ac8de7978a898920fc5..b7c23465296cde75cb83c95c314380d826312f60 100644
--- a/runtime/vm/stub_code_arm.cc
+++ b/runtime/vm/stub_code_arm.cc
@@ -1896,12 +1896,12 @@ void StubCode::GenerateOptimizeFunctionStub(Assembler* assembler) {
__ Push(R8);
__ CallRuntime(kOptimizeInvokedFunctionRuntimeEntry, 1);
__ Pop(R0); // Discard argument.
- __ Pop(R0); // Get Code object
+ __ Pop(R0); // Get Function object
__ Pop(R4); // Restore argument descriptor.
__ LeaveStubFrame();
- __ mov(CODE_REG, Operand(R0));
- __ ldr(R0, FieldAddress(R0, Code::entry_point_offset()));
- __ bx(R0);
+ __ ldr(CODE_REG, FieldAddress(R0, Function::code_offset()));
+ __ ldr(R1, FieldAddress(R0, Function::entry_point_offset()));
+ __ bx(R1);
__ bkpt(0);
}
« no previous file with comments | « runtime/vm/simulator_dbc.cc ('k') | runtime/vm/stub_code_arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698