Attachment 371340 Details for Bug 198544 – Patch

[patch] Patch

bug-198544-20190604165038.patch (text/plain), 8.28 KB, created by Michael Catanzaro on 2019-06-04 14:50:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-06-04 14:50:39 PDT

Size: 8.28 KB

patch

obsolete

>Subversion Revision: 246036
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 3c0c9187a00d94e0346c8b7ff9441b173ed31fa8..1492ad62757b4ec6f4055876df78ac951adf16f1 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-04  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fix miscellaneous build warnings
>+        https://bugs.webkit.org/show_bug.cgi?id=198544
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Silence -Wclass-memaccess warning in this dangerous code.
>+
>+        * wasm/WasmInstance.cpp:
>+        (JSC::Wasm::Instance::Instance):
>+
> 2019-06-03  Darin Adler  <darin@apple.com>
> 
>         Finish cleanup of String::number for floating point
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2ef15e27d6e40ce80d17a9fbd5e442ccf75c3024..e50c7e6dea67d033fedd4808e88ae287e3272662 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-06-04  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fix miscellaneous build warnings
>+        https://bugs.webkit.org/show_bug.cgi?id=198544
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Carefully silence -Wsign-compare warnings.
>+
>+        * contentextensions/DFABytecodeCompiler.cpp:
>+        (WebCore::ContentExtensions::DFABytecodeCompiler::compile):
>+        * inspector/InspectorCanvas.cpp:
>+        (WebCore::InspectorCanvas::indexForData):
>+        * xml/XSLStyleSheetLibxslt.cpp:
>+        (WebCore::XSLStyleSheet::parseString):
>+
> 2019-06-03  Zan Dobersek  <zdobersek@igalia.com>
> 
>         [Nicosia] Disable async scrolling until implemented
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 3638a0682ed018fabaabb5c75b40302d57e2d0e6..78468dbb40fd4de61810d0b8bb30788abbc20cc8 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-04  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fix miscellaneous build warnings
>+        https://bugs.webkit.org/show_bug.cgi?id=198544
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Carefully silence -Wsign-compare warnings.
>+
>+        * NetworkProcess/cache/NetworkCacheData.cpp:
>+        (WebKit::NetworkCache::readOrMakeSalt):
>+
> 2019-06-03  Darin Adler  <darin@apple.com>
> 
>         Finish cleanup of String::number for floating point
>diff --git a/Source/JavaScriptCore/wasm/WasmInstance.cpp b/Source/JavaScriptCore/wasm/WasmInstance.cpp
>index a5e0fcd83d5b23d395dcbe976c4d6d58a2ecebd1..37059968e0b7854d27336f1937ec258a370b4966 100644
>--- a/Source/JavaScriptCore/wasm/WasmInstance.cpp
>+++ b/Source/JavaScriptCore/wasm/WasmInstance.cpp
>@@ -55,7 +55,7 @@ Instance::Instance(Context* context, Ref<Module>&& module, EntryFrame** pointerT
> {
>     for (unsigned i = 0; i < m_numImportFunctions; ++i)
>         new (importFunctionInfo(i)) ImportFunctionInfo();
>-    memset(m_globals.get(), 0, globalMemoryByteSize(m_module.get()));
>+    memset(static_cast<void*>(m_globals.get()), 0, globalMemoryByteSize(m_module.get()));
>     for (unsigned i = 0; i < m_module->moduleInformation().globals.size(); ++i) {
>         if (m_module.get().moduleInformation().globals[i].type == Anyref)
>             m_globalsToMark.set(i);
>diff --git a/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp b/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp
>index c961051c092c55bd13632a4c9dcca4af6d5fb6a8..2b04b22b01e114eb6a939aa0eaa2c532095cfd06 100644
>--- a/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp
>+++ b/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp
>@@ -461,7 +461,7 @@ void DFABytecodeCompiler::compile()
>     // Link.
>     for (const auto& linkRecord : m_linkRecords) {
>         uint32_t destination = m_nodeStartOffsets[linkRecord.destinationNodeIndex];
>-        RELEASE_ASSERT(destination < std::numeric_limits<int32_t>::max());
>+        RELEASE_ASSERT(destination < static_cast<uint32_t>(std::numeric_limits<int32_t>::max()));
>         int32_t distance = destination - linkRecord.instructionLocation;
>         ASSERT(abs(distance) <= abs(linkRecord.longestPossibleJump));
>         
>diff --git a/Source/WebCore/inspector/InspectorCanvas.cpp b/Source/WebCore/inspector/InspectorCanvas.cpp
>index 87827535551b138642a4c3cbbe592428901f6452..4b22d5d2796e9856f55d69f00c15f021eae3278f 100644
>--- a/Source/WebCore/inspector/InspectorCanvas.cpp
>+++ b/Source/WebCore/inspector/InspectorCanvas.cpp
>@@ -432,7 +432,7 @@ int InspectorCanvas::indexForData(DuplicateDataVariant data)
>         return false;
>     });
>     if (index != notFound) {
>-        ASSERT(index < std::numeric_limits<int>::max());
>+        ASSERT(index < static_cast<size_t>(std::numeric_limits<int>::max()));
>         return static_cast<int>(index);
>     }
> 
>@@ -526,7 +526,7 @@ int InspectorCanvas::indexForData(DuplicateDataVariant data)
>         index = m_indexedDuplicateData.size() - 1;
>     }
> 
>-    ASSERT(index < std::numeric_limits<int>::max());
>+    ASSERT(index < static_cast<size_t>(std::numeric_limits<int>::max()));
>     return static_cast<int>(index);
> }
> 
>diff --git a/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp b/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp
>index 6698878a9583b009fa0182fefd41a187fe894176..ec2c6ae0459a069256a662f72c87267fea1a45bd 100644
>--- a/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp
>+++ b/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp
>@@ -145,7 +145,7 @@ bool XSLStyleSheet::parseString(const String& string)
>     const char* buffer = reinterpret_cast<const char*>(upconvertedCharacters.get());
>     Checked<unsigned, RecordOverflow> unsignedSize = string.length();
>     unsignedSize *= sizeof(UChar);
>-    if (unsignedSize.hasOverflowed() || unsignedSize.unsafeGet() > std::numeric_limits<int>::max())
>+    if (unsignedSize.hasOverflowed() || unsignedSize.unsafeGet() > static_cast<unsigned>(std::numeric_limits<int>::max()))
>         return false;
> 
>     int size = static_cast<int>(unsignedSize.unsafeGet());
>diff --git a/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp b/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp
>index ae0c66dac3e567c3054d2bfefe908a81cf14b29f..24a5e4e0b31970d91089b66a4e21ac8f2fe9be0f 100644
>--- a/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp
>@@ -183,12 +183,12 @@ Optional<Salt> readOrMakeSalt(const String& path)
>     Salt salt;
>     auto bytesRead = read(fd, salt.data(), salt.size());
>     close(fd);
>-    if (bytesRead != salt.size()) {
>+    if (bytesRead != static_cast<ssize_t>(salt.size())) {
>         salt = makeSalt();
> 
>         unlink(cpath.data());
>         fd = open(cpath.data(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
>-        bool success = write(fd, salt.data(), salt.size()) == salt.size();
>+        bool success = write(fd, salt.data(), salt.size()) == static_cast<ssize_t>(salt.size());
>         close(fd);
>         if (!success)
>             return { };
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index d7a6e3d87fe647715fd02cee1610117e84ab1712..464549cbc1ff7c0ef0c6cb210ad93ef85c056a89 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-04  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fix miscellaneous build warnings
>+        https://bugs.webkit.org/show_bug.cgi?id=198544
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        When converting to PRIVATE include directories, we accidentally dropped SYSTEM here. The
>+        naming convention used here is a bit confusing: the *_SYSTEM_INCLUDE_DIRECTORIES actually
>+        uses both SYSTEM and PRIVATE. We should probably clarify this.
>+
>+        * TestWebKitAPI/PlatformGTK.cmake:
>+
> 2019-06-03  Darin Adler  <darin@apple.com>
> 
>         Finish cleanup of String::number for floating point
>diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
>index 821f3637b4f200ca672922c1d91de984d85468c8..9b31d507f7057cf7c9e463b12c1ce8fb4ae5f107 100644
>--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
>+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
>@@ -99,11 +99,14 @@ set(TestJSC_SOURCES
>     Tests/JavaScriptCore/glib/TestJSC.cpp
> )
> 
>+set(TestJSC_SYSTEM_INCLUDE_DIRECTORIES
>+    ${GLIB_INCLUDE_DIRS}
>+    ${GTK3_INCLUDE_DIRS}
>+)
>+
> set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
>     ${CMAKE_BINARY_DIR}
>     ${TESTWEBKITAPI_DIR}
>-    ${GLIB_INCLUDE_DIRS}
>-    ${GTK3_INCLUDE_DIRS}
>     ${THIRDPARTY_DIR}/gtest/include
>     ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>     ${FORWARDING_HEADERS_DIR}

Actions: View | Formatted Diff | Diff

Attachments on bug 198544: 371340