Changeset 278253 in webkit for trunk/Source/JavaScriptCore/dfg/DFGJITCode.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/dfg/DFGJITCode.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGJITCode.cpp

@@ -72 +72 @@
 }
 
-void JITCode::reconstruct(CallFrame* callFrame, CodeBlock* codeBlock, CodeOrigin codeOrigin, unsigned streamIndex, Operands<Optional<JSValue>>& result)
+void JITCode::reconstruct(CallFrame* callFrame, CodeBlock* codeBlock, CodeOrigin codeOrigin, unsigned streamIndex, Operands<std::optional<JSValue>>& result)
 {
     Operands<ValueRecovery> recoveries;
     reconstruct(codeBlock, codeOrigin, streamIndex, recoveries);
     
-    result = Operands<Optional<JSValue>>(OperandsLike, recoveries);
+    result = Operands<std::optional<JSValue>>(OperandsLike, recoveries);
     for (size_t i = result.size(); i--;)
         result[i] = recoveries[i].recover(callFrame);
@@ -225 +225 @@
 }
 
-Optional<CodeOrigin> JITCode::findPC(CodeBlock*, void* pc)
+std::optional<CodeOrigin> JITCode::findPC(CodeBlock*, void* pc)
 {
     for (OSRExit& exit : m_osrExit) {
         if (ExecutableMemoryHandle* handle = exit.m_code.executableMemory()) {
             if (handle->start().untaggedPtr() <= pc && pc < handle->end().untaggedPtr())
-                return Optional<CodeOrigin>(exit.m_codeOriginForExitProfile);
+                return std::optional<CodeOrigin>(exit.m_codeOriginForExitProfile);
         }
     }