Title: [242473] releases/WebKitGTK/webkit-2.24
Revision
242473
Author
carlo...@webkit.org
Date
2019-03-05 09:21:09 -0800 (Tue, 05 Mar 2019)

Log Message

Merge r242109 - Fix warnings on ARM and MIPS
https://bugs.webkit.org/show_bug.cgi?id=195049

Reviewed by Mark Lam.

.:

Disable warnings for changes to the ABI with GCC 7.1.

* Source/cmake/WebKitCompilerFlags.cmake:

Source/_javascript_Core:

Fix all warnings on ARM and MIPS.

* assembler/MacroAssemblerPrinter.cpp:
(JSC::Printer::printMemory):
* assembler/testmasm.cpp:
(JSC::testProbeModifiesStackValues):
* bytecode/InByIdStatus.cpp:
(JSC::InByIdStatus::computeFor):
* runtime/CachedTypes.cpp:
(JSC::VariableLengthObject::buffer const):
* runtime/JSBigInt.h:
* tools/JSDollarVM.cpp:
(JSC::codeBlockFromArg):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.24/ChangeLog (242472 => 242473)


--- releases/WebKitGTK/webkit-2.24/ChangeLog	2019-03-05 17:21:03 UTC (rev 242472)
+++ releases/WebKitGTK/webkit-2.24/ChangeLog	2019-03-05 17:21:09 UTC (rev 242473)
@@ -1,3 +1,14 @@
+2019-02-26  Dominik Infuehr  <dinfu...@igalia.com>
+
+        Fix warnings on ARM and MIPS
+        https://bugs.webkit.org/show_bug.cgi?id=195049
+
+        Reviewed by Mark Lam.
+
+        Disable warnings for changes to the ABI with GCC 7.1.
+
+        * Source/cmake/WebKitCompilerFlags.cmake:
+
 2019-02-25  Miguel Gomez  <mago...@igalia.com>
 
         [WPE] Add support for holepunch using an external video player

Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/ChangeLog (242472 => 242473)


--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/ChangeLog	2019-03-05 17:21:03 UTC (rev 242472)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/ChangeLog	2019-03-05 17:21:09 UTC (rev 242473)
@@ -1,3 +1,24 @@
+2019-02-26  Dominik Infuehr  <dinfu...@igalia.com>
+
+        Fix warnings on ARM and MIPS
+        https://bugs.webkit.org/show_bug.cgi?id=195049
+
+        Reviewed by Mark Lam.
+
+        Fix all warnings on ARM and MIPS.
+
+        * assembler/MacroAssemblerPrinter.cpp:
+        (JSC::Printer::printMemory):
+        * assembler/testmasm.cpp:
+        (JSC::testProbeModifiesStackValues):
+        * bytecode/InByIdStatus.cpp:
+        (JSC::InByIdStatus::computeFor):
+        * runtime/CachedTypes.cpp:
+        (JSC::VariableLengthObject::buffer const):
+        * runtime/JSBigInt.h:
+        * tools/JSDollarVM.cpp:
+        (JSC::codeBlockFromArg):
+
 2019-02-26  Mark Lam  <mark....@apple.com>
 
         Unpoison MacroAssemblerCodePtr, ClassInfo pointers, and a few other things.

Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp (242472 => 242473)


--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp	2019-03-05 17:21:03 UTC (rev 242472)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp	2019-03-05 17:21:09 UTC (rev 242473)
@@ -138,17 +138,17 @@
             return;
         }
         if (memory.numBytes == sizeof(int16_t)) {
-            auto p = reinterpret_cast<int16_t*>(ptr);
+            auto p = bitwise_cast<int16_t*>(ptr);
             out.printf("%p:<0x%04x %d>", p, *p, *p);
             return;
         }
         if (memory.numBytes == sizeof(int32_t)) {
-            auto p = reinterpret_cast<int32_t*>(ptr);
+            auto p = bitwise_cast<int32_t*>(ptr);
             out.printf("%p:<0x%08x %d>", p, *p, *p);
             return;
         }
         if (memory.numBytes == sizeof(int64_t)) {
-            auto p = reinterpret_cast<int64_t*>(ptr);
+            auto p = bitwise_cast<int64_t*>(ptr);
             out.printf("%p:<0x%016" PRIx64 " %" PRId64 ">", p, *p, *p);
             return;
         }

Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/assembler/testmasm.cpp (242472 => 242473)


