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

Unified Diff: src/x64/codegen-x64.cc

Issue 228643002: Make new space iterable when transitioning double array to objects (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Replace Smi(0) with one-map-filler Created 6 years, 8 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 | « src/ia32/codegen-ia32.cc ('k') | test/mjsunit/regress/regress-transition-elements-heap-verification.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/x64/codegen-x64.cc
diff --git a/src/x64/codegen-x64.cc b/src/x64/codegen-x64.cc
index afcf58171b49ee4010a756707668f703000969e1..3393982606580fa31c55125c830a8f4893ea633d 100644
--- a/src/x64/codegen-x64.cc
+++ b/src/x64/codegen-x64.cc
@@ -369,7 +369,7 @@ void ElementsTransitionGenerator::GenerateDoubleToObject(
// -- rdx : receiver
// -- rsp[0] : return address
// -----------------------------------
- Label loop, entry, convert_hole, gc_required, only_change_map;
+ Label loop, entry, convert_hole, gc_required, gc_cleanup, only_change_map;
if (mode == TRACK_ALLOCATION_SITE) {
__ JumpIfJSArrayHasAllocationMemento(rdx, rdi, fail);
@@ -402,6 +402,19 @@ void ElementsTransitionGenerator::GenerateDoubleToObject(
// rdi: pointer to the-hole
__ jmp(&entry);
+ __ bind(&gc_cleanup);
+#ifdef VERIFY_HEAP
+ // Make sure new space is iterable if we are verifying the heap.
+ __ Move(rax, masm->isolate()->factory()->one_pointer_filler_map());
+ __ movp(FieldOperand(r11,
+ r9,
+ times_pointer_size,
+ FixedArray::kHeaderSize),
+ rax);
+ __ decp(r9);
+ __ j(not_sign, &gc_cleanup);
+#endif
+
// Call into runtime if GC is required.
__ bind(&gc_required);
__ Pop(rax);
@@ -420,7 +433,7 @@ void ElementsTransitionGenerator::GenerateDoubleToObject(
__ j(equal, &convert_hole);
// Non-hole double, copy value into a heap number.
- __ AllocateHeapNumber(rax, r15, &gc_required);
+ __ AllocateHeapNumber(rax, r15, &gc_cleanup);
// rax: new heap number
__ movq(FieldOperand(rax, HeapNumber::kValueOffset), r14);
__ movp(FieldOperand(r11,
« no previous file with comments | « src/ia32/codegen-ia32.cc ('k') | test/mjsunit/regress/regress-transition-elements-heap-verification.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698