Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC Commits: 070e240b by Wolfgang Jeltsch at 2026-08-07T13:55:22+03:00 Improve the normalization script - - - - - 882c3603 by Wolfgang Jeltsch at 2026-08-07T22:14:22+03:00 Fix JavaScript test output - - - - - 3 changed files: - testsuite/tests/show-bytecode/normalize - testsuite/tests/show-bytecode/show-bytecode-breakpoints.stdout-javascript-unknown-ghcjs - testsuite/tests/show-bytecode/show-bytecode-vanilla.stdout-javascript-unknown-ghcjs Changes: ===================================== testsuite/tests/show-bytecode/normalize ===================================== @@ -2,6 +2,7 @@ set -e -o pipefail +# Make the test output independent of unstable compiler-generated data stabilize () { sed -E -e ' @@ -12,15 +13,17 @@ stabilize () ' } +# Make the test output independent of the word size universalize () { sed -E -e ' - s/UInt[[:digit:]]+/UInt@word_size@/ s/W[[:digit:]]+#/W@word_size@#/ + s/UInt[[:digit:]]+/UInt@word_size@/ ' | uniq # The invocation of `uniq` is merely for collapsing adjacent entries of # `word @large_word@`, whose number may depend on the word size. } +# Run all phases stabilize | universalize ===================================== testsuite/tests/show-bytecode/show-bytecode-breakpoints.stdout-javascript-unknown-ghcjs ===================================== @@ -322,12 +322,12 @@ objects: object ‘cstrlen’: arity: 2 literals: <none> - used items: - object ‘ds1_@name_suffix@’: used items: named item ‘cstrlen1_@name_suffix@’ object ‘cstrlen1_@name_suffix@’: arity: 2 literals: <none> + used items: + object ‘ds1_@name_suffix@’: arity: 0 literals: label ‘strlen’ ===================================== testsuite/tests/show-bytecode/show-bytecode-vanilla.stdout-javascript-unknown-ghcjs ===================================== @@ -271,6 +271,10 @@ objects: named item ‘$tcNatural’ named item ‘mkTrCon’ object ‘cstrlen’: + arity: 2 + literals: <none> + used items: named item ‘cstrlen1_@name_suffix@’ + object ‘cstrlen1_@name_suffix@’: arity: 2 literals: <none> used items: @@ -324,10 +328,6 @@ objects: static-construction object ‘$tc'PerfectTree’: data constructor: TyCon lifted: yes - used items: named item ‘cstrlen1_@name_suffix@’ - object ‘cstrlen1_@name_suffix@’: - arity: 2 - literals: <none> literals: word @large_word@ word 1 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d922982b667569c414d0cfd7509fe65... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d922982b667569c414d0cfd7509fe65... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help