--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/assembler/testmasm.cpp	2019-03-05 17:21:03 UTC (rev 242472)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/assembler/testmasm.cpp	2019-03-05 17:21:09 UTC (rev 242473)
@@ -246,6 +246,7 @@
 }
 
 
+#if CPU(X86) || CPU(X86_64) || CPU(ARM64)
 static Vector<float> floatOperands()
 {
     return Vector<float> {
@@ -263,6 +264,7 @@
         -std::numeric_limits<float>::infinity(),
     };
 }
+#endif
 
 static Vector<int32_t> int32Operands()
 {
@@ -779,7 +781,9 @@
     CPUState originalState;
     void* originalSP { nullptr };
     void* newSP { nullptr };
+#if !CPU(MIPS)
     uintptr_t modifiedFlags { 0 };
+#endif
     size_t numberOfExtraEntriesToWrite { 10 }; // ARM64 requires that this be 2 word aligned.
 
 #if CPU(X86) || CPU(X86_64)

Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/bytecode/InByIdStatus.cpp (242472 => 242473)


--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/bytecode/InByIdStatus.cpp	2019-03-05 17:21:03 UTC (rev 242472)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/bytecode/InByIdStatus.cpp	2019-03-05 17:21:09 UTC (rev 242473)
@@ -58,6 +58,7 @@
     UNUSED_PARAM(map);
     UNUSED_PARAM(bytecodeIndex);
     UNUSED_PARAM(uid);
+    UNUSED_PARAM(didExit);
 #endif
 
     return result;

Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/CachedTypes.cpp (242472 => 242473)


--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/CachedTypes.cpp	2019-03-05 17:21:03 UTC (rev 242472)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/CachedTypes.cpp	2019-03-05 17:21:09 UTC (rev 242473)
@@ -340,7 +340,7 @@
     template<typename T>
     const T* buffer() const
     {
-        return reinterpret_cast<const T*>(buffer());
+        return bitwise_cast<const T*>(buffer());
     }
 
     uint8_t* allocate(Encoder& encoder, size_t size)

Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/JSBigInt.h (242472 => 242473)


--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/JSBigInt.h	2019-03-05 17:21:03 UTC (rev 242472)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/JSBigInt.h	2019-03-05 17:21:09 UTC (rev 242473)
@@ -236,7 +236,7 @@
 
     inline Digit* dataStorage()
     {
-        return reinterpret_cast<Digit*>(reinterpret_cast<char*>(this) + offsetOfData());
+        return bitwise_cast<Digit*>(reinterpret_cast<char*>(this) + offsetOfData());
     }
 
     Digit digit(unsigned);

Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/tools/JSDollarVM.cpp (242472 => 242473)


--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/tools/JSDollarVM.cpp	2019-03-05 17:21:03 UTC (rev 242472)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/tools/JSDollarVM.cpp	2019-03-05 17:21:09 UTC (rev 242473)
@@ -1461,7 +1461,7 @@
             else
                 candidateCodeBlock = func->jsExecutable()->eitherCodeBlock();
         } else
-            candidateCodeBlock = reinterpret_cast<CodeBlock*>(value.asCell());
+            candidateCodeBlock = static_cast<CodeBlock*>(value.asCell());
     }
 
     if (candidateCodeBlock && VMInspector::isValidCodeBlock(exec, candidateCodeBlock))

Modified: releases/WebKitGTK/webkit-2.24/Source/cmake/WebKitCompilerFlags.cmake (242472 => 242473)


--- releases/WebKitGTK/webkit-2.24/Source/cmake/WebKitCompilerFlags.cmake	2019-03-05 17:21:03 UTC (rev 242472)
+++ releases/WebKitGTK/webkit-2.24/Source/cmake/WebKitCompilerFlags.cmake	2019-03-05 17:21:09 UTC (rev 242473)
@@ -131,7 +131,8 @@
     WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Qunused-arguments
                                          -Wno-maybe-uninitialized
                                          -Wno-noexcept-type
-                                         -Wno-parentheses-equality)
+                                         -Wno-parentheses-equality
+                                         -Wno-psabi)
 
     # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80947
     if (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "8.0" AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to