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

trunk/Source/JavaScriptCore/jsc.cpp

@@ -709 +709 @@
 }
 
-static std::optional<DirectoryName> extractDirectoryName(const String& absolutePathToFile)
+static Optional<DirectoryName> extractDirectoryName(const String& absolutePathToFile)
 {
     size_t firstSeparatorPosition = absolutePathToFile.find(pathSeparator());
     if (firstSeparatorPosition == notFound)
-        return std::nullopt;
+        return WTF::nullopt;
     DirectoryName directoryName;
     directoryName.rootName = absolutePathToFile.substring(0, firstSeparatorPosition + 1); // Include the separator.
@@ -728 +728 @@
 }
 
-static std::optional<DirectoryName> currentWorkingDirectory()
+static Optional<DirectoryName> currentWorkingDirectory()
 {
 #if OS(WINDOWS)
@@ -742 +742 @@
     DWORD bufferLength = ::GetCurrentDirectoryW(0, nullptr);
     if (!bufferLength)
-        return std::nullopt;
+        return WTF::nullopt;
     // In Windows, wchar_t is the UTF-16LE.
     // https://msdn.microsoft.com/en-us/library/dd374081.aspx
@@ -751 +751 @@
     // We don't support network path like \\host\share\<path name>.
     if (directoryString.startsWith("\\\\"))
-        return std::nullopt;
+        return WTF::nullopt;
 #else
     Vector<char> buffer(PATH_MAX);
     if (!getcwd(buffer.data(), PATH_MAX))
-        return std::nullopt;
+        return WTF::nullopt;
     String directoryString = String::fromUTF8(buffer.data());
 #endif
     if (directoryString.isEmpty())
-        return std::nullopt;
+        return WTF::nullopt;
 
     if (directoryString[directoryString.length() - 1] == pathSeparator())
@@ -2483 +2483 @@
     auto scope = DECLARE_CATCH_SCOPE(vm);
 
-    std::optional<DirectoryName> directoryName = currentWorkingDirectory();
+    Optional<DirectoryName> directoryName = currentWorkingDirectory();
     if (!directoryName)
         return;