Changeset 278253 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.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/bytecode/CodeBlock.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -2059 +2059 @@
 }
 
-bool CodeBlock::hasOpDebugForLineAndColumn(unsigned line, Optional<unsigned> column)
+bool CodeBlock::hasOpDebugForLineAndColumn(unsigned line, std::optional<unsigned> column)
 {
     const InstructionStream& instructionStream = instructions();
@@ -3446 +3446 @@
 }
 
-Optional<CodeOrigin> CodeBlock::findPC(void* pc)
+std::optional<CodeOrigin> CodeBlock::findPC(void* pc)
 {
     {
@@ -3452 +3452 @@
         if (auto* jitData = m_jitData.get()) {
             if (jitData->m_pcToCodeOriginMap) {
-                if (Optional<CodeOrigin> codeOrigin = jitData->m_pcToCodeOriginMap->findPC(pc))
+                if (std::optional<CodeOrigin> codeOrigin = jitData->m_pcToCodeOriginMap->findPC(pc))
                     return codeOrigin;
             }
@@ -3458 +3458 @@
             for (StructureStubInfo* stubInfo : jitData->m_stubInfos) {
                 if (stubInfo->containsPC(pc))
-                    return Optional<CodeOrigin>(stubInfo->codeOrigin);
+                    return std::optional<CodeOrigin>(stubInfo->codeOrigin);
             }
         }
     }
 
-    if (Optional<CodeOrigin> codeOrigin = m_jitCode->findPC(this, pc))
+    if (std::optional<CodeOrigin> codeOrigin = m_jitCode->findPC(this, pc))
         return codeOrigin;
 
@@ -3470 +3470 @@
 #endif // ENABLE(JIT)
 
-Optional<BytecodeIndex> CodeBlock::bytecodeIndexFromCallSiteIndex(CallSiteIndex callSiteIndex)
-{
-    Optional<BytecodeIndex> bytecodeIndex;
+std::optional<BytecodeIndex> CodeBlock::bytecodeIndexFromCallSiteIndex(CallSiteIndex callSiteIndex)
+{
+    std::optional<BytecodeIndex> bytecodeIndex;
     JITType jitType = this->jitType();
     if (jitType == JITType::InterpreterThunk || jitType == JITType::BaselineJIT)