Skip to content

Commit

Permalink
webkitgtk,wpewebkit: Backport fix t6 was not declared in this scope
Browse files Browse the repository at this point in the history
Suggested-by: Adrian Perez de Castro <[email protected]>
Upstream-Status: Backport [https://bugs.webkit.org/show_bug.cgi?id=2268739]
  • Loading branch information
psaavedra committed Feb 9, 2024
1 parent cad520b commit 5b45075
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 17e371d5b6fc86a04504762558cb6b0dec50bcba Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <[email protected]>
Date: Mon, 5 Feb 2024 11:00:49 -0600
Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?=
=?UTF-8?q?=E2=80=98t6=E2=80=99=20was=20not=20declared=20in=20this=20scope?=
=?UTF-8?q?=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D268739?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unreviewed build fix. Seems a backport went badly, and we didn't notice
because the code is architecture-specific.

* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
(JSC::CLoop::execute):
---
Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 --
1 file changed, 2 deletions(-)

Upstream-Status: Backport [https://bugs.webkit.org/show_bug.cgi?id=2268739]

diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
index 5064ead6..9a2e2653 100644
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
UNUSED_VARIABLE(t2);
UNUSED_VARIABLE(t3);
UNUSED_VARIABLE(t5);
- UNUSED_VARIABLE(t6);
- UNUSED_VARIABLE(t7);

struct StackPointerScope {
StackPointerScope(CLoopStack& stack)
--
2.30.2

1 change: 1 addition & 0 deletions recipes-browser/webkitgtk/webkitgtk_2.42.5.bb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI = " \
https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz;name=tarball \
file://0001-Activate-HAVE_MISSING_STD_FILESYSTEM_PATH_CONSTRUCTO.patch \
file://0002-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \
"

SRC_URI[tarball.sha256sum] = "b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 17e371d5b6fc86a04504762558cb6b0dec50bcba Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <[email protected]>
Date: Mon, 5 Feb 2024 11:00:49 -0600
Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?=
=?UTF-8?q?=E2=80=98t6=E2=80=99=20was=20not=20declared=20in=20this=20scope?=
=?UTF-8?q?=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D268739?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unreviewed build fix. Seems a backport went badly, and we didn't notice
because the code is architecture-specific.

* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
(JSC::CLoop::execute):
---
Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 --
1 file changed, 2 deletions(-)

Upstream-Status: Backport [https://bugs.webkit.org/show_bug.cgi?id=2268739]

diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
index 5064ead6..9a2e2653 100644
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
UNUSED_VARIABLE(t2);
UNUSED_VARIABLE(t3);
UNUSED_VARIABLE(t5);
- UNUSED_VARIABLE(t6);
- UNUSED_VARIABLE(t7);

struct StackPointerScope {
StackPointerScope(CLoopStack& stack)
--
2.30.2

1 change: 1 addition & 0 deletions recipes-browser/wpewebkit/wpewebkit_2.42.5.bb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ LIBCPLUSPLUS = "${@bb.utils.contains_any("LAYERSERIES_CORENAMES", 'dunfell', '--
SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz;name=tarball \
file://0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se_2.42.patch \
file://0002-Activate-HAVE_MISSING_STD_FILESYSTEM_PATH_CONSTRUCTO.patch \
file://0003-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \
"

SRC_URI[tarball.sha256sum] = "4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532"
Expand Down

0 comments on commit 5b45075

Please sign in to comment.