Unreviewed, build fix for CLoop

[Constellation]

c1f8a9e

Unreviewed, build fix for CLoop
https://bugs.webkit.org/show_bug.cgi?id=267881
rdar://121391447

* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
(JSC::CLoop::execute):

Canonical link: https://commits.webkit.org/273318@main

d96d86c

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
🧪 style	✅ 🛠 ios	✅ 🛠 mac	🛠 wpe	🛠 wincairo
	🛠 ios-sim	✅ 🛠 mac-AS-debug	🧪 wpe-wk2
🧪 webkitperl	🧪 ios-wk2	🧪 api-mac	🧪 api-wpe
	🧪 ios-wk2-wpt	🧪 mac-wk1	🛠 gtk
🛠 🧪 jsc	🧪 api-ios	🧪 mac-wk2	🧪 gtk-wk2
✅ 🛠 🧪 jsc-arm64	🛠 tv	🧪 mac-AS-debug-wk2	🧪 api-gtk
	🛠 tv-sim		✅ 🛠 jsc-armv7
	🛠 watch		🧪 jsc-armv7-tests
✅ 🛠 🧪 unsafe-merge	🛠 watch-sim

[webkit-early-warning-system]

EWS run on current version of this PR (hash d96d86c)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
🧪 style	✅ 🛠 ios	✅ 🛠 mac	🛠 wpe	🛠 wincairo
	🛠 ios-sim	✅ 🛠 mac-AS-debug	🧪 wpe-wk2
🧪 webkitperl	🧪 ios-wk2	🧪 api-mac	🧪 api-wpe
	🧪 ios-wk2-wpt	🧪 mac-wk1	🛠 gtk
🛠 🧪 jsc	🧪 api-ios	🧪 mac-wk2	🧪 gtk-wk2
✅ 🛠 🧪 jsc-arm64	🛠 tv	🧪 mac-AS-debug-wk2	🧪 api-gtk
	🛠 tv-sim		✅ 🛠 jsc-armv7
	🛠 watch		🧪 jsc-armv7-tests
✅ 🛠 🧪 unsafe-merge	🛠 watch-sim

[webkit-commit-queue]

Committed 273318@main (c1f8a9e): https://commits.webkit.org/273318@main

Reviewed commits have been landed. Closing PR #23066 and removing active labels.

[balducci]

hi

Committed 273318@main (c1f8a9e): https://commits.webkit.org/273318@main

Reviewed commits have been landed. Closing PR #23066 and removing active labels.

cross building for 32 bit on a 64 bit host (under linux) now fails due to what appears to be a typo (t6 t7 used but not declared):

    /home/balducci/tmp/install-us-d/webkitgtk-2.42.5/webkitgtk-2.42.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:339:21: error: ‘t6’ was not declared in this scope; did you mean ‘tm’?
      339 |     UNUSED_VARIABLE(t6);
          |                     ^~
    [...]
    /home/balducci/tmp/install-us-d/webkitgtk-2.42.5/webkitgtk-2.42.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:340:21: error: ‘t7’ was not declared in this scope; did you mean ‘tm’?
      340 |     UNUSED_VARIABLE(t7);
          |                     ^~

This fixes things for me:

diff -c Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.FIX_T6_T7 Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
*** Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.FIX_T6_T7	2024-02-06 14:42:22.103792982 +0100
--- Source/JavaScriptCore/llint/LowLevelInterpreter.cpp	2024-02-06 14:42:22.107793035 +0100
***************
*** 323,329 ****
      // 2. 32 bit result values will be in the low 32-bit of t0.
      // 3. 64 bit result values will be in t0.
  
!     CLoopRegister t0, t1, t2, t3, t5, sp, cfr, lr, pc;
  #if USE(JSVALUE64)
      CLoopRegister numberTag, notCellMask;
  #endif
--- 323,329 ----
      // 2. 32 bit result values will be in the low 32-bit of t0.
      // 3. 64 bit result values will be in t0.
  
!     CLoopRegister t0, t1, t2, t3, t5, t6, t7, sp, cfr, lr, pc;
  #if USE(JSVALUE64)
      CLoopRegister numberTag, notCellMask;
  #endif

ciao
gabriele

[sthen]

cross building for 32 bit on a 64 bit host (under linux) now fails due to what appears to be a typo (t6 t7 used but not declared):

    /home/balducci/tmp/install-us-d/webkitgtk-2.42.5/webkitgtk-2.42.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:339:21: error: ‘t6’ was not declared in this scope; did you mean ‘tm’?
      339 |     UNUSED_VARIABLE(t6);
          |                     ^~
    [...]
    /home/balducci/tmp/install-us-d/webkitgtk-2.42.5/webkitgtk-2.42.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:340:21: error: ‘t7’ was not declared in this scope; did you mean ‘tm’?
      340 |     UNUSED_VARIABLE(t7);
          |                     ^~

Seeing this in native builds on OpenBSD i386 (32-bit) too.

This fixes things for me:

diff -c Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.FIX_T6_T7 Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
*** Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.FIX_T6_T7	2024-02-06 14:42:22.103792982 +0100
--- Source/JavaScriptCore/llint/LowLevelInterpreter.cpp	2024-02-06 14:42:22.107793035 +0100
***************
*** 323,329 ****
      // 2. 32 bit result values will be in the low 32-bit of t0.
      // 3. 64 bit result values will be in t0.
  
!     CLoopRegister t0, t1, t2, t3, t5, sp, cfr, lr, pc;
  #if USE(JSVALUE64)
      CLoopRegister numberTag, notCellMask;
  #endif
--- 323,329 ----
      // 2. 32 bit result values will be in the low 32-bit of t0.
      // 3. 64 bit result values will be in t0.
  
!     CLoopRegister t0, t1, t2, t3, t5, t6, t7, sp, cfr, lr, pc;
  #if USE(JSVALUE64)
      CLoopRegister numberTag, notCellMask;
  #endif

Shouldn't the "UNUSED_VARIABLE(t6);" and "UNUSED_VARIABLE(t7);" be removed instead?

[bitlord]

@balducci @sthen webkit bug: https://bugs.webkit.org/show_bug.cgi?id=268739

Based on the reference in the commit of webkitglib/2.42 branch I think this should fix it 3d53735

[sthen]

On 2024/02/19 11:58, Branko Grubić wrote: @balducci @sthen webkit bug: https://bugs.webkit.org/show_bug.cgi?id=268739 Based on the reference in the commit of webkitglib/2.42 branch I think this should fix it 3d53735 — Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you were mentioned.*Message ID: <WebKit/WebKit/pull/23066/ ***@***.***>

Yes, that does fix it.