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

Unified Diff: runtime/vm/instructions_arm.cc

Issue 1355953002: Fix lazy deoptimization from deferred code. (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: speed up ia32 disassembler Created 5 years, 3 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/instructions_arm.h ('k') | runtime/vm/instructions_arm64.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/instructions_arm.cc
diff --git a/runtime/vm/instructions_arm.cc b/runtime/vm/instructions_arm.cc
index 1533a20391accad78729da4d64c6158abb1e0f21..eec6cfe364b93941850e62d2e2decda91b765c6e 100644
--- a/runtime/vm/instructions_arm.cc
+++ b/runtime/vm/instructions_arm.cc
@@ -32,16 +32,20 @@ CallPattern::CallPattern(uword pc, const Code& code)
}
-int CallPattern::DeoptCallPatternLengthInBytes() {
+int CallPattern::DeoptCallPatternLengthInInstructions() {
const ARMVersion version = TargetCPUFeatures::arm_version();
if ((version == ARMv5TE) || (version == ARMv6)) {
- return 5 * Instr::kInstrSize;
+ return 5;
} else {
ASSERT(version == ARMv7);
- return 3 * Instr::kInstrSize;
+ return 3;
}
}
+int CallPattern::DeoptCallPatternLengthInBytes() {
+ return DeoptCallPatternLengthInInstructions() * Instr::kInstrSize;
+}
+
NativeCallPattern::NativeCallPattern(uword pc, const Code& code)
: object_pool_(ObjectPool::Handle(code.GetObjectPool())),
« no previous file with comments | « runtime/vm/instructions_arm.h ('k') | runtime/vm/instructions_arm64.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698