Reviewers: rmcilroy, Rodolph Perfetta (ARM),
Description:
[arm] Don't call BlockConstPoolFor within a BlockConstPoolScope.
This basically means that we must not use the b(Label*) version here,
but the b(int) version instead to jump over the constant pool.
BUG=v8:4292
LOG=y
Please review this at https://codereview.chromium.org/1224243002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+1, -8 lines):
M src/arm/assembler-arm.cc
Index: src/arm/assembler-arm.cc
diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc
index
72786597f0ecfc7b2236dabd055dc9d24e548d70..96bdf79facedebfecd39c57e2cda0668f1f7c006
100644
--- a/src/arm/assembler-arm.cc
+++ b/src/arm/assembler-arm.cc
@@ -3838,10 +3838,7 @@ void Assembler::CheckConstPool(bool force_emit, bool
require_jump) {
bind(&size_check);
// Emit jump over constant pool if necessary.
- Label after_pool;
- if (require_jump) {
- b(&after_pool);
- }
+ if (require_jump) b(size - kPcLoadDelta);
// Put down constant pool marker "Undefined instruction".
// The data size helps disassembly know what to print.
@@ -3925,10 +3922,6 @@ void Assembler::CheckConstPool(bool force_emit, bool
require_jump) {
RecordComment("]");
DCHECK_EQ(size, SizeOfCodeGeneratedSince(&size_check));
-
- if (after_pool.is_linked()) {
- bind(&after_pool);
- }
}
// Since a constant pool was just emitted, move the check offset forward
by
--
--
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.
