[Git][ghc/ghc][wip/decode_cloned_stack] Add case for CmmRetInfo to isSomeRODataLabel

Sven Tennie (@supersven) gitlab at gitlab.haskell.org
Sun Feb 12 08:51:12 UTC 2023



Sven Tennie pushed to branch wip/decode_cloned_stack at Glasgow Haskell Compiler / GHC


Commits:
82033392 by Sven Tennie at 2023-02-12T08:50:33+00:00
Add case for CmmRetInfo to isSomeRODataLabel

- - - - -


2 changed files:

- compiler/GHC/Cmm/CLabel.hs
- rts/include/Stg.h


Changes:

=====================================
compiler/GHC/Cmm/CLabel.hs
=====================================
@@ -794,6 +794,7 @@ isSomeRODataLabel (IdLabel _ _ LocalInfoTable) = True
 isSomeRODataLabel (IdLabel _ _ BlockInfoTable) = True
 -- info table defined in cmm (.cmm)
 isSomeRODataLabel (CmmLabel _ _ _ CmmInfo) = True
+isSomeRODataLabel (CmmLabel _ _ _ CmmRetInfo) = True
 isSomeRODataLabel _lbl = False
 
 -- | Whether label is points to some kind of info table


=====================================
rts/include/Stg.h
=====================================
@@ -309,7 +309,7 @@ typedef StgFunPtr       F_;
 #define EC_(X)    extern       StgWordArray (X) GNU_ATTRIBUTE(aligned (SIZEOF_VOID_P))
 #define IC_(X)    static       StgWordArray (X) GNU_ATTRIBUTE(aligned (SIZEOF_VOID_P))
 /* writable data (does not require alignment): */
-#define ERW_(X)   extern       const StgWordArray (X)
+#define ERW_(X)   extern       StgWordArray (X)
 #define IRW_(X)   static       StgWordArray (X)
 /* read-only data (does not require alignment): */
 #define ERO_(X)   extern const StgWordArray (X)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/82033392304caa9c992071a240fca07864e10855

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/82033392304caa9c992071a240fca07864e10855
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/20230212/634a506a/attachment-0001.html>


More information about the ghc-commits mailing list