JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / heap / ConservativeRoots.cpp

diff --git a/heap/ConservativeRoots.cpp b/heap/ConservativeRoots.cpp
index 752ce277502172727173fe1dc4f92c9081ea0c5b..f00b2fbc7e7c73d3c225f6e76e887841cee576b8 100644 (file)
--- a/heap/ConservativeRoots.cpp
+++ b/heap/ConservativeRoots.cpp
@@ -27,11 +27,12 @@
 #include "ConservativeRoots.h"
 
 #include "CodeBlock.h"
 #include "ConservativeRoots.h"
 
 #include "CodeBlock.h"

+#include "CodeBlockSet.h"

 #include "CopiedSpace.h"
 #include "CopiedSpaceInlines.h"
 #include "CopiedSpace.h"
 #include "CopiedSpaceInlines.h"

-#include "DFGCodeBlocks.h"

 #include "JSCell.h"
 #include "JSObject.h"
 #include "JSCell.h"
 #include "JSObject.h"

+#include "JSCInlines.h"

 #include "Structure.h"
 
 namespace JSC {
 #include "Structure.h"
 
 namespace JSC {


@@ -93,10 +94,14 @@ inline void ConservativeRoots::genericAddPointer(void* p, TinyBloomFilter filter
 template<typename MarkHook>
 void ConservativeRoots::genericAddSpan(void* begin, void* end, MarkHook& markHook)
 {
 template<typename MarkHook>
 void ConservativeRoots::genericAddSpan(void* begin, void* end, MarkHook& markHook)
 {

-    ASSERT(begin <= end);
-    ASSERT((static_cast<char*>(end) - static_cast<char*>(begin)) < 0x1000000);
-    ASSERT(isPointerAligned(begin));
-    ASSERT(isPointerAligned(end));
+    if (begin > end) {
+        void* swapTemp = begin;
+        begin = end;
+        end = swapTemp;
+    }
+
+    RELEASE_ASSERT(isPointerAligned(begin));
+    RELEASE_ASSERT(isPointerAligned(end));

 
     TinyBloomFilter filter = m_blocks->filter(); // Make a local copy of filter to show the compiler it won't alias, and can be register-allocated.
     for (char** it = static_cast<char**>(begin); it != static_cast<char**>(end); ++it)
 
     TinyBloomFilter filter = m_blocks->filter(); // Make a local copy of filter to show the compiler it won't alias, and can be register-allocated.
     for (char** it = static_cast<char**>(begin); it != static_cast<char**>(end); ++it)


@@ -140,10 +145,9 @@ private:
 };
 
 void ConservativeRoots::add(
 };
 
 void ConservativeRoots::add(

-    void* begin, void* end, JITStubRoutineSet& jitStubRoutines, DFGCodeBlocks& dfgCodeBlocks)
+    void* begin, void* end, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks)

 {
 {

-    CompositeMarkHook<JITStubRoutineSet, DFGCodeBlocks> markHook(
-        jitStubRoutines, dfgCodeBlocks);
+    CompositeMarkHook<JITStubRoutineSet, CodeBlockSet> markHook(jitStubRoutines, codeBlocks);

     genericAddSpan(begin, end, markHook);
 }
 
     genericAddSpan(begin, end, markHook);
 }