Changeset 239427 in webkit for trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

Timestamp:

Dec 19, 2018, 8:41:11 PM (6 years ago)

Author:

Chris Dumez

Message:

wtf/Optional.h: move-constructor and move-assignment operator should disengage the value being moved from
​https://bugs.webkit.org/show_bug.cgi?id=192728
<rdar://problem/46746779>

Reviewed by Geoff Garen.

Source/JavaScriptCore:

• API/*:
• Scripts/*:
• assembler/*:
• b3/*:
• bytecode/*:
• bytecompiler/*:
• debugger/*:
• dfg/*:
• ftl/*:
• heap/*:
• inspector/*:
• jit/*:
• llint/*:
• parser/*:
• runtime/*:
• tools/*:
• wasm/*:
• yarr/*:

Source/WebCore:

• Modules/*:
• animation/*:
• bindings/*:
• crypto/*:
• css/*:
• dom/*:
• editing/*:
• fileapi/*:
• html/*:
• inspector/*:
• layout/*:
• loader/*:
• mathml/*:
• page/*:
• platform/*:
• plugins/*:
• rendering/*:
• testing/*:
• workers/*:
• xml/*:

Source/WebCore/PAL:

• pal/*:

Source/WebDriver:

• :

Source/WebKit:

• NetworkProcess/*:
• Platform/*:
• Scripts/*:
• Shared/*:
• UIProcess/*:
• WebProcess/*:

Source/WebKitLegacy/mac:

• DOM/*:
• Plugins/*:
• WebCoreSupport/*:
• WebView/*:

Source/WebKitLegacy/win:

• Plugins/*:
• WebCoreSupport/*:

Source/WTF:

Update optional's move-constructor and move-assignment operator to disengage the value being moved from.
Rename to optional to Optional, make_optional() to makeOptional(), and move class from std to WTF namespace.

Based on patch by David Kilzer.

• wtf/*:

Tools:

• DumpRenderTree/*:
• MiniBrowser/*:
• TestRunnerShared/*:
• TestWebKitAPI/*:
• WebGPUAPIStructure/*:
• WebKitTestRunner/*:

File:

• trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -695 +695 @@
     }
     if (const auto* identifier = node.name()) {
-        std::optional<uint32_t> optionalIndex = parseIndex(*identifier);
+        Optional<uint32_t> optionalIndex = parseIndex(*identifier);
         if (!optionalIndex) {
             generator.emitDirectPutById(newObj, *identifier, value.get(), node.putType());
@@ -2090 +2090 @@
 
     if (opcodeID == op_less || opcodeID == op_lesseq || opcodeID == op_greater || opcodeID == op_greatereq) {
-        auto isUInt32 = [&] (ExpressionNode* node) -> std::optional<UInt32Result> {
+        auto isUInt32 = [&] (ExpressionNode* node) -> Optional<UInt32Result> {
             if (node->isBinaryOpNode() && static_cast<BinaryOpNode*>(node)->opcodeID() == op_urshift)
                 return UInt32Result::UInt32;
@@ -2098 +2098 @@
                     return UInt32Result::Constant;
             }
-            return std::nullopt;
+            return WTF::nullopt;
         };
         auto leftResult = isUInt32(m_expr1);
@@ -4305 +4305 @@
             RefPtr<RegisterID> propertyName;
             if (!target.propertyExpression) {
-                std::optional<uint32_t> optionalIndex = parseIndex(target.propertyName);
+                Optional<uint32_t> optionalIndex = parseIndex(target.propertyName);
                 if (!optionalIndex)
                     generator.emitGetById(temp.get(), rhs, target.propertyName);