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

Unified Diff: runtime/vm/stub_code_arm64.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/stub_code_arm.cc ('k') | runtime/vm/stub_code_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_arm64.cc
diff --git a/runtime/vm/stub_code_arm64.cc b/runtime/vm/stub_code_arm64.cc
index f125fe6b83101a0f25cbc30ed7e8cc6fec2fa1a5..1e3c78c7e08a8939c3e4db778b8b2c993052b78c 100644
--- a/runtime/vm/stub_code_arm64.cc
+++ b/runtime/vm/stub_code_arm64.cc
@@ -1949,11 +1949,12 @@ void StubCode::GenerateOptimizeFunctionStub(Assembler* assembler) {
__ Push(R6);
__ CallRuntime(kOptimizeInvokedFunctionRuntimeEntry, 1);
__ Pop(R0); // Discard argument.
- __ Pop(CODE_REG); // Get Code object
+ __ Pop(R0); // Get Function object
__ Pop(R4); // Restore argument descriptor.
- __ LoadFieldFromOffset(R0, CODE_REG, Code::entry_point_offset());
+ __ LoadFieldFromOffset(CODE_REG, R0, Function::code_offset());
+ __ LoadFieldFromOffset(R1, R0, Function::entry_point_offset());
__ LeaveStubFrame();
- __ br(R0);
+ __ br(R1);
__ brk(0);
}
« no previous file with comments | « runtime/vm/stub_code_arm.cc ('k') | runtime/vm/stub_code_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698