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

Unified Diff: runtime/vm/assembler_arm.cc

Issue 1277883002: VM: Move calling convention-dependent code out of cc tests. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: More clean up Created 5 years, 4 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 | « no previous file | runtime/vm/assembler_arm64.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/assembler_arm.cc
diff --git a/runtime/vm/assembler_arm.cc b/runtime/vm/assembler_arm.cc
index bd2a6e711e80de722bd47958bc625c215e515b15..0fa2abd372541ffbf7c8ca397b52ca9100f263dc 100644
--- a/runtime/vm/assembler_arm.cc
+++ b/runtime/vm/assembler_arm.cc
@@ -3364,9 +3364,6 @@ void Assembler::EnterOsrFrame(intptr_t extra_size) {
void Assembler::LeaveDartFrame() {
- // LeaveDartFrame is called from stubs (pp disallowed) and from Dart code (pp
- // allowed), so there is no point in checking the current value of
- // constant_pool_allowed().
set_constant_pool_allowed(false);
LeaveFrame((1 << PP) | (1 << FP) | (1 << LR));
// Adjust SP for PC pushed in EnterDartFrame.
@@ -3387,10 +3384,7 @@ void Assembler::EnterStubFrame() {
void Assembler::LeaveStubFrame() {
- LeaveFrame((1 << PP) | (1 << FP) | (1 << LR));
- set_constant_pool_allowed(false);
- // Adjust SP for null PC pushed in EnterStubFrame.
- AddImmediate(SP, kWordSize);
+ LeaveDartFrame();
}
« no previous file with comments | « no previous file | runtime/vm/assembler_arm64.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698