Reviewers: ulan,
Description:
Fix assertions wrt concurrent OSR.
[email protected]
Please review this at https://codereview.chromium.org/206473002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+3, -7 lines):
M src/a64/full-codegen-a64.cc
M test/mjsunit/assert-opt-and-deopt.js
M test/mjsunit/regress/regress-prepare-break-while-recompile.js
Index: src/a64/full-codegen-a64.cc
diff --git a/src/a64/full-codegen-a64.cc b/src/a64/full-codegen-a64.cc
index
c95a01add5c2227560e431be9ac7378ef98b99da..935f74f4ef429a78aaf36ce332e262ef231dc5a8
100644
--- a/src/a64/full-codegen-a64.cc
+++ b/src/a64/full-codegen-a64.cc
@@ -4868,8 +4868,6 @@ void BackEdgeTable::PatchAt(Code* unoptimized_code,
// ... 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 +4876,6 @@ void BackEdgeTable::PatchAt(Code* unoptimized_code,
// .. .. .. .. 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;
}
Index: test/mjsunit/assert-opt-and-deopt.js
diff --git a/test/mjsunit/assert-opt-and-deopt.js
b/test/mjsunit/assert-opt-and-deopt.js
index
d653bb5905f5a47f9a482e272929fd6c8f386959..d0caafa27cd140f8b649112395057224f70f638f
100644
--- a/test/mjsunit/assert-opt-and-deopt.js
+++ b/test/mjsunit/assert-opt-and-deopt.js
@@ -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.");
Index: test/mjsunit/regress/regress-prepare-break-while-recompile.js
diff --git a/test/mjsunit/regress/regress-prepare-break-while-recompile.js
b/test/mjsunit/regress/regress-prepare-break-while-recompile.js
index
a9c20ec844b69750169422b0b55b4e649cc7dcee..0aedcab015426fb51d39a4f9e6f59bc9dcc5a93d
100644
--- a/test/mjsunit/regress/regress-prepare-break-while-recompile.js
+++ b/test/mjsunit/regress/regress-prepare-break-while-recompile.js
@@ -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.
