Changeset 140584 in webkit for trunk/Source/JavaScriptCore/yarr/YarrInterpreter.cpp

Timestamp:

Jan 23, 2013, 1:44:29 PM (12 years ago)

Author:

[email protected]

Message:

Replace numerous manual CRASH's in JSC with RELEASE_ASSERT
​https://bugs.webkit.org/show_bug.cgi?id=107726

Reviewed by Filip Pizlo.

Fairly manual change from if (foo) CRASH(); to RELEASE_ASSERT(!foo);

• assembler/MacroAssembler.h:

(JSC::MacroAssembler::branchAdd32):
(JSC::MacroAssembler::branchMul32):

• bytecode/CodeBlockHash.cpp:

(JSC::CodeBlockHash::CodeBlockHash):

• heap/BlockAllocator.h:

(JSC::Region::create):
(JSC::Region::createCustomSize):

• heap/GCAssertions.h:
• heap/HandleSet.cpp:

(JSC::HandleSet::visitStrongHandles):
(JSC::HandleSet::writeBarrier):

• heap/HandleSet.h:

(JSC::HandleSet::allocate):

• heap/Heap.cpp:

(JSC::Heap::collect):

• heap/SlotVisitor.cpp:

(JSC::SlotVisitor::validate):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::execute):

• jit/ExecutableAllocator.cpp:

(JSC::DemandExecutableAllocator::allocateNewSpace):
(JSC::ExecutableAllocator::allocate):

• jit/ExecutableAllocator.h:

(JSC::roundUpAllocationSize):

• jit/ExecutableAllocatorFixedVMPool.cpp:

(JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
(JSC::ExecutableAllocator::allocate):

• runtime/ButterflyInlines.h:

(JSC::Butterfly::createUninitialized):

• runtime/Completion.cpp:

(JSC::evaluate):

• runtime/JSArray.h:

(JSC::constructArray):

• runtime/JSGlobalObject.cpp:

(JSC::slowValidateCell):

• runtime/JSObject.cpp:

(JSC::JSObject::enterDictionaryIndexingModeWhenArrayStorageAlreadyExists):
(JSC::JSObject::createArrayStorage):

• tools/TieredMMapArray.h:

(JSC::TieredMMapArray::append):

• yarr/YarrInterpreter.cpp:

(JSC::Yarr::Interpreter::allocDisjunctionContext):
(JSC::Yarr::Interpreter::allocParenthesesDisjunctionContext):
(JSC::Yarr::Interpreter::InputStream::readChecked):
(JSC::Yarr::Interpreter::InputStream::uncheckInput):
(JSC::Yarr::Interpreter::InputStream::atEnd):
(JSC::Yarr::Interpreter::interpret):

File:

• trunk/Source/JavaScriptCore/yarr/YarrInterpreter.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/yarr/YarrInterpreter.cpp

@@ -112 +112 @@
         size_t size = sizeof(DisjunctionContext) - sizeof(uintptr_t) + disjunction->m_frameSize * sizeof(uintptr_t);
         allocatorPool = allocatorPool->ensureCapacity(size);
-        if (!allocatorPool)
-            CRASH();
+        RELEASE_ASSERT(allocatorPool);
         return new (allocatorPool->alloc(size)) DisjunctionContext();
     }
@@ -162 +161 @@
         size_t size = sizeof(ParenthesesDisjunctionContext) - sizeof(unsigned) + (term.atom.parenthesesDisjunction->m_numSubpatterns << 1) * sizeof(unsigned) + sizeof(DisjunctionContext) - sizeof(uintptr_t) + disjunction->m_frameSize * sizeof(uintptr_t);
         allocatorPool = allocatorPool->ensureCapacity(size);
-        if (!allocatorPool)
-            CRASH();
+        RELEASE_ASSERT(allocatorPool);
         return new (allocatorPool->alloc(size)) ParenthesesDisjunctionContext(output, term);
     }
@@ -208 +206 @@
         int readChecked(unsigned negativePositionOffest)
         {
-            if (pos < negativePositionOffest)
-                CRASH();
+            RELEASE_ASSERT(pos >= negativePositionOffest);
             unsigned p = pos - negativePositionOffest;
             ASSERT(p < length);
@@ -265 +262 @@
         void uncheckInput(unsigned count)
         {
-            if (pos < count)
-                CRASH();
+            RELEASE_ASSERT(pos >= count);
             pos -= count;
         }
@@ -277 +273 @@
         bool atEnd(unsigned negativePositionOffest)
         {
-            if (pos < negativePositionOffest)
-                CRASH();
+            RELEASE_ASSERT(pos >= negativePositionOffest);
             return (pos - negativePositionOffest) == length;
         }
@@ -1426 +1421 @@
 
         allocatorPool = pattern->m_allocator->startAllocator();
-        if (!allocatorPool)
-            CRASH();
+        RELEASE_ASSERT(allocatorPool);
 
         DisjunctionContext* context = allocDisjunctionContext(pattern->m_body.get());