Changeset 278253 in webkit for trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp

Timestamp:

May 30, 2021, 9:11:40 AM (4 years ago)

Author:

Darin Adler

Message:

Remove WTF::Optional synonym for std::optional, using that class template directly instead
​https://bugs.webkit.org/show_bug.cgi?id=226433

Reviewed by Chris Dumez.

Source/JavaScriptCore:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

• inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:

(ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload): Use auto instead
of Optional<>. Also use * instead of value() and nest the definition of the local inside an if
statement in the case where it's an optional.

• inspector/scripts/tests/expected/*: Regenerated these results.

Source/WebCore:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

Source/WebCore/PAL:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

Source/WebDriver:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

Source/WebKit:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

• Scripts/webkit/tests: Regenerated expected results, by running the command "python

Scripts/webkit/messages_unittest.py -r". (How am I supposed to know to do that?)

Source/WebKitLegacy/ios:

• WebCoreSupport/WebChromeClientIOS.h: Let the do-webcore-rename script rename

Optional<> to std::optional<>.

Source/WebKitLegacy/mac:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

Source/WebKitLegacy/win:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

Source/WTF:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

• wtf/Optional.h: Remove WTF::Optional.

Tools:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

File:

• trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp

@@ -309 +309 @@
     if (isTailDeleted()) {
         CodeBlock* codeBlock = m_shadowChickenFrame.codeBlock;
-        if (Optional<BytecodeIndex> bytecodeIndex = codeBlock->bytecodeIndexFromCallSiteIndex(m_shadowChickenFrame.callSiteIndex)) {
+        if (std::optional<BytecodeIndex> bytecodeIndex = codeBlock->bytecodeIndexFromCallSiteIndex(m_shadowChickenFrame.callSiteIndex)) {
             return TextPosition(OrdinalNumber::fromOneBasedInt(codeBlock->lineNumberForBytecodeIndex(*bytecodeIndex)),
                 OrdinalNumber::fromOneBasedInt(codeBlock->columnNumberForBytecodeIndex(*bytecodeIndex)));