Changeset 278369 in webkit for trunk/Source/JavaScriptCore/wasm/WasmTable.cpp

Timestamp:

Jun 2, 2021, 12:02:15 PM (4 years ago)

Author:

Chris Dumez

Message:

Drop Checked::safeGet()
​https://bugs.webkit.org/show_bug.cgi?id=226537

Reviewed by Geoffrey Garen.

Drop Checked::safeGet() and replace with uses of Checked::operator T() or Checked::value().
safeGet() is a bit akward, having both a return value and an out-parameter.

Source/JavaScriptCore:

• dfg/DFGAbstractInterpreterInlines.h:

(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):

• runtime/JSArray.cpp:

(JSC::JSArray::appendMemcpy):
(JSC::JSArray::unshiftCountWithAnyIndexingType):

• runtime/JSStringJoiner.cpp:

(JSC::JSStringJoiner::joinedLength const):

• wasm/WasmFormat.cpp:

(JSC::Wasm::Segment::create):

• wasm/WasmOperations.cpp:

(JSC::Wasm::JSC_DEFINE_JIT_OPERATION):

• wasm/WasmTable.cpp:

(JSC::Wasm::Table::grow):

Source/WebKit:

• UIProcess/mac/TextCheckerMac.mm:

(WebKit::TextChecker::updateSpellingUIWithGrammarString):

Source/WTF:

• wtf/CheckedArithmetic.h:

(WTF::Checked::value const):
(WTF::operator+):
(WTF::operator-):
(WTF::operator*):
(WTF::operator/):

Tools:

• TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp:

(TestWebKitAPI::CheckedArithmeticTester::run):

File:

• trunk/Source/JavaScriptCore/wasm/WasmTable.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/wasm/WasmTable.cpp

@@ -90 +90 @@
     CheckedUint32 newLengthChecked = length();
     newLengthChecked += delta;
-    uint32_t newLength;
-    if (newLengthChecked.safeGet(newLength) == CheckedState::DidOverflow)
-        return std::nullopt;
-
+    if (newLengthChecked.hasOverflowed())
+        return std::nullopt;
+
+    uint32_t newLength = newLengthChecked;
     if (maximum() && newLength > *maximum())
         return std::nullopt;
@@ -103 +103 @@
             CheckedUint32 reallocSizeChecked = allocatedLength(newLengthChecked);
             reallocSizeChecked *= sizeof(*container.get());
-            uint32_t reallocSize;
-            if (reallocSizeChecked.safeGet(reallocSize) == CheckedState::DidOverflow)
+            if (reallocSizeChecked.hasOverflowed())
                 return false;
             // FIXME this over-allocates and could be smarter about not committing all of that memory https://bugs.webkit.org/show_bug.cgi?id=181425
-            container.realloc(reallocSize);
+            container.realloc(reallocSizeChecked);
         }
         for (uint32_t i = m_length; i < allocatedLength(newLength); ++i) {