Reviewers: Sven Panne, yurys, alph, jbramley,
Message:
PTAL
Description:
CpuProfiler: fix for CollectDeoptEvents test on arm
The same idea as it was in https://codereview.chromium.org/984893003/
BUG=chromium:452067
LOG=n
Please review this at https://codereview.chromium.org/997513003/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+25, -38 lines):
M src/arm/lithium-codegen-arm.cc
Index: src/arm/lithium-codegen-arm.cc
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
index
aa9bfc751487426ad58551a02ad909cc2ce9824f..263864ab2f3b57005007972a191a3b10bd98d2c7
100644
--- a/src/arm/lithium-codegen-arm.cc
+++ b/src/arm/lithium-codegen-arm.cc
@@ -346,54 +346,41 @@ bool LCodeGen::GenerateJumpTable() {
if (table_entry->needs_frame) {
DCHECK(!info()->saves_caller_doubles());
- if (needs_frame.is_bound()) {
- __ b(&needs_frame);
- } else {
- __ bind(&needs_frame);
- Comment(";;; call deopt with frame");
- __ PushFixedFrame();
- // This variant of deopt can only be used with stubs. Since we
don't
- // have a function pointer to install in the stack frame that
we're
- // building, install a special marker there instead.
- DCHECK(info()->IsStub());
- __ mov(ip, Operand(Smi::FromInt(StackFrame::STUB)));
- __ push(ip);
- __ add(fp, sp,
- Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
- __ bind(&call_deopt_entry);
- // Add the base address to the offset previously loaded in
- // entry_offset.
- __ add(entry_offset, entry_offset,
- Operand(ExternalReference::ForDeoptEntry(base)));
- __ blx(entry_offset);
- }
-
+ Comment(";;; call deopt with frame");
+ __ PushFixedFrame();
+ __ bl(&needs_frame);
masm()->CheckConstPool(false, false);
} else {
- // The last entry can fall through into `call_deopt_entry`,
avoiding a
- // branch.
- bool need_branch = ((i + 1) != length) ||
call_deopt_entry.is_bound();
-
- if (need_branch) __ b(&call_deopt_entry);
+ __ bl(&call_deopt_entry);
+ bool need_branch = ((i + 1) != length);
masm()->CheckConstPool(false, !need_branch);
}
}
- if (!call_deopt_entry.is_bound()) {
- Comment(";;; call deopt");
- __ bind(&call_deopt_entry);
+ if (needs_frame.is_linked()) {
+ __ bind(&needs_frame);
+ // This variant of deopt can only be used with stubs. Since we don't
+ // have a function pointer to install in the stack frame that we're
+ // building, install a special marker there instead.
+ DCHECK(info()->IsStub());
+ __ mov(ip, Operand(Smi::FromInt(StackFrame::STUB)));
+ __ push(ip);
+ __ add(fp, sp,
Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
+ }
- if (info()->saves_caller_doubles()) {
- DCHECK(info()->IsStub());
- RestoreCallerDoubles();
- }
+ Comment(";;; call deopt");
+ __ bind(&call_deopt_entry);
- // Add the base address to the offset previously loaded in
entry_offset.
- __ add(entry_offset, entry_offset,
- Operand(ExternalReference::ForDeoptEntry(base)));
- __ blx(entry_offset);
+ if (info()->saves_caller_doubles()) {
+ DCHECK(info()->IsStub());
+ RestoreCallerDoubles();
}
+
+ // Add the base address to the offset previously loaded in
entry_offset.
+ __ add(entry_offset, entry_offset,
+ Operand(ExternalReference::ForDeoptEntry(base)));
+ __ bx(entry_offset);
}
// Force constant pool emission at the end of the deopt jump table to
make
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
