Reviewers: Mads Ager,

Description:
Merge r5416 into 2.3 branch.

Please review this at http://codereview.chromium.org/3310015/show

SVN Base: http://v8.googlecode.com/svn/branches/2.3/

Affected files:
  M     src/mark-compact.cc


Index: src/mark-compact.cc
===================================================================
--- src/mark-compact.cc (revision 5416)
+++ src/mark-compact.cc (working copy)
@@ -639,9 +639,13 @@
 #endif
   StaticMarkingVisitor::EnableCodeFlushing(true);

+ // Ensure that empty descriptor array is marked. Method MarkDescriptorArray
+  // relies on it being marked before any other descriptor array.
+  MarkObject(Heap::raw_unchecked_empty_descriptor_array());
+
   // Make sure we are not referencing the code from the stack.
   for (StackFrameIterator it; !it.done(); it.Advance()) {
-    MarkCompactCollector::MarkObject(it.frame()->unchecked_code());
+    MarkObject(it.frame()->unchecked_code());
   }

   // Iterate the archived stacks in all threads to check if
@@ -652,7 +656,7 @@
   SharedFunctionInfoMarkingVisitor visitor;
   CompilationCache::IterateFunctions(&visitor);

-  MarkCompactCollector::ProcessMarkingStack();
+  ProcessMarkingStack();
 }




--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to