core: Remove all static strings, shrink Value structs #19716

Lord-McSweeney · 2025-03-05T18:54:10Z

AvmString now directly holds a Gc<AvmStringRepr>, which shrinks Value structs on 64-bit from 24 to 16 bytes. getlocal, setlocal, and getslot run 5-10% faster; Chess Demons starts up about 5% faster.

adrian17 · 2025-03-06T21:36:57Z

core/src/avm2/globals.rs

@@ -595,8 +548,6 @@ pub fn load_player_globals<'gc>(

    globals.set_vtable(mc, global_obj_vtable);

-    activation.context.avm2.toplevel_global_object = Some(globals);


To be sure, why was this moved later?

We have three script global objects right now- one for the builtin classes script, one for Toplevel.as, and one for globals.as. The "toplevel" global object has pointed to the builtin one for a long time, but as we moved classes out of it and into Toplevel.as it makes more sense to make it point to the Toplevel.as global object.

The hacky part was that some tests depended on the "toplevel" global object having the parseInt, parseFloat, etc properties, which, since they were defined in Toplevel.as, we had to copy over to the builtin global object manually. Now that the only properties left on the builtin global object are Object and Class anyway, I made the "toplevel" global object point to Toplevel.as and removed the copying hack.

core/src/display_object/movie_clip.rs

adrian17 · 2025-03-06T21:40:25Z

core/src/avm2/domain.rs

@@ -290,7 +290,7 @@ impl<'gc> Domain<'gc> {
                activation.gc(),
                &name[(start + 2)..(name.len() - 1)],
            ));
-            name = "__AS3__.vec::Vector".into();
+            name = AvmString::new_utf8(activation.gc(), "__AS3__.vec::Vector");


This could still be an AvmString-pointing-to-static, right?

adrian17 · 2025-03-06T21:42:02Z

core/src/avm2/globals/class.rs

@@ -100,8 +103,9 @@ pub fn create_c_class<'gc>(
    let gc_context = activation.gc();
    let namespaces = activation.avm2().namespaces;

+    let class_name = AvmString::new_utf8(gc_context, "Class$");


Managed-pointing-to-static?

adrian17 · 2025-03-06T21:48:29Z

So a lot of these AvmString::new_utf8(gc_context, "Class$"); could be replaced with managed-static strings, with the only caveat being that... we don't really have an API for these, aside from intern_static which also implies interning?
I'm okay with some kind of new_xyz_static(gc, s: &'static str / &'static [u8]) being out of this PR, but let's make sure this is indeed what we want in the long run.

Also after this gets merged, I'll do an instrumented test to see what dynamic strings we now allocate from our own code during normal runtime.

adrian17 · 2025-03-08T19:50:13Z

