Changeset 229325 in webkit

Timestamp:

Mar 6, 2018 9:38:05 AM (6 years ago)

Author:

zandobersek@gmail.com

Message:

REGRESSION(r229309): s_exceptionInstructions allocation change causing crashes in LLInt on WPE
​https://bugs.webkit.org/show_bug.cgi?id=183366

Reviewed by Michael Catanzaro.

Have the TestRunnerInjectedBundle CMake library link against libraries
in the WebKitTestRunnerInjectedBundle_LIBRARIES list, and not the
WebKitTestRunner_LIBRARIES list, which is used for the WebKitTestRunner
executable. This allows narrowing down the libraries to only those that
are necessary for the injected bundle shared object.

The GTK+ port already has this list specified, adding one for the WPE
port.

• WebKitTestRunner/CMakeLists.txt:

Link the TestRunnerInjectedBundle library against the libraries in the
WebKitTestRunnerInjectedBundle_LIBRARIES list.

• WebKitTestRunner/PlatformWPE.cmake:

Specify the WebKitTestRunnerInjectedBundle_LIBRARIES list, including the
basic system dependencies, WebCoreTestSupport and WebKit. This follows
the GTK+ port.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/CMakeLists.txt (modified) (1 diff)
• WebKitTestRunner/PlatformWPE.cmake (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-03-06  Zan Dobersek  <zdobersek@igalia.com>
+
+        REGRESSION(r229309): s_exceptionInstructions allocation change causing crashes in LLInt on WPE
+        https://bugs.webkit.org/show_bug.cgi?id=183366
+
+        Reviewed by Michael Catanzaro.
+
+        Have the TestRunnerInjectedBundle CMake library link against libraries
+        in the WebKitTestRunnerInjectedBundle_LIBRARIES list, and not the
+        WebKitTestRunner_LIBRARIES list, which is used for the WebKitTestRunner
+        executable. This allows narrowing down the libraries to only those that
+        are necessary for the injected bundle shared object.
+
+        The GTK+ port already has this list specified, adding one for the WPE
+        port.
+
+        * WebKitTestRunner/CMakeLists.txt:
+        Link the TestRunnerInjectedBundle library against the libraries in the
+        WebKitTestRunnerInjectedBundle_LIBRARIES list.
+        * WebKitTestRunner/PlatformWPE.cmake:
+        Specify the WebKitTestRunnerInjectedBundle_LIBRARIES list, including the
+        basic system dependencies, WebCoreTestSupport and WebKit. This follows
+        the GTK+ port.
+
 2018-03-06  Dominik Infuehr  <dinfuehr@igalia.com>
 

trunk/Tools/WebKitTestRunner/CMakeLists.txt

@@ -110 +110 @@
 
 add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
-target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
+target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunnerInjectedBundle_LIBRARIES})
 add_dependencies(TestRunnerInjectedBundle WebKitTestRunnerInjectedBundleBindings)
 

trunk/Tools/WebKitTestRunner/PlatformWPE.cmake

@@ -35 +35 @@
 )
 
+set(WebKitTestRunnerInjectedBundle_LIBRARIES
+    ${CAIRO_LIBRARIES}
+    ${GLIB_LIBRARIES}
+    WebCoreTestSupport
+    WebKit
+)
+
 list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
     ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/wpe/AccessibilityControllerWPE.cpp