[Git][ghc/ghc][master] Revert "rts/Interpreter: Assert that TEST*_P discriminators are valid"

Marge Bot (@marge-bot) gitlab at gitlab.haskell.org
Wed Dec 4 23:38:46 UTC 2024



Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
dd959406 by Ben Gamari at 2024-12-04T18:38:18-05:00
Revert "rts/Interpreter: Assert that TEST*_P discriminators are valid"

This assertion was based on the misconception that `GET_TAG` was
returning the pointer tag whereas it is actually returning the
constructor tag.

This reverts commit 9bf3663b9970851e7b5701d68147450272823197.

Fixes #25527.

- - - - -


1 changed file:

- rts/Interpreter.c


Changes:

=====================================
rts/Interpreter.c
=====================================
@@ -1785,7 +1785,6 @@ run_BCO:
         case bci_TESTLT_P: {
             unsigned int discr  = BCO_NEXT;
             int failto = BCO_GET_LARGE_ARG;
-            ASSERT(discr <= TAG_MASK);
             StgClosure* con = UNTAG_CLOSURE((StgClosure*)SpW(0));
             if (GET_TAG(con) >= discr) {
                 bciPtr = failto;
@@ -1796,7 +1795,6 @@ run_BCO:
         case bci_TESTEQ_P: {
             unsigned int discr  = BCO_NEXT;
             int failto = BCO_GET_LARGE_ARG;
-            ASSERT(discr <= TAG_MASK);
             StgClosure* con = UNTAG_CLOSURE((StgClosure*)SpW(0));
             if (GET_TAG(con) != discr) {
                 bciPtr = failto;



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dd95940639fd198f97fb3f44e84494eaca721788
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/20241204/e3ea66f9/attachment-0001.html>


More information about the ghc-commits mailing list