[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 3 commits: Simplifier: `countValArgs` should not count Type args (#23102)

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
559a4804 by Sebastian Graf at 2023-03-13T07:31:23-04:00
Simplifier: `countValArgs` should not count Type args (#23102)

I observed miscompilations while working on !10088 caused by this.

Fixes #23102.

Metric Decrease:
    T10421

- - - - -
536d1f90 by Matthew Pickering at 2023-03-13T14:04:49+00:00
Bump Win32 to 2.13.4.0

Updates Win32 submodule

- - - - -
06aa32c6 by Ben Gamari at 2023-03-13T15:37:01-04:00
ghc-bignum: Drop redundant include-dirs field
- - - - -


3 changed files:

- compiler/GHC/Core/Opt/Simplify/Utils.hs
- libraries/Win32
- libraries/ghc-bignum/ghc-bignum.cabal


Changes:

=====================================
compiler/GHC/Core/Opt/Simplify/Utils.hs
=====================================
@@ -553,7 +553,7 @@ countArgs _                               = 0
 
 countValArgs :: SimplCont -> Int
 -- Count value arguments only
-countValArgs (ApplyToTy  { sc_cont = cont }) = 1 + countValArgs cont
+countValArgs (ApplyToTy  { sc_cont = cont }) = countValArgs cont
 countValArgs (ApplyToVal { sc_cont = cont }) = 1 + countValArgs cont
 countValArgs (CastIt _ cont)                 = countValArgs cont
 countValArgs _                               = 0


=====================================
libraries/Win32
=====================================
@@ -1 +1 @@
-Subproject commit 931497f7052f63cb5cfd4494a94e572c5c570642
+Subproject commit efab7f1146da9741dc54fb35476d4aaabeff8d6d


=====================================
libraries/ghc-bignum/ghc-bignum.cabal
=====================================
@@ -89,8 +89,6 @@ library
   -- "ghc-bignum" and not "ghc-bignum-1.0".
   ghc-options: -this-unit-id ghc-bignum
 
-  include-dirs: include
-
   if flag(gmp)
       cpp-options: -DBIGNUM_GMP
       other-modules:



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d55dacfef2e8384761367faa5893fe38e24822ef...06aa32c662bd622c3f30e48b132c880a99ed3128

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d55dacfef2e8384761367faa5893fe38e24822ef...06aa32c662bd622c3f30e48b132c880a99ed3128
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/20230313/5265b41b/attachment-0001.html>