[Git][ghc/ghc][wip/T23210] 2 commits: rts/Disassembler: Fix encoding of BRK_FUN instruction

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/T23210 at Glasgow Haskell Compiler / GHC


Commits:
c4db84d5 by Ben Gamari at 2024-10-14T14:54:47-04:00
rts/Disassembler: Fix encoding of BRK_FUN instruction

The offset of the CC field was not updated after the encoding change in
b85b11994e0130ff2401dd4bbdf52330e0bcf776. Fix this.

Fixes #25374.

- - - - -
211acbc2 by Ben Gamari at 2024-10-31T14:10:30-04:00
testsuite: Fix badly escaped literals

Use raw string literals to ensure that `\s` is correctly interpreted as
a character class.

- - - - -


3 changed files:

- libraries/process
- rts/Disassembler.c
- testsuite/driver/testlib.py


Changes:

=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit b8c88fb5bbdebbcbb3e7c734f0c7515dd3cef84e
+Subproject commit a53f925e3ee246e2429418b7a088ecaa0976007b


=====================================
rts/Disassembler.c
=====================================
@@ -67,7 +67,7 @@ disInstr ( StgBCO *bco, int pc )
       case bci_BRK_FUN:
          debugBelch ("BRK_FUN  " );  printPtr( ptrs[instrs[pc]] );
          debugBelch (" %d ", instrs[pc+1]); printPtr( ptrs[instrs[pc+2]] );
-         CostCentre* cc = (CostCentre*)literals[instrs[pc+3]];
+         CostCentre* cc = (CostCentre*)literals[instrs[pc+5]];
          if (cc) {
            debugBelch(" %s", cc->label);
          }


=====================================
testsuite/driver/testlib.py
=====================================
@@ -2987,12 +2987,12 @@ def normalise_prof (s: str) -> str:
     # Source locations from internal libraries, remove the source location
     # > libraries/ghc-internal/src/path/Foo.hs:204:1-18
     # => ghc-internal/src/path/Foo.hs
-    s = re.sub('\slibraries/(\S+)(:\S+){2}\s',' \\1 ', s)
+    s = re.sub(r'\slibraries/(\S+)(:\S+){2}\s', r' \1 ', s)
 
     # Source locations from internal libraries, remove the source location
     # > libraries/ghc-internal/src/path/Foo.hs::(2,1)-(5,38)
     # => ghc-internal/src/path/Foo.hs
-    s = re.sub('\slibraries/(\S+)(:\S+){1}\s',' \\1 ', s)
+    s = re.sub(r'\slibraries/(\S+)(:\S+){1}\s', r' \1 ', s)
 
     # We have something like this:
     #



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/83c0940c754a30b1654d1087e7fed0f0cdb1f0ac...211acbc27ce1d30b1fc1adb689d21dce9733e9eb

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/83c0940c754a30b1654d1087e7fed0f0cdb1f0ac...211acbc27ce1d30b1fc1adb689d21dce9733e9eb
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241031/bb08a3e7/attachment-0001.html>