Revision: 20130
Author: [email protected]
Date: Thu Mar 20 15:23:31 2014 UTC
Log: Fix assertions wrt concurrent OSR.
[email protected]
Review URL: https://codereview.chromium.org/206473002
http://code.google.com/p/v8/source/detail?r=20130
Modified:
/branches/bleeding_edge/src/a64/full-codegen-a64.cc
/branches/bleeding_edge/test/mjsunit/assert-opt-and-deopt.js
/branches/bleeding_edge/test/mjsunit/regress/regress-prepare-break-while-recompile.js
=======================================
--- /branches/bleeding_edge/src/a64/full-codegen-a64.cc Thu Mar 20 10:37:19
2014 UTC
+++ /branches/bleeding_edge/src/a64/full-codegen-a64.cc Thu Mar 20 15:23:31
2014 UTC
@@ -4859,6 +4859,12 @@
Address branch_address = pc - 3 * kInstructionSize;
PatchingAssembler patcher(branch_address, 1);
+ ASSERT(Instruction::Cast(branch_address)
+ ->IsNop(Assembler::INTERRUPT_CODE_NOP) ||
+ (Instruction::Cast(branch_address)->IsCondBranchImm() &&
+ Instruction::Cast(branch_address)->ImmPCOffset() ==
+ 6 * kInstructionSize));
+
switch (target_state) {
case INTERRUPT:
// <decrement profiling counter>
@@ -4868,8 +4874,6 @@
// ... more instructions.
// ok-label
// Jump offset is 6 instructions.
- ASSERT(Instruction::Cast(branch_address)
- ->IsNop(Assembler::INTERRUPT_CODE_NOP));
patcher.b(6, pl);
break;
case ON_STACK_REPLACEMENT:
@@ -4878,9 +4882,6 @@
// .. .. .. .. mov x0, x0 (NOP)
// .. .. .. .. ldr x16, pc+<on-stack replacement address>
// .. .. .. .. blr x16
- ASSERT(Instruction::Cast(branch_address)->IsCondBranchImm());
- ASSERT(Instruction::Cast(branch_address)->ImmPCOffset() ==
- 6 * kInstructionSize);
patcher.nop(Assembler::INTERRUPT_CODE_NOP);
break;
}
=======================================
--- /branches/bleeding_edge/test/mjsunit/assert-opt-and-deopt.js Thu Aug 22
16:14:37 2013 UTC
+++ /branches/bleeding_edge/test/mjsunit/assert-opt-and-deopt.js Thu Mar 20
15:23:31 2014 UTC
@@ -25,7 +25,8 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --allow-natives-syntax --noconcurrent-recompilation
+// Flags: --allow-natives-syntax
+// Flags: --noconcurrent-recompilation --noconcurrent-osr
if (%IsConcurrentRecompilationSupported()) {
print("Concurrent recompilation is turned on after all. Skipping this
test.");
=======================================
---
/branches/bleeding_edge/test/mjsunit/regress/regress-prepare-break-while-recompile.js
Mon Oct 14 14:15:22 2013 UTC
+++
/branches/bleeding_edge/test/mjsunit/regress/regress-prepare-break-while-recompile.js
Thu Mar 20 15:23:31 2014 UTC
@@ -26,7 +26,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Flags: --expose-debug-as debug --allow-natives-syntax
-// Flags: --block-concurrent-recompilation
+// Flags: --concurrent-recompilation --block-concurrent-recompilation
if (!%IsConcurrentRecompilationSupported()) {
print("Concurrent recompilation is disabled. Skipping this test.");
--
--
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.
