Changeset 246610 in webkit

Timestamp:

Jun 19, 2019 2:29:48 PM (5 years ago)

Author:

Tadeu Zagallo

Message:

Some of the ASSERTs in CachedTypes.cpp should be RELEASE_ASSERTs
​https://bugs.webkit.org/show_bug.cgi?id=199030

Reviewed by Mark Lam.

These assertions represent strong assumptions that the cache makes so
it's not safe to keep executing if they fail.

• runtime/CachedTypes.cpp:

(JSC::Encoder::malloc):
(JSC::Encoder::Page::alignEnd):
(JSC::Decoder::ptrForOffsetFromBase):
(JSC::Decoder::handleForEnvironment const):
(JSC::Decoder::setHandleForEnvironment):
(JSC::CachedPtr::get const):
(JSC::CachedOptional::encode):
(JSC::CachedOptional::decodeAsPtr const): Deleted.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/CachedTypes.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-06-19  Tadeu Zagallo  <tzagallo@apple.com>
+
+        Some of the ASSERTs in CachedTypes.cpp should be RELEASE_ASSERTs
+        https://bugs.webkit.org/show_bug.cgi?id=199030
+
+        Reviewed by Mark Lam.
+
+        These assertions represent strong assumptions that the cache makes so
+        it's not safe to keep executing if they fail.
+
+        * runtime/CachedTypes.cpp:
+        (JSC::Encoder::malloc):
+        (JSC::Encoder::Page::alignEnd):
+        (JSC::Decoder::ptrForOffsetFromBase):
+        (JSC::Decoder::handleForEnvironment const):
+        (JSC::Decoder::setHandleForEnvironment):
+        (JSC::CachedPtr::get const):
+        (JSC::CachedOptional::encode):
+        (JSC::CachedOptional::decodeAsPtr const): Deleted.
+
 2019-06-19  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/JavaScriptCore/runtime/CachedTypes.cpp

@@ -102 +102 @@
     Allocation malloc(unsigned size)
     {
-        ASSERT(size);
+        RELEASE_ASSERT(size);
         ptrdiff_t offset;
         if (m_currentPage->malloc(size, offset))
@@ -245 +245 @@
             if (size == m_offset)
                 return;
-            ASSERT(static_cast<size_t>(size) <= m_capacity);
+            RELEASE_ASSERT(static_cast<size_t>(size) <= m_capacity);
             m_offset = size;
         }
@@ -324 +324 @@
 const void* Decoder::ptrForOffsetFromBase(ptrdiff_t offset)
 {
-#ifndef NDEBUG
     ASSERT(offset > 0 && static_cast<size_t>(offset) < m_cachedBytecode->size());
-#endif
     return m_cachedBytecode->data() + offset;
 }
@@ -333 +331 @@
 {
     auto it = m_environmentToHandleMap.find(environment);
-    ASSERT(it != m_environmentToHandleMap.end());
+    RELEASE_ASSERT(it != m_environmentToHandleMap.end());
     return it->value;
 }
@@ -340 +338 @@
 {
     auto addResult = m_environmentToHandleMap.add(environment, handle);
-    ASSERT_UNUSED(addResult, addResult.isNewEntry);
+    RELEASE_ASSERT(addResult.isNewEntry);
 }
 
@@ -526 +524 @@
     const T* get() const
     {
-        if (this->isEmpty())
-            return nullptr;
+        RELEASE_ASSERT(!this->isEmpty());
         return this->template buffer<T>();
     }
@@ -824 +821 @@
         else
             encode(encoder, { *source });
-    }
-
-    SourceType<T>* decodeAsPtr(Decoder& decoder) const
-    {
-        if (this->isEmpty())
-            return nullptr;
-
-        return this->template buffer<T>()->decode(decoder);
     }
 };