core/src/avm1/value.rs

 const _: () = assert!(size_of::<Value<'_>>() <= 16);

-#[cfg(target_pointer_width = "64")]
-const _: () = assert!(size_of::<Value<'_>>() == 24);


Can you keep them separate, to be more explicit? Will be also useful if we ever do NaN boxing on 32-bit.

adrian17 · 2025-03-08T19:52:06Z

core/src/avm2/error.rs

@@ -38,12 +38,8 @@ impl Debug for Error<'_> {
 }

 // This type is used very frequently, so make sure it doesn't unexpectedly grow.
-#[cfg(target_family = "wasm")]
 const _: () = assert!(size_of::<Result<Value<'_>, Error<'_>>>() == 24);


I thought that the size is smaller (16?) on non-wasm due to x86 being less strict with alignment?
At least at some point it was. Do we do any testing on 32-bit?

That's why I suggest keeping them separate here too.

…EventObject::io_error_event

@torokati44

----------------------------------------------------------------------------------------------------- chromebook-linux-audio.mk d244d144d2a410f2fad23d25446c401096d0ce8e # Version: Commits on Mar 07, 2025 ----------------------------------------------------------------------------------------------------- functions: return from config check if unable to read config, ------------------------------------------------------------------------------------ cubeb.mk f8633c0c9217ed5499fdda391946d416c52e6809 # Version: Commits on Mar 10, 2025 ------------------------------------------------------------------------------------ Join thread before calling cond var dtor to avoid race, ------------------------------------------------------------------------------------- zmusic.mk 6928b8609db9b1c104c4cd4f9b163486121fb0f0 # Version: Commits on Mar 08, 2025 ------------------------------------------------------------------------------------- Fix building with no sndfile support at all The stub functions still reference SNDFILE, so we still need to include the bundled header in this case., -------------------------------------------------------------------------------------------------------- batocera-emulationstation.mk 3731cc03b8d243d42eae5ba15ec977862adb7b69 # Version: Commits on Mar 09, 2025 -------------------------------------------------------------------------------------------------------- Merge pull request #1889 from bulzipke/batocera_netplay_settings [NetPlay] Added Netplay options: Auto Lobby & Relay Filter, ------------------------------------------------------------------------------------------------ batocera-es-piboy.mk 3731cc03b8d243d42eae5ba15ec977862adb7b69 # Version: Commits on Mar 09, 2025 ------------------------------------------------------------------------------------------------ Merge pull request #1889 from bulzipke/batocera_netplay_settings [NetPlay] Added Netplay options: Auto Lobby & Relay Filter, --------------------------------------------------------------------------------------- applewin.mk cbfce26e214787b20a4be7520b843ad0905e2436 # Version: Commits on Mar 09, 2025 --------------------------------------------------------------------------------------- Merge pull request #252 from AppleWin/master tfe_store: explicit cases to avoid warning. (PR #1389), ------------------------------------------------------------------------------------- azahar.mk a5ad887771bbbe7b49cdad6ea0e79268bdc61279 # Version: Commits on Mar 09, 2025 ------------------------------------------------------------------------------------- Do data migration before QtConfig is constructed, ------------------------------------------------------------------------------------ citra.mk e0d78ada69000bf2ad808873c3852f3ef64c80da # Version: Commits on Mar 10, 2025 ------------------------------------------------------------------------------------ Android: Update various dependencies, ------------------------------------------------------------------------------------------ dolphin-emu.mk 5ed8b7bc9d8f70d5dae4f009939ac9715adf83b4 # Version: Commits on Mar 10, 2025 ------------------------------------------------------------------------------------------ Merge pull request #13403 from jordan-woyak/backend_info VideoCommon: Move backend_info out of VideoConfig struct., ------------------------------------------------------------------------------------------ duckstation.mk c717f547cfaba2b24bfd98e39148a5b1bc2edc5a # Version: Commits on Mar 10, 2025 ------------------------------------------------------------------------------------------ Deps: Update to SDL3 3.2.8, ----------------------------------------------------------------------------------------------- lindbergh-loader.mk 6e751f16f0934ab64fffdd65582c46654ddd81b6 # Version: Commits on Mar 09, 2025 ----------------------------------------------------------------------------------------------- Fixed bug in ABC res patch after cleaning up code., -------------------------------------------------------------------------------------- melonds.mk 0fcf1f6e3a443cb249f85d948ff6e58dc58501d6 # Version: Commits on Mar 09, 2025 -------------------------------------------------------------------------------------- Add support for using the solar sensor without requiring a Boktai ROM (#2221) * Add a `GBAHeader` struct * Add extra `GBAAddon` entries for the Boktai carts - Each game in the trilogy has a different effect on Lunar Knights (the only commercial DS game to support the solar sensor) * Copy the logo data from the NDS ROM's header to the Boktai stub's header, -------------------------------------------------------------------------------------- openmsx.mk 3af263ee65c523cd235991223f3f7d5c8bfedd21 # Version: Commits on Mar 10, 2025 -------------------------------------------------------------------------------------- Added Contrib/dmk/Makefile, Contrib/tsx/Makefile Based on: Include Makefiles for Contrib/dmk and Contrib/tsx openMSX/openMSX#1872 Thanks!, ---------------------------------------------------- pcsx2.mk v2.3.212 # Version: Commits on Mar 09, 2025 ---------------------------------------------------- - [Qt: Fix pad vibration binding window](PCSX2/pcsx2#12396) , ---------------------------------------------------------- python-pyxel.mk v2.3.11 # Version: Commits on Mar 10, 2025 ---------------------------------------------------------- Updated the WASM wheel to version 2.3.11, ------------------------------------------------------------------------------------ rpcs3.mk db945f6aed82563e88a5f7552d6df68ae5f96d38 # Version: Commits on Mar 06, 2025 ------------------------------------------------------------------------------------ android: do not invalidate swapchain on VK_SUBOPTIMAL_KHR Workaround, --------------------------------------------------------------- ruffle.mk nightly-2025-03-10 # Version: Commits on Mar 10, 2025 --------------------------------------------------------------- ## What's Changed * chore: Ignore advisory about `paste` being unmaintained by @torokati44 in ruffle-rs/ruffle#19757 * core: Remove all static strings, shrink Value structs by @Lord-McSweeney in ruffle-rs/ruffle#19716 * core/avm1/avm2: Add `AvmString::new_ascii_static` and use it by @Lord-McSweeney in ruffle-rs/ruffle#19760 **Full Changelog**: ruffle-rs/ruffle@nightly-2025-03-08...nightly-2025-03-10, -------------------------------------------------------------------------------------- scummvm.mk 2c0c1ca4a6d1a30cdbb8d738d76d34ea7a918e19 # Version: Commits on Mar 09, 2025 -------------------------------------------------------------------------------------- CREDITS: Rebrand rootfather to felsqualle, -------------------------------------------------------------------------------------- shadps4.mk ba1eb298dec48f88431068390232e3978ae07bda # Version: Commits on Mar 10, 2025 -------------------------------------------------------------------------------------- New Crowdin updates (#2631) * New translations en_us.ts (French) * New translations en_us.ts (Spanish) * New translations en_us.ts (Polish) * New translations en_us.ts (Spanish) * New translations en_us.ts (Albanian), --------------------------------------------------------------------------------------- thextech.mk 72fb925bc71cd104fdba2ab9ce1c429b7e1ad9cc # Version: Commits on Mar 10, 2025 --------------------------------------------------------------------------------------- files.cpp: fix handling of Archives paths on win32, ----------------------------------------------------------------------------------- xemu.mk 4665515d801e7b3d15eaab24fb35ff04c9e782bc # Version: Commits on Mar 10, 2025 ----------------------------------------------------------------------------------- nv2a: Group attributes in pgraph_get_glsl_vtx_header, ------------------------------------------------------------------------------------------- xenia-native.mk 27d9cb8cfcf2f88f59fa0e783e6be3305cf19813 # Version: Commits on Mar 10, 2025 ------------------------------------------------------------------------------------------- [XAM] Added missing nullptr check. This partially fixes Fable 2 main menu crashes. Figure out why game tries to save invalid data., ----------------------------------------------------------------------------------------- rpi-eeprom.mk d50b2b32f162292ab6e235932075ce00bddda4ae # Version: Commits on Mar 10, 2025 ----------------------------------------------------------------------------------------- pieeprom-2025-03-10: 2712: Add [boot_partition] filter plus SDRAM init fixes (latest) * Update SDRAM init timings to intermittent 8-flash SDRAM init errors on some boards. See: raspberrypi/rpi-eeprom#67 * config: Fix missing initialisation of selected_expr to 1 in config.txt Without an [all] section the new expression filter might default to false. This impacts the bootloader early parsing of config.txt for things like boot_ramdisk rather than the later config.txt pass for device-tree parsing. * config_loader: Add support [boot_partition=N] as an expression filter The boot_partition tests whether the partition number N matches the number that the system is booting from. This expression is only supported in config.txt and is designed to make it easier to have common boot.img ramdisks in an A/B system where the conditional loads a different cmdline.txt file depending on which partition boot.img is loaded from., ------------------------------------------------------------------------------------------- sdl12-compat.mk 990ce7bd9a19720b3481154edbcd31b42318457f # Version: Commits on Mar 10, 2025 ------------------------------------------------------------------------------------------- SDL_stdinc.h: Fix apparent copy/paste error SDL_strcasecmp, rather than SDL_strncasecmp, being defined as _strnicmp., --------------------------------------------------------------------------------------- alephone.mk b573f51c949904f5ad5bc0dd8ce491c7b63dac30 # Version: Commits on Mar 10, 2025 --------------------------------------------------------------------------------------- Don't run CI tests in forks without submodules, ------------------------------------------------------------------------------------ box64.mk 2b300bd199a7a65a3de1eecd24d6dff5593a9b55 # Version: Commits on Mar 10, 2025 ------------------------------------------------------------------------------------ Bumped version to v0.3.4, ------------------------------------------------------------------------------------------ devilutionx.mk 390d7600a31dc67d9773123e2c68c55a5791e9fc # Version: Commits on Mar 09, 2025 ------------------------------------------------------------------------------------------ Fix debug command for talking to towners, --------------------------------------------------------------------------------------- etlegacy.mk 194ed37c310042bacbc64aed03c84c03937fffdf # Version: Commits on Mar 10, 2025 --------------------------------------------------------------------------------------- app: Add KeyBinding Manager, ------------------------------------------------------------------------------------- openjk.mk 5878f620f6dabb6573595470627ab2e31cb46b67 # Version: Commits on Mar 10, 2025 ------------------------------------------------------------------------------------- [NPC behavior] reduce NPC_BSFlee random range (#1129) * [NPC behavior] reduce NPC_BSFlee random range Irand fails when the requested random range is not below QRAND_MAX, which is 2**15 as it is right now. NPC_BSFlee calls irand (via Q_irand) by requesting the random range within [10000, 50000] which is of course below 2**15 and the game crashes. Below is my stack trace in gdb: 4 0x00007ffff784a486 in __assert_fail () from /usr/lib/libc.so.6 5 0x00007fffd18e5b6c in irand (min=10000, max=50000) at /opt/games/git-openjk/shared/qcommon/q_math.c:252 6 0x00007fffd18e5bcc in Q_irand (value1=10000, value2=50000) at /opt/games/git-openjk/shared/qcommon/q_math.c:264 7 0x00007fffd177c34b in NPC_BSFlee () at /opt/games/git-openjk/code/game/NPC_behavior.cpp:1748 8 0x00007fffd1776525 in NPC_RunBehavior (team=2, bState=10) at /opt/games/git-openjk/code/game/NPC.cpp:2055 9 0x00007fffd1776837 in NPC_ExecuteBState (self=0x7fffd1a94ac8 <g_entities+94248>) at /opt/games/git-openjk/code/game/NPC.cpp:2185 10 0x00007fffd1777472 in NPC_Think (self=0x7fffd1a94ac8 <g_entities+94248>) at /opt/games/git-openjk/code/game/NPC.cpp:2494 11 0x00007fffd16d83ce in GEntity_ThinkFunc (self=0x7fffd1a94ac8 <g_entities+94248>) at /opt/games/git-openjk/code/game/g_functions.cpp:67 12 0x00007fffd16e5ac4 in G_RunThink (ent=0x7fffd1a94ac8 <g_entities+94248>) at /opt/games/git-openjk/code/game/g_main.cpp:1075 13 0x00007fffd16e84fa in G_RunFrame (levelTime=578050) at /opt/games/git-openjk/code/game/g_main.cpp:2055 14 0x00005555555d9d91 in SV_Frame (msec=11, fractionMsec=0) at /opt/games/git-openjk/code/server/sv_main.cpp:513 15 0x00005555555b0740 in Com_Frame () at /opt/games/git-openjk/code/qcommon/common.cpp:1418 16 0x000055555562a897 in main (argc=1, argv=0x7fffffffe2c8) at /opt/games/git-openjk/shared/sys/sys_main.cpp:812 (gdb) frame 5 5 0x00007fffd18e5b6c in irand (min=10000, max=50000) at /opt/games/git-openjk/shared/qcommon/q_math.c:252 252\t\tassert((max - min) < QRAND_MAX); * keep the original timer value --------- Co-authored-by: razor <[email protected]>, ---------------------------------------------------------------------------------- stk.mk 6fdf215549fef57a2530413a815b1693f994061f # Version: Commits on Mar 10, 2025 ---------------------------------------------------------------------------------- Fix out-of-focus text box widget when alphabet characters are assigned as navigation, --------------------------------------------------------------------------------------------- theforceengine.mk d2d6a35a5b63aa866e7336b33c8fcebc8a0e7eff # Version: Commits on Mar 09, 2025 --------------------------------------------------------------------------------------------- * Additional cleanup around ScriptCall string parameters., ---------------------------------------------------------------------------------------------------- sdl2-gamecontrollerdb.mk 1275aac61f6be136648d0445dfb8c71191077af4 # Version: Commits on Mar 10, 2025 ---------------------------------------------------------------------------------------------------- Add Mad Catz FightStick Alpha thanks @madmalkav, ------------------------------------------------------------------------------------------------- libretro-core-info.mk 7d18381b0e0fade81050315ce260a72307e55280 # Version: Commits on Mar 09, 2025 ------------------------------------------------------------------------------------------------- Merge pull request #72 from Apaczer/uae4all Create uae4all_libretro.info, ---------------------------------------------------------------------------------------- retroarch.mk 9e64cce10fb4a3411a933fd1377dd32021288360 # Version: Commits on Mar 10, 2025 ---------------------------------------------------------------------------------------- Merge pull request #17678 from warmenhoven/warmenhoven/cloud-ignore, --------------------------------------------------------------------------------------------- vulkan-samples.mk bbb427f09147f811b1bab16fedb028517da9ed48 # Version: Commits on Mar 10, 2025 --------------------------------------------------------------------------------------------- update the actions/cache version for ios to v4 (#1292) * update the actions/cache version for ios to v4 * update astc, ------------------------------------------------------------------------------------- gzdoom.mk e2103d2508d6d784dc20ffa598a4a11ac993ae69 # Version: Commits on Mar 09, 2025 ------------------------------------------------------------------------------------- Fix building with GCC 15, ----------------------------------------------------------------------------------------- sonic3-air.mk 9ae7f0b9a977dedc6247378de0f433dd06d652bd # Version: Commits on Mar 10, 2025 ----------------------------------------------------------------------------------------- Small fix for emulated AIZ music, ----------------------------------------------------------------------------------- tr1x.mk ea6399fe993f268760ac53829c9a6413ad7344fb # Version: Commits on Mar 10, 2025 ----------------------------------------------------------------------------------- tr1/shell: add -l argument support, ----------------------------------------------------------------------------------- tr2x.mk ea6399fe993f268760ac53829c9a6413ad7344fb # Version: Commits on Mar 10, 2025 ----------------------------------------------------------------------------------- tr1/shell: add -l argument support, --------------------------------------------------------------------------------------------- libretro-fbneo.mk 0f7810eaa6dd0bfb67106128e6179380a460412b # Version: Commits on Mar 10, 2025 --------------------------------------------------------------------------------------------- (libretro) update files, ----------------------------------------------------------------------------------------------- libretro-scummvm.mk 2c0c1ca4a6d1a30cdbb8d738d76d34ea7a918e19 # Version: Commits on Mar 09, 2025 ----------------------------------------------------------------------------------------------- CREDITS: Rebrand rootfather to felsqualle,

torokati44 · 2025-03-17T10:47:47Z

The failure of the assertion about the size on x86_32 (i686) still blocks updating Ruffle in the Android app:
https://github.com/ruffle-rs/ruffle-android/actions/runs/13764900529/job/38488990037#step:6:174

Lord-McSweeney added A-avm2 Area: AVM2 (ActionScript 3) A-avm1 Area: AVM1 (ActionScript 1 & 2) T-perf Type: Performance Improvements labels Mar 5, 2025

Lord-McSweeney force-pushed the no-istr branch from 2d8ca33 to b39c935 Compare March 5, 2025 19:06

adrian17 approved these changes Mar 6, 2025

View reviewed changes

Lord-McSweeney force-pushed the no-istr branch 2 times, most recently from 17c9bc0 to 45c741e Compare March 8, 2025 19:28

adrian17 approved these changes Mar 8, 2025

View reviewed changes

Lord-McSweeney added 11 commits March 9, 2025 07:51

avm1/core: Remove From<&'static str> impl for AVM1 Value

5617713

avm1/avm2: Remove some uses of static strings

e119092

core/avm2: Don't pass AvmStrings into Loader::movie_loader_error and …

92b9a51

…EventObject::io_error_event

avm2: Remove several more uses of static strings

0a3846b

avm2: Remove most of the remaining static strings in avm2

1df2d77

avm2: Remove static string in Domain::get_defined_value_handling_vector

6794339

avm2: Fix define_fn_on_global hack

76a4f7f

core: Don't pass static string to Avm1Button::get_boolean_property

3f77e53

core: Use interned strings for ClipEvent names

7a78e66

avm1/avm2: Remove AvmString::Static variant

56a3751

chore: appease clippy

981401f

Lord-McSweeney enabled auto-merge (rebase) March 9, 2025 14:51

Lord-McSweeney force-pushed the no-istr branch from 45c741e to 981401f Compare March 9, 2025 14:51

Lord-McSweeney merged commit 884563b into ruffle-rs:master Mar 9, 2025
22 checks passed

torokati44 mentioned this pull request Mar 17, 2025

avm2: Make the size constraint on Value be an upper bound #19841

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

core: Remove all static strings, shrink Value structs #19716

core: Remove all static strings, shrink Value structs #19716

Uh oh!

Lord-McSweeney commented Mar 5, 2025

Uh oh!

adrian17 Mar 6, 2025 •

edited

Loading

Uh oh!

Lord-McSweeney Mar 7, 2025

Uh oh!

Uh oh!

adrian17 Mar 6, 2025

Uh oh!

adrian17 Mar 6, 2025

Uh oh!

adrian17 commented Mar 6, 2025

Uh oh!

adrian17 Mar 8, 2025

Uh oh!

adrian17 Mar 8, 2025

Uh oh!

Uh oh!

torokati44 commented Mar 17, 2025

Uh oh!

Uh oh!

		@@ -595,8 +548,6 @@ pub fn load_player_globals<'gc>(

		globals.set_vtable(mc, global_obj_vtable);

		activation.context.avm2.toplevel_global_object = Some(globals);

Uh oh!

core: Remove all static strings, shrink Value structs #19716

core: Remove all static strings, shrink Value structs #19716

Uh oh!

Conversation

Lord-McSweeney commented Mar 5, 2025

Uh oh!

adrian17 Mar 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Lord-McSweeney Mar 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

adrian17 Mar 6, 2025

Choose a reason for hiding this comment

Uh oh!

adrian17 Mar 6, 2025

Choose a reason for hiding this comment

Uh oh!

adrian17 commented Mar 6, 2025

Uh oh!

adrian17 Mar 8, 2025

Choose a reason for hiding this comment

Uh oh!

adrian17 Mar 8, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

torokati44 commented Mar 17, 2025

Uh oh!

Uh oh!

adrian17 Mar 6, 2025 •

edited

Loading