06 Apr '26
Simon Peyton Jones pushed to branch wip/spj-reinstallable-base at Glasgow Haskell Compiler / GHC
Commits:
1dc34b2d by Simon Peyton Jones at 2026-04-06T19:10:39+01:00
Wibbles
- - - - -
1 changed file:
- ghc/GHCi/UI.hs
Changes:
=====================================
ghc/GHCi/UI.hs
=====================================
@@ -79,7 +79,7 @@ import GHC.Types.Name
import GHC.Types.Var ( varType )
import GHC.Iface.Syntax ( showToHeader )
import GHC.Builtin.Names
-import GHC.Builtin.RdrNames( stringTyCon_RDR )
+import GHC.Builtin.RdrNames( stringTyCon_RDR, compose_RDR )
import GHC.Types.Name.Reader as RdrName ( getGRE_NameQualifier_maybes, getRdrName, greName, globalRdrEnvElts)
import GHC.Types.SrcLoc as SrcLoc
import qualified GHC.Parser.Lexer as Lexer
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1dc34b2d866f3ea5bd092fcc22953ca…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1dc34b2d866f3ea5bd092fcc22953ca…
You're receiving this email because of your account on gitlab.haskell.org.
1
0
06 Apr '26
Peter Trommler pushed to branch wip/T27135 at Glasgow Haskell Compiler / GHC
Commits:
e4467d7a by Peter Trommler at 2026-04-06T19:16:08+02:00
Change atomic_add semantics
Avoid computed value not used warning/error.
- - - - -
1 changed file:
- rts/include/stg/SMP.h
Changes:
=====================================
rts/include/stg/SMP.h
=====================================
@@ -500,7 +500,7 @@ busy_wait_nop(void)
// Relaxed atomic operations.
#define RELAXED_LOAD(ptr) atomic_load_explicit(ptr, memory_order_relaxed)
#define RELAXED_STORE(ptr,val) atomic_store_explicit(ptr, val, memory_order_relaxed)
-#define RELAXED_ADD(ptr,val) (atomic_fetch_add_explicit(ptr, val, memory_order_relaxed) + val)
+#define RELAXED_ADD(ptr,val) atomic_fetch_add_explicit(ptr, val, memory_order_relaxed)
// Acquire/release atomic operations
#define ACQUIRE_LOAD(ptr) atomic_load_explicit(ptr, memory_order_acquire)
@@ -509,7 +509,7 @@ busy_wait_nop(void)
// Sequentially consistent atomic operations
#define SEQ_CST_LOAD(ptr) atomic_load(ptr)
#define SEQ_CST_STORE(ptr,val) atomic_store(ptr, val)
-#define SEQ_CST_ADD(ptr,val) (atomic_fetch_add(ptr, val) + val)
+#define SEQ_CST_ADD(ptr,val) atomic_fetch_add(ptr, val)
// Non-atomic addition for "approximate" counters that can be lossy
#define NONATOMIC_ADD(ptr,val) RELAXED_STORE(ptr, RELAXED_LOAD(ptr) + val)
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e4467d7a472fca5b5b1be003d7e54ea…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e4467d7a472fca5b5b1be003d7e54ea…
You're receiving this email because of your account on gitlab.haskell.org.
1
0
[Git][ghc/ghc][wip/spj-reinstallable-base] 15 commits: Refactor eta-expansion in Prep
by Simon Peyton Jones (＠simonpj) 06 Apr '26
by Simon Peyton Jones (＠simonpj) 06 Apr '26
06 Apr '26
Simon Peyton Jones pushed to branch wip/spj-reinstallable-base at Glasgow Haskell Compiler / GHC
Commits:
c1fc1c44 by Simon Peyton Jones at 2026-04-03T19:56:07-04:00
Refactor eta-expansion in Prep
The Prep pass does eta-expansion but I found cases where it was
doing bad things. So I refactored and simplified it quite a bit.
In the new design
* There is no distinction between `rhs` and `body`; in particular,
lambdas can now appear anywhere, rather than just as the RHS of
a let-binding.
* This change led to a significant simplification of Prep, and
a more straightforward explanation of eta-expansion. See the new
Note [Eta expansion]
* The consequences is that CoreToStg needs to handle naked lambdas.
This is very easy; but it does need a unique supply, which forces
some simple refactoring. Having a unique supply to hand is probably
a good thing anyway.
- - - - -
21beda2c by Simon Peyton Jones at 2026-04-03T19:56:07-04:00
Clarify Note [Interesting dictionary arguments]
Ticket #26831 ended up concluding that the code for
GHC.Core.Opt.Specialise.interestingDict was good, but the
commments were a bit inadequate.
This commit improves the comments slightly.
- - - - -
3eaac1f2 by Simon Peyton Jones at 2026-04-03T19:56:07-04:00
Make inlining a bit more eager for overloaded functions
If we have
f d = ... (class-op d x y) ...
we should be eager to inline `f`, because that may change the
higher order call (class-op d x y) into a call to a statically
known function.
See the discussion on #26831.
Even though this does a bit /more/ inlining, compile times
decrease by an average of 0.4%.
Compile time changes:
DsIncompleteRecSel3(normal) 431,786,104 -2.2%
ManyAlternatives(normal) 670,883,768 -1.6%
ManyConstructors(normal) 3,758,493,832 -2.6% GOOD
MultilineStringsPerf(normal) 29,900,576 -2.8%
T14052Type(ghci) 1,047,600,848 -1.2%
T17836(normal) 392,852,328 -5.2%
T18478(normal) 442,785,768 -1.4%
T21839c(normal) 341,536,992 -14.1% GOOD
T3064(normal) 174,086,152 +5.3% BAD
T5631(normal) 506,867,800 +1.0%
hard_hole_fits(normal) 209,530,736 -1.3%
info_table_map_perf(normal) 19,523,093,184 -1.2%
parsing001(normal) 377,810,528 -1.1%
pmcOrPats(normal) 60,075,264 -0.5%
geo. mean -0.4%
minimum -14.1%
maximum +5.3%
Runtime changes
haddock.Cabal(normal) 27,351,988,792 -0.7%
haddock.base(normal) 26,997,212,560 -0.6%
haddock.compiler(normal) 219,531,332,960 -1.0%
Metric Decrease:
LinkableUsage01
ManyConstructors
T17949
T21839c
T13035
TcPlugin_RewritePerf
hard_hole_fits
Metric Increase:
T3064
- - - - -
5cbc2c82 by Matthew Pickering at 2026-04-03T19:57:02-04:00
bytecode: Add magic header/version to bytecode files
In order to avoid confusing errors when using stale interface files (ie
from an older compiler version), we add a simple header/version check
like the one for interface files.
Fixes #27068
- - - - -
d95a1936 by fendor at 2026-04-03T19:57:02-04:00
Add constants for bytecode in-memory buffer size
Introduce a common constant for the default size of the .gbc and
.bytecodelib binary buffer.
The buffer is by default set to 1 MB.
- - - - -
b822c30a by mangoiv at 2026-04-03T19:57:49-04:00
testsuite: filter stderr for static001 on darwin
This reactivates the test on x86_64 darwin as this should have been done
long ago and ignores warnings emitted by ranlib on newer version of the
darwin toolchain since they are benign. (no symbols for stub libraries)
Fixes #27116
- - - - -
28ce1f8a by Andreas Klebinger at 2026-04-03T19:58:44-04:00
Give the Data instance for ModuleName a non-bottom toConstr implementation.
I've also taken the liberty to add Note [Data.Data instances for GHC AST Types]
describing some of the uses of Data.Data I could find.
Fixes #27129
- - - - -
8ca41ffe by mangoiv at 2026-04-03T19:59:30-04:00
issue template: fix add bug label
- - - - -
3981db0c by Sylvain Henry at 2026-04-03T20:00:33-04:00
Add more canned GC functions for common register patterns (#27142)
Based on analysis of heap-check sites across the GHC compiler and Cabal,
the following patterns were not covered by existing canned GC functions
but occurred frequently enough to warrant specialisation:
stg_gc_ppppp -- 5 GC pointers
stg_gc_ip -- unboxed word + GC pointer
stg_gc_pi -- GC pointer + unboxed word
stg_gc_ii -- two unboxed words
stg_gc_bpp -- byte (I8) + two GC pointers
Adding these reduces the fraction of heap-check sites falling back to
the generic GC path from ~1.4% to ~0.4% when compiling GHC itself.
Co-Authored-By: Claude Sonnet 4.6 <noreply(a)anthropic.com>
- - - - -
d17d1435 by Matthew Pickering at 2026-04-03T20:01:19-04:00
Make home unit dependencies stored as sets
Co-authored-by: Wolfgang Jeltsch <wolfgang(a)well-typed.com>
- - - - -
92a97015 by Simon Peyton Jones at 2026-04-05T00:58:57+01:00
Add Invariant (NoTypeShadowing) to Core
This commit addresses #26868, by adding
a new invariant (NoTypeShadowing) to Core.
See Note [No type-shadowing in Core] in GHC.Core
- - - - -
8b5a5020 by Simon Peyton Jones at 2026-04-05T00:58:57+01:00
Major refactor of free-variable functions
For some time we have had two free-variable mechanims for types:
* The "FV" mechanism, embodied in GHC.Utils.FV, which worked OK, but
was fragile where eta-expansion was concerned.
* The TyCoFolder mechanism, using a one-shot EndoOS accumulator
I finally got tired of this and refactored the whole thing, thereby
addressing #27080. Now we have
* `GHC.Types.Var.FV`, which has a composable free-variable result type,
very much in the spirit of the old `FV`, but much more robust.
(It uses the "one shot trick".)
* GHC.Core.TyCo.FVs now has just one technology for free variables.
All this led to a lot of renaming.
There are couple of error-message changes. The change in T18451
makes an already-poor error message even more mysterious. But
it really needs a separate look.
We also now traverse the AST in a different order leading to a different
but still deterministic order for FVs and test output has been adjusted
accordingly.
- - - - -
4bf040c6 by sheaf at 2026-04-05T14:56:29-04:00
Add utility pprTrace_ function
This function is useful for quick debugging, as it can be added to a
where clause to pretty-print debugging information:
fooBar x y
| cond = body1
| otherwise = body2
where
!_ = pprTrace_ "fooBar" $
vcat [ text "x:" <+> ppr x
, text "y:" <+> ppr y
, text "cond:" <+> ppr cond
]
- - - - -
dde50935 by Simon Peyton Jones at 2026-04-06T14:58:58+01:00
Major patch to re-engineer known-key names
This big patch implements the New Plan for known-key names,
described in #27013.
Read the big Note [Overview of known-key names] in GHC.Types.Name
Moving more into the new mechanism [skip ci]
DOES NOT COMPILE, just work in progress
More more stuff into the new mechanism
fromString is known-key
Onward
Onward more
Add imports in ghc-internal for known-key names [skip ci]
Add known-key imports for ghc-internal [skip ci]
More [skip ci]
More
Particularly using a proxy for `toList` from the IsList class.
Add Real to known-key names [skip ci]
More....[skip ci]
Lots of Names have moved to new mechanism
BuiltinRules had KnownKeyNameKeys
Start on updating RdrName but incomplete, hence skip ci
Onward [skip ci]
Onward
Added GHC.Tc.Deriv.RdrNames as a new module
Onward
Added -fexclude-known-key-define
Wibble [skip ci]
More
.. forging ahead with KnownOccs
Onward [skip ci]
including renaming GHC.Builtin.Utils to GHC.Builtin
More and more
I think this might actually bootstrap!
- - - - -
5eeb3e86 by Simon Peyton Jones at 2026-04-06T17:25:25+01:00
Wibbles [skip ci]
- - - - -
415 changed files:
- .gitlab/issue_templates/default.md
- compiler/GHC/Builtin/Utils.hs → compiler/GHC/Builtin.hs
- compiler/GHC/Builtin/Names.hs
- compiler/GHC/Builtin/Names/TH.hs
- compiler/GHC/Builtin/PrimOps.hs
- + compiler/GHC/Builtin/RdrNames.hs
- compiler/GHC/Builtin/Types.hs
- compiler/GHC/Builtin/Types/Prim.hs
- compiler/GHC/ByteCode/Serialize.hs
- compiler/GHC/Core.hs
- compiler/GHC/Core/Coercion.hs
- compiler/GHC/Core/DataCon.hs
- compiler/GHC/Core/FVs.hs
- compiler/GHC/Core/Lint.hs
- compiler/GHC/Core/Make.hs
- compiler/GHC/Core/Opt/Arity.hs
- compiler/GHC/Core/Opt/ConstantFold.hs
- compiler/GHC/Core/Opt/DmdAnal.hs
- compiler/GHC/Core/Opt/SetLevels.hs
- compiler/GHC/Core/Opt/Specialise.hs
- compiler/GHC/Core/Ppr.hs
- compiler/GHC/Core/Rules.hs
- compiler/GHC/Core/Subst.hs
- compiler/GHC/Core/Tidy.hs
- compiler/GHC/Core/TyCo/FVs.hs
- compiler/GHC/Core/TyCo/Rep.hs
- compiler/GHC/Core/TyCo/Subst.hs
- compiler/GHC/Core/Type.hs
- compiler/GHC/Core/Unfold.hs
- compiler/GHC/Core/Unify.hs
- compiler/GHC/Core/Utils.hs
- compiler/GHC/CoreToStg.hs
- compiler/GHC/CoreToStg/Prep.hs
- compiler/GHC/Driver/Backpack.hs
- compiler/GHC/Driver/Downsweep.hs
- compiler/GHC/Driver/DynFlags.hs
- compiler/GHC/Driver/Env/KnotVars.hs
- compiler/GHC/Driver/Flags.hs
- compiler/GHC/Driver/Main.hs
- compiler/GHC/Driver/Pipeline/Execute.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Hs/Expr.hs
- compiler/GHC/Hs/Instances.hs
- compiler/GHC/Hs/Type.hs
- compiler/GHC/Hs/Utils.hs
- compiler/GHC/HsToCore.hs
- compiler/GHC/HsToCore/Arrows.hs
- compiler/GHC/HsToCore/Binds.hs
- compiler/GHC/HsToCore/Expr.hs
- compiler/GHC/HsToCore/Foreign/C.hs
- compiler/GHC/HsToCore/Foreign/JavaScript.hs
- compiler/GHC/HsToCore/Foreign/Wasm.hs
- compiler/GHC/HsToCore/ListComp.hs
- compiler/GHC/HsToCore/Match/Literal.hs
- compiler/GHC/HsToCore/Monad.hs
- compiler/GHC/HsToCore/Pmc/Desugar.hs
- compiler/GHC/HsToCore/Pmc/Solver/Types.hs
- compiler/GHC/HsToCore/Quote.hs
- compiler/GHC/HsToCore/Ticks.hs
- compiler/GHC/HsToCore/Types.hs
- compiler/GHC/Iface/Binary.hs
- compiler/GHC/Iface/Env.hs
- − compiler/GHC/Iface/Env.hs-boot
- compiler/GHC/Iface/Errors/Ppr.hs
- compiler/GHC/Iface/Errors/Types.hs
- compiler/GHC/Iface/Ext/Ast.hs
- compiler/GHC/Iface/Load.hs
- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/Iface/Tidy.hs
- compiler/GHC/Iface/Type.hs
- compiler/GHC/IfaceToCore.hs
- compiler/GHC/Linker/Loader.hs
- compiler/GHC/Parser.y
- compiler/GHC/Parser/Annotation.hs
- compiler/GHC/Parser/Header.hs
- compiler/GHC/Parser/PostProcess.hs
- compiler/GHC/Plugins.hs
- compiler/GHC/Rename/Bind.hs
- compiler/GHC/Rename/Env.hs
- compiler/GHC/Rename/Expr.hs
- compiler/GHC/Rename/Expr.hs-boot
- compiler/GHC/Rename/HsType.hs
- compiler/GHC/Rename/Lit.hs
- compiler/GHC/Rename/Module.hs
- compiler/GHC/Rename/Names.hs
- compiler/GHC/Rename/Pat.hs
- compiler/GHC/Rename/Splice.hs
- compiler/GHC/Rename/Splice.hs-boot
- compiler/GHC/Rename/Unbound.hs
- compiler/GHC/Rename/Utils.hs
- compiler/GHC/Stg/Lint.hs
- compiler/GHC/StgToCmm/DataCon.hs
- compiler/GHC/StgToCmm/Heap.hs
- compiler/GHC/Tc/Deriv.hs
- compiler/GHC/Tc/Deriv/Functor.hs
- compiler/GHC/Tc/Deriv/Generate.hs
- compiler/GHC/Tc/Deriv/Generics.hs
- compiler/GHC/Tc/Deriv/Infer.hs
- compiler/GHC/Tc/Deriv/Utils.hs
- compiler/GHC/Tc/Errors.hs
- compiler/GHC/Tc/Errors/Hole.hs
- compiler/GHC/Tc/Errors/Ppr.hs
- compiler/GHC/Tc/Gen/App.hs
- compiler/GHC/Tc/Gen/Arrow.hs
- compiler/GHC/Tc/Gen/Default.hs
- compiler/GHC/Tc/Gen/Export.hs
- compiler/GHC/Tc/Gen/Expr.hs
- compiler/GHC/Tc/Gen/HsType.hs
- compiler/GHC/Tc/Gen/Pat.hs
- compiler/GHC/Tc/Gen/Splice.hs
- compiler/GHC/Tc/Instance/Class.hs
- compiler/GHC/Tc/Instance/Family.hs
- compiler/GHC/Tc/Instance/FunDeps.hs
- compiler/GHC/Tc/Instance/Typeable.hs
- compiler/GHC/Tc/Module.hs
- compiler/GHC/Tc/Solver/Default.hs
- compiler/GHC/Tc/Solver/Monad.hs
- compiler/GHC/Tc/Solver/Solve.hs
- compiler/GHC/Tc/TyCl/Build.hs
- compiler/GHC/Tc/TyCl/Instance.hs
- compiler/GHC/Tc/TyCl/Utils.hs
- compiler/GHC/Tc/Types.hs
- compiler/GHC/Tc/Types/Constraint.hs
- compiler/GHC/Tc/Types/Evidence.hs
- compiler/GHC/Tc/Types/Origin.hs
- compiler/GHC/Tc/Utils/Env.hs
- compiler/GHC/Tc/Utils/Instantiate.hs
- compiler/GHC/Tc/Utils/Monad.hs
- compiler/GHC/Tc/Utils/TcMType.hs
- compiler/GHC/Tc/Utils/TcType.hs
- compiler/GHC/Tc/Utils/Unify.hs
- compiler/GHC/Tc/Validity.hs
- compiler/GHC/Tc/Zonk/Type.hs
- compiler/GHC/ThToHs.hs
- compiler/GHC/Types/DefaultEnv.hs
- compiler/GHC/Types/Error/Codes.hs
- compiler/GHC/Types/Hint.hs
- compiler/GHC/Types/Hint/Ppr.hs
- compiler/GHC/Types/Id.hs
- compiler/GHC/Types/Id/Info.hs
- compiler/GHC/Types/Id/Make.hs
- compiler/GHC/Types/Name.hs
- compiler/GHC/Types/Name/Cache.hs
- compiler/GHC/Types/Name/Reader.hs
- compiler/GHC/Types/Name/Set.hs
- compiler/GHC/Types/Unique.hs
- compiler/GHC/Types/Unique/FM.hs
- + compiler/GHC/Types/Var/FV.hs
- compiler/GHC/Types/Var/Set.hs
- compiler/GHC/Unit/External.hs
- compiler/GHC/Unit/Finder.hs
- compiler/GHC/Unit/Home/Graph.hs
- compiler/GHC/Unit/Module/ModSummary.hs
- compiler/GHC/Unit/State.hs
- compiler/GHC/Utils/EndoOS.hs
- − compiler/GHC/Utils/FV.hs
- compiler/GHC/Utils/Trace.hs
- compiler/Language/Haskell/Syntax/Expr.hs
- compiler/Language/Haskell/Syntax/Module/Name.hs
- compiler/ghc.cabal.in
- docs/users_guide/exts/rebindable_syntax.rst
- docs/users_guide/separate_compilation.rst
- ghc/GHCi/UI.hs
- libraries/base/base.cabal.in
- libraries/base/src/Control/Applicative.hs
- libraries/base/src/Data/Array/Byte.hs
- libraries/base/src/Data/Bifoldable1.hs
- libraries/base/src/Data/Bool.hs
- libraries/base/src/Data/Complex.hs
- libraries/base/src/Data/Enum.hs
- libraries/base/src/Data/Fixed.hs
- libraries/base/src/Data/Foldable1.hs
- libraries/base/src/Data/Functor/Classes.hs
- libraries/base/src/Data/Functor/Compose.hs
- libraries/base/src/Data/Functor/Product.hs
- libraries/base/src/Data/Functor/Sum.hs
- libraries/base/src/Data/List.hs
- libraries/base/src/Data/List/NubOrdSet.hs
- libraries/base/src/Data/Semigroup.hs
- libraries/base/src/GHC/Base.hs
- libraries/base/src/GHC/Fingerprint.hs
- + libraries/base/src/GHC/KnownKeyNames.hs
- libraries/base/src/GHC/RTS/Flags.hs
- libraries/base/src/GHC/ResponseFile.hs
- libraries/base/src/GHC/Stats.hs
- libraries/base/src/GHC/Weak/Finalize.hs
- libraries/base/src/Prelude.hs
- libraries/base/src/System/Console/GetOpt.hs
- libraries/base/src/System/Exit.hs
- libraries/base/src/System/IO/OS.hs
- libraries/base/src/System/IO/Unsafe.hs
- libraries/base/src/System/Info.hs
- libraries/base/src/System/Timeout.hs
- libraries/base/src/Text/Printf.hs
- libraries/ghc-internal/ghc-internal.cabal.in
- libraries/ghc-internal/src/GHC/Internal/AllocationLimitHandler.hs
- libraries/ghc-internal/src/GHC/Internal/Arr.hs
- libraries/ghc-internal/src/GHC/Internal/Base.hs
- libraries/ghc-internal/src/GHC/Internal/Bignum/Backend/Native.hs
- libraries/ghc-internal/src/GHC/Internal/Bignum/BigNat.hs
- libraries/ghc-internal/src/GHC/Internal/Bignum/BigNat.hs-boot
- libraries/ghc-internal/src/GHC/Internal/Bignum/Integer.hs
- libraries/ghc-internal/src/GHC/Internal/Bignum/Integer.hs-boot
- libraries/ghc-internal/src/GHC/Internal/Bignum/Natural.hs
- libraries/ghc-internal/src/GHC/Internal/Bignum/Natural.hs-boot
- libraries/ghc-internal/src/GHC/Internal/ByteOrder.hs
- libraries/ghc-internal/src/GHC/Internal/CString.hs
- libraries/ghc-internal/src/GHC/Internal/Classes.hs
- libraries/ghc-internal/src/GHC/Internal/Clock.hsc
- libraries/ghc-internal/src/GHC/Internal/ClosureTypes.hs
- libraries/ghc-internal/src/GHC/Internal/Conc/Bound.hs
- libraries/ghc-internal/src/GHC/Internal/Conc/IO.hs
- libraries/ghc-internal/src/GHC/Internal/Conc/Signal.hs
- libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Arrow.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Category.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Concurrent/MVar.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Monad.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fail.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fix.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Monad/ST/Imp.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Monad/Zip.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Bits.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Data.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Dynamic.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Either.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Functor/Const.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Functor/Identity.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Monoid.hs
- libraries/ghc-internal/src/GHC/Internal/Data/OldList.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Ord.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Proxy.hs
- libraries/ghc-internal/src/GHC/Internal/Data/STRef.hs
- libraries/ghc-internal/src/GHC/Internal/Data/String.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Traversable.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Type/Coercion.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Type/Equality.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Type/Ord.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Typeable/Internal.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Unique.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Version.hs
- libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs
- libraries/ghc-internal/src/GHC/Internal/Enum.hs
- libraries/ghc-internal/src/GHC/Internal/Enum.hs-boot
- libraries/ghc-internal/src/GHC/Internal/Environment.hs
- libraries/ghc-internal/src/GHC/Internal/Event/Control.hs
- libraries/ghc-internal/src/GHC/Internal/Event/EPoll.hsc
- libraries/ghc-internal/src/GHC/Internal/Event/IntVar.hs
- libraries/ghc-internal/src/GHC/Internal/Event/Internal.hs
- libraries/ghc-internal/src/GHC/Internal/Event/Internal/Types.hs
- libraries/ghc-internal/src/GHC/Internal/Event/Manager.hs
- libraries/ghc-internal/src/GHC/Internal/Event/Poll.hsc
- libraries/ghc-internal/src/GHC/Internal/Event/Thread.hs
- libraries/ghc-internal/src/GHC/Internal/Event/TimerManager.hs
- libraries/ghc-internal/src/GHC/Internal/Event/Unique.hs
- libraries/ghc-internal/src/GHC/Internal/Exception.hs
- libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs
- libraries/ghc-internal/src/GHC/Internal/Exception/Context.hs
- libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs
- libraries/ghc-internal/src/GHC/Internal/ExecutionStack/Internal.hsc
- libraries/ghc-internal/src/GHC/Internal/Fingerprint.hs
- libraries/ghc-internal/src/GHC/Internal/Fingerprint/Type.hs
- libraries/ghc-internal/src/GHC/Internal/Float/RealFracMethods.hs
- libraries/ghc-internal/src/GHC/Internal/Foreign/C/ConstPtr.hs
- libraries/ghc-internal/src/GHC/Internal/Foreign/C/Error.hs
- libraries/ghc-internal/src/GHC/Internal/Foreign/C/String.hs
- libraries/ghc-internal/src/GHC/Internal/Foreign/C/String/Encoding.hs
- libraries/ghc-internal/src/GHC/Internal/Foreign/ForeignPtr/Imp.hs
- libraries/ghc-internal/src/GHC/Internal/Foreign/Marshal/Alloc.hs
- libraries/ghc-internal/src/GHC/Internal/Foreign/Marshal/Array.hs
- libraries/ghc-internal/src/GHC/Internal/Foreign/Marshal/Error.hs
- libraries/ghc-internal/src/GHC/Internal/Foreign/Marshal/Utils.hs
- libraries/ghc-internal/src/GHC/Internal/Foreign/Storable.hs
- libraries/ghc-internal/src/GHC/Internal/ForeignPtr.hs
- libraries/ghc-internal/src/GHC/Internal/ForeignSrcLang.hs
- libraries/ghc-internal/src/GHC/Internal/Functor/ZipList.hs
- libraries/ghc-internal/src/GHC/Internal/GHCi/Helpers.hs
- libraries/ghc-internal/src/GHC/Internal/Generics.hs
- libraries/ghc-internal/src/GHC/Internal/Heap/Closures.hs
- libraries/ghc-internal/src/GHC/Internal/Heap/InfoTable.hsc
- libraries/ghc-internal/src/GHC/Internal/Heap/InfoTable/Types.hsc
- libraries/ghc-internal/src/GHC/Internal/Heap/InfoTableProf.hsc
- libraries/ghc-internal/src/GHC/Internal/Heap/ProfInfo/Types.hs
- libraries/ghc-internal/src/GHC/Internal/IO.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Buffer.hs
- libraries/ghc-internal/src/GHC/Internal/IO/BufferedIO.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Device.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Encoding.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Encoding/Failure.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Encoding/Iconv.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Encoding/Types.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs
- libraries/ghc-internal/src/GHC/Internal/IO/FD.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Handle/FD.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Handle/Internals.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Handle/Lock/Common.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Handle/Lock/Flock.hsc
- libraries/ghc-internal/src/GHC/Internal/IO/Handle/Lock/LinuxOFD.hsc
- libraries/ghc-internal/src/GHC/Internal/IO/Handle/Text.hs
- libraries/ghc-internal/src/GHC/Internal/IO/Handle/Types.hs
- libraries/ghc-internal/src/GHC/Internal/IO/IOMode.hs
- libraries/ghc-internal/src/GHC/Internal/IO/SubSystem.hs
- libraries/ghc-internal/src/GHC/Internal/IOArray.hs
- libraries/ghc-internal/src/GHC/Internal/InfoProv/Types.hsc
- libraries/ghc-internal/src/GHC/Internal/Int.hs
- libraries/ghc-internal/src/GHC/Internal/IsList.hs
- libraries/ghc-internal/src/GHC/Internal/Ix.hs
- libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs
- libraries/ghc-internal/src/GHC/Internal/MVar.hs
- libraries/ghc-internal/src/GHC/Internal/Magic.hs
- libraries/ghc-internal/src/GHC/Internal/Maybe.hs
- libraries/ghc-internal/src/GHC/Internal/Num.hs
- libraries/ghc-internal/src/GHC/Internal/Num.hs-boot
- libraries/ghc-internal/src/GHC/Internal/Numeric.hs
- libraries/ghc-internal/src/GHC/Internal/OverloadedLabels.hs
- libraries/ghc-internal/src/GHC/Internal/Ptr.hs
- libraries/ghc-internal/src/GHC/Internal/RTS/Flags.hsc
- libraries/ghc-internal/src/GHC/Internal/RTS/Flags/Test.hsc
- libraries/ghc-internal/src/GHC/Internal/Read.hs
- libraries/ghc-internal/src/GHC/Internal/Real.hs
- libraries/ghc-internal/src/GHC/Internal/Real.hs-boot
- libraries/ghc-internal/src/GHC/Internal/Records.hs
- libraries/ghc-internal/src/GHC/Internal/ST.hs
- libraries/ghc-internal/src/GHC/Internal/Show.hs
- libraries/ghc-internal/src/GHC/Internal/Stack.hs
- libraries/ghc-internal/src/GHC/Internal/Stack/CCS.hsc
- libraries/ghc-internal/src/GHC/Internal/Stack/CloneStack.hs
- libraries/ghc-internal/src/GHC/Internal/Stack/Decode.hs
- libraries/ghc-internal/src/GHC/Internal/Stack/Types.hs
- libraries/ghc-internal/src/GHC/Internal/StaticPtr.hs
- libraries/ghc-internal/src/GHC/Internal/StaticPtr/Internal.hs
- libraries/ghc-internal/src/GHC/Internal/Stats.hsc
- libraries/ghc-internal/src/GHC/Internal/System/Environment.hs
- libraries/ghc-internal/src/GHC/Internal/System/Environment/Blank.hsc
- libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc
- libraries/ghc-internal/src/GHC/Internal/System/IO.hs
- libraries/ghc-internal/src/GHC/Internal/System/IO/Error.hs
- libraries/ghc-internal/src/GHC/Internal/System/Posix/Internals.hs
- libraries/ghc-internal/src/GHC/Internal/TH/Lib.hs
- libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs
- libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs
- libraries/ghc-internal/src/GHC/Internal/Text/ParserCombinators/ReadP.hs
- libraries/ghc-internal/src/GHC/Internal/Text/Read.hs
- libraries/ghc-internal/src/GHC/Internal/Text/Read/Lex.hs
- libraries/ghc-internal/src/GHC/Internal/TopHandler.hs
- libraries/ghc-internal/src/GHC/Internal/Tuple.hs
- libraries/ghc-internal/src/GHC/Internal/TypeError.hs
- libraries/ghc-internal/src/GHC/Internal/TypeLits.hs
- libraries/ghc-internal/src/GHC/Internal/TypeNats.hs
- libraries/ghc-internal/src/GHC/Internal/Unicode.hs
- libraries/ghc-internal/src/GHC/Internal/Unicode/Char/DerivedCoreProperties.hs
- libraries/ghc-internal/src/GHC/Internal/Unicode/Char/UnicodeData/GeneralCategory.hs
- libraries/ghc-internal/src/GHC/Internal/Unicode/Version.hs
- libraries/ghc-internal/src/GHC/Internal/Unsafe/Coerce.hs
- libraries/ghc-internal/src/GHC/Internal/Weak/Finalize.hs
- libraries/ghc-prim/ghc-prim.cabal
- rts/HeapStackCheck.cmm
- rts/RtsSymbols.c
- rts/include/stg/MiscClosures.h
- testsuite/driver/testlib.py
- testsuite/tests/arityanal/should_compile/Arity01.stderr
- testsuite/tests/arityanal/should_compile/Arity05.stderr
- testsuite/tests/arityanal/should_compile/Arity08.stderr
- testsuite/tests/arityanal/should_compile/Arity11.stderr
- testsuite/tests/arityanal/should_compile/Arity14.stderr
- testsuite/tests/count-deps/CountDepsAst.stdout
- testsuite/tests/count-deps/CountDepsParser.stdout
- testsuite/tests/cpranal/should_compile/T18401.stderr
- testsuite/tests/deriving/should_fail/deriving-via-fail4.stderr
- testsuite/tests/driver/all.T
- testsuite/tests/driver/bytecode-object/Makefile
- testsuite/tests/driver/bytecode-object/all.T
- testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
- testsuite/tests/indexed-types/should_fail/T2693.stderr
- testsuite/tests/interface-stability/base-exports.stdout
- testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs
- testsuite/tests/interface-stability/base-exports.stdout-mingw32
- testsuite/tests/interface-stability/base-exports.stdout-ws-32
- testsuite/tests/parser/should_fail/T16270h.hs
- testsuite/tests/partial-sigs/should_compile/T10403.stderr
- testsuite/tests/partial-sigs/should_compile/T12844.stderr
- testsuite/tests/partial-sigs/should_compile/T15039a.stderr
- testsuite/tests/partial-sigs/should_compile/T15039b.stderr
- testsuite/tests/partial-sigs/should_compile/T15039c.stderr
- testsuite/tests/partial-sigs/should_compile/T15039d.stderr
- testsuite/tests/partial-sigs/should_fail/T10999.stderr
- testsuite/tests/partial-sigs/should_fail/T12634.stderr
- testsuite/tests/polykinds/T15789.stderr
- testsuite/tests/polykinds/T18451.stderr
- testsuite/tests/polykinds/T7328.stderr
- testsuite/tests/simplCore/should_compile/DsSpecPragmas.stderr
- testsuite/tests/simplCore/should_compile/T15205.stderr
- testsuite/tests/simplCore/should_compile/T24229a.stderr
- testsuite/tests/simplCore/should_compile/T24229b.stderr
- testsuite/tests/simplCore/should_compile/T24359a.stderr
- testsuite/tests/simplCore/should_compile/T26116.stderr
- testsuite/tests/simplCore/should_compile/T4908.stderr
- testsuite/tests/simplCore/should_compile/spec-inline.stderr
- testsuite/tests/typecheck/no_skolem_info/T20063.stderr
- testsuite/tests/typecheck/should_compile/T25180.stderr
- testsuite/tests/typecheck/should_compile/free_monad_hole_fits.stderr
- testsuite/tests/typecheck/should_fail/T10971d.stderr
- testsuite/tests/typecheck/should_fail/T12589.stderr
- testsuite/tests/typecheck/should_fail/T13311.stderr
- testsuite/tests/typecheck/should_fail/T17773.stderr
- testsuite/tests/typecheck/should_fail/T2846b.stderr
- testsuite/tests/typecheck/should_fail/T7851.stderr
- testsuite/tests/typecheck/should_fail/T8603.stderr
- testsuite/tests/wasm/should_run/control-flow/LoadCmmGroup.hs
- utils/haddock/haddock-api/src/Haddock/GhcUtils.hs
- utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs
- utils/haddock/haddock-api/src/Haddock/Types.hs
The diff was not included because it is too large.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/667ee7bdcc7bce865b9c33b2e4c27e…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/667ee7bdcc7bce865b9c33b2e4c27e…
You're receiving this email because of your account on gitlab.haskell.org.
1
0
Simon Peyton Jones pushed to branch wip/T26989 at Glasgow Haskell Compiler / GHC
Commits:
ba07cdb9 by Simon Peyton Jones at 2026-04-06T17:23:15+01:00
Wibbles [skip ci]
- - - - -
2 changed files:
- compiler/GHC/Core/Opt/Simplify/Iteration.hs
- compiler/GHC/Core/Opt/Simplify/Utils.hs
Changes:
=====================================
compiler/GHC/Core/Opt/Simplify/Iteration.hs
=====================================
@@ -2269,7 +2269,7 @@ simplInId :: SimplEnv -> InId -> SimplCont -> SimplM (SimplFloats, OutExpr)
simplInId env var cont
| Just dc <- isDataConWorkId_maybe var
, isLazyDataConRep dc -- See Note [Fast path for lazy data constructors]
- = rebuild zapped_env (Var var) cont
+ = rebuild_go zapped_env (Var var) cont
| otherwise
= case substId env var of
ContEx tvs cvs ids e -> simplExprF env' e cont
@@ -2282,12 +2282,24 @@ simplInId env var cont
where
cont' = trimJoinCont out_id (idJoinPointHood out_id) cont
- DoneEx e mb_join -> simplExprF zapped_env e cont'
+ DoneEx e mb_join -> simplOutExpr zapped_env e cont'
where
cont' = trimJoinCont var mb_join cont
where
zapped_env = zapSubstEnv env -- See Note [zapSubstEnv]
+
+---------------------------------------------------------
+simplOutExpr :: SimplEnvIS -> OutExpr -> SimplCont -> SimplM (SimplFloats, OutExpr)
+simplOutExpr env expr cont
+ = case fun of
+ Var v -> simplOutId env v cont'
+ Lam {} | not (null args) -> simplLam env fun cont' -- We have a beta-redex
+ _ -> rebuild_go env expr cont
+ where
+ (fun, args) <- collectArgs expr
+ cont' = pushArgs env Simplified (expType fun) args cont
+
---------------------------------------------------------
simplOutId :: SimplEnvIS -> OutId -> SimplCont -> SimplM (SimplFloats, OutExpr)
@@ -2338,7 +2350,7 @@ simplOutId env fun cont
; let rr' = getRuntimeRep new_runrw_res_ty
call' = mkApps (Var fun) [mkTyArg rr', mkTyArg new_runrw_res_ty, arg']
- ; rebuild env call' outer_cont }
+ ; rebuild_go env call' outer_cont }
-- Normal case for (f e1 .. en)
simplOutId env fun cont
@@ -2351,8 +2363,9 @@ simplOutId env fun cont
then tryRules env rules_for_me fun out_args
else return Nothing
; case mb_match of {
- Just (rule_arity, rhs) -> simplExprF env rhs $
- dropContArgs rule_arity cont ;
+ Just (rule_arity, rhs, rhs_args ) -> simplExprF env rhs $
+ pushArgs env NoDup rhs_args $
+ dropContArgs rule_arity cont ;
Nothing ->
-- Try inlining
@@ -2444,8 +2457,10 @@ rebuildCall env (ArgInfo { ai_fun = fun, ai_args = rev_args, ai_rules = rules })
= do { let args = reverse rev_args
; mb_match <- tryRules env rules fun (map argSpecArg args)
; case mb_match of
- Just (rule_arity, rhs) -> simplExprF env rhs $
- pushSimplifiedArgs env (drop rule_arity args) cont
+ Just (rule_arity, rhs, rhs_args)
+ -> simplExprF env rhs $
+ pushArgs env Simplified rhs_args $
+ pushArgSpecs env (drop rule_arity args) cont
Nothing -> rebuild env (argInfoExpr fun rev_args) cont }
-----------------------------------
@@ -2707,10 +2722,11 @@ trySeqRules in_env scrut rhs cont
; let seq_rules = getRules rule_base seqId
; mb_match <- tryRules in_env seq_rules seqId out_args
; case mb_match of
- Nothing -> return Nothing
- Just (rule_arity, rhs) -> return (Just (rhs, cont'))
+ Nothing -> return Nothing
+ Just (rule_arity, rhs, rhs_args) -> return (Just (rhs, cont'))
where
- cont' = pushSimplifiedArgs in_env (drop rule_arity out_arg_specs) rule_cont
+ cont' = pushArgs in_env Simplified rhs_args $
+ pushArgSpecs in_env (drop rule_arity out_arg_specs) rule_cont
}
where
no_cast_scrut = drop_casts scrut
@@ -3217,7 +3233,7 @@ reallyRebuildCase env scrut case_bndr alts cont
-- Note [Case-of-case and full laziness]
= do { case_expr <- simplAlts env scrut case_bndr alts
(mkBoringStop (contHoleType cont))
- ; rebuild (zapSubstEnv env) case_expr cont }
+ ; rebuild env case_expr cont }
| otherwise
= do { (floats, env', cont') <- mkDupableCaseCont env alts cont
=====================================
compiler/GHC/Core/Opt/Simplify/Utils.hs
=====================================
@@ -22,7 +22,7 @@ module GHC.Core.Opt.Simplify.Utils (
-- The continuation type
SimplCont(..), DupFlag(..), FromWhat(..), StaticEnv,
- isSimplified, contIsStop,
+ isSimplified, contIsStop, contHasArgs,
contIsDupable, contResultType, contHoleType, contHoleScaling,
contIsTrivial, contArgs, contIsRhs,
countArgs, contOutArgs, dropContArgs,
@@ -33,7 +33,7 @@ module GHC.Core.Opt.Simplify.Utils (
ArgInfo(..), ArgSpec(..), mkArgInfo,
addValArgTo, addTyArgTo,
argInfoExpr, argSpecArg,
- pushSimplifiedArgs,
+ pushSimplifiedArgs, pushArgSpecs,
isStrictArgInfo, lazyArgContext,
abstractFloats,
@@ -384,16 +384,29 @@ isStrictArgInfo (ArgInfo { ai_dmds = dmds })
| dmd:_ <- dmds = isStrUsedDmd dmd
| otherwise = False
-pushSimplifiedArgs :: SimplEnv
- -> [ArgSpec] -- In normal, forward order
- -> SimplCont -> SimplCont
-pushSimplifiedArgs env args cont = foldr (pushSimplifiedArg env) cont args
+pushArgs :: SimplEnvIS -> DupFlag -> Type -> [OutExpr] -> SimplCont -> SimplCont
+pushArgs _env _dup _fun_ty [] cont
+ = cont
+pushArgs env dup fun_ty (arg:args) cont
+ | Type ty <- arg
+ = ApplyToType { sc_hole_ty = fun_ty
+ , sc_arg_ty = ty, sc_env = env
+ , sc_cont = pushArgs env dup (piResultTy fun_ty ty) args }
+ | otherwise
+ = ApplyToVal { sc_dup = dup, sc_hole_ty = fun_ty
+ , sc_arg = arg, sc_env = env
+ , sc_cont = pushArgs env dup (funResultTy fun_ty) args }
+
+pushArgSpecs :: SimplEnvIS -- Barely needed, since sc_dup = Simplified
+ -> [ArgSpec] -- In normal, forward order
+ -> SimplCont -> SimplCont
+pushArgSpecs env args cont = foldr (pushArgSpec env) cont args
-- pushSimplifiedRevArgs env args cont = foldl' (\k a -> pushSimplifiedArg env a k) cont args
-pushSimplifiedArg :: SimplEnv -> ArgSpec -> SimplCont -> SimplCont
-pushSimplifiedArg _env (TyArg { as_arg_ty = arg_ty, as_hole_ty = hole_ty }) cont
+pushArgSpec :: SimplEnvIS -> ArgSpec -> SimplCont -> SimplCont
+pushArgSpec _env (TyArg { as_arg_ty = arg_ty, as_hole_ty = hole_ty }) cont
= ApplyToTy { sc_arg_ty = arg_ty, sc_hole_ty = hole_ty, sc_cont = cont }
-pushSimplifiedArg env (ValArg { as_arg = arg, as_hole_ty = hole_ty }) cont
+pushArgSpec env (ValArg { as_arg = arg, as_hole_ty = hole_ty }) cont
= ApplyToVal { sc_arg = arg, sc_env = env, sc_dup = Simplified
-- The SubstEnv will be ignored since sc_dup=Simplified
, sc_hole_ty = hole_ty, sc_cont = cont }
@@ -438,6 +451,11 @@ contIsRhs (Stop _ (RhsCtxt is_rec) _) = Just is_rec
contIsRhs (CastIt { sc_cont = k }) = contIsRhs k -- For f = e |> co, treat e as Rhs context
contIsRhs _ = Nothing
+-------------------
+contHasArgs (ApplyToTy {}) = True
+contHasArgs (ApplyToVal {}) = True
+contHasArgs _ = False
+
-------------------
contIsStop :: SimplCont -> Bool
contIsStop (Stop {}) = True
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ba07cdb9f50e5416089fc8aceec24d8…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ba07cdb9f50e5416089fc8aceec24d8…
You're receiving this email because of your account on gitlab.haskell.org.
1
0
06 Apr '26
Apoorv Ingle pushed to branch wip/T27154 at Glasgow Haskell Compiler / GHC
Commits:
8cbe3cd9 by Apoorv Ingle at 2026-04-06T10:44:05-05:00
remove Panic module from Tc.Gen.App
- - - - -
1 changed file:
- compiler/GHC/Tc/Gen/Head.hs
Changes:
=====================================
compiler/GHC/Tc/Gen/Head.hs
=====================================
@@ -68,7 +68,6 @@ import GHC.Builtin.Names
import GHC.Driver.DynFlags
import GHC.Utils.Misc
import GHC.Utils.Outputable as Outputable
-import GHC.Utils.Panic
import GHC.Data.Maybe
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8cbe3cd9ae692a62db3eb55b425e3c2…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8cbe3cd9ae692a62db3eb55b425e3c2…
You're receiving this email because of your account on gitlab.haskell.org.
1
0
[Git][ghc/ghc][wip/supersven/correctly_propagate_host-build-target] ci: Define USER_CONF_CC_OPTS_STAGE2 for aarch64/mingw
by Sven Tennie (＠supersven) 06 Apr '26
by Sven Tennie (＠supersven) 06 Apr '26
06 Apr '26
Sven Tennie pushed to branch wip/supersven/correctly_propagate_host-build-target at Glasgow Haskell Compiler / GHC
Commits:
94a9852e by Sven Tennie at 2026-04-06T17:23:12+02:00
ci: Define USER_CONF_CC_OPTS_STAGE2 for aarch64/mingw
ghc-toolchain doesn't see $CONF_CC_OPTS_STAGE2 when the bindist gets
configured. So, the hack to override the compiler gets lost.
- - - - -
2 changed files:
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
Changes:
=====================================
.gitlab/generate-ci/gen_ci.hs
=====================================
@@ -1316,6 +1316,13 @@ cross_jobs = [
-- unexpected triple.
. setVariable "CFLAGS" cflags
. setVariable "CONF_CC_OPTS_STAGE2" cflags
+ -- For bindists `$USER_CONF_CC_OPTS_STAGE2` is not automatically set
+ -- to `$CONF_CC_OPTS_STAGE2`. But, we still have to deal with the hack
+ -- mentioned in the previous comment.
+ --
+ -- TODO: It would be nice to get rid of this hack. This would probably
+ -- involve setting the toolchain up in a different way.
+ . setVariable "USER_CONF_CC_OPTS_STAGE2" cflags
) where
llvm_prefix = "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-"
cflags = "-fuse-ld=" ++ llvm_prefix ++ "ld --rtlib=compiler-rt"
=====================================
.gitlab/jobs.yaml
=====================================
@@ -331,6 +331,7 @@
"STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
"STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
"TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate",
+ "USER_CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
"WindresCmd": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-windres"
}
},
@@ -412,6 +413,7 @@
"STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
"STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
"TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm",
+ "USER_CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
"WindresCmd": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-windres"
}
},
@@ -1123,6 +1125,7 @@
"STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
"STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
"TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate",
+ "USER_CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
"WindresCmd": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-windres",
"XZ_OPT": "-9"
}
@@ -1205,6 +1208,7 @@
"STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
"STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
"TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm",
+ "USER_CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
"WindresCmd": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-windres",
"XZ_OPT": "-9"
}
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/94a9852eb07f9feca745e33b37eae4d…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/94a9852eb07f9feca745e33b37eae4d…
You're receiving this email because of your account on gitlab.haskell.org.
1
0
Simon Peyton Jones pushed new branch wip/T27154 at Glasgow Haskell Compiler / GHC
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/T27154
You're receiving this email because of your account on gitlab.haskell.org.
1
0
[Git][ghc/ghc][wip/T27078] Kill off the substitution in Lint
by Simon Peyton Jones (＠simonpj) 06 Apr '26
by Simon Peyton Jones (＠simonpj) 06 Apr '26
06 Apr '26
Simon Peyton Jones pushed to branch wip/T27078 at Glasgow Haskell Compiler / GHC
Commits:
b97d30eb by Simon Peyton Jones at 2026-04-06T11:14:51+01:00
Kill off the substitution in Lint
Now that we have invariant (NoTypeShadowing) we no longer
need Lint to carry an ambient substitution. This makes it
simpler and faster. A really worthwhile refactor.
There are some knock-on effects
* Linting join points after worker/wrapper. See
Note [Join points and beta redexes]
* Running a type substitution after the desugarer.
See Note [Substituting type-lets] in
the new module GHC.Core.SubstTypeLets
Implements #27078
Most perf tests don't use Lint so we won't see a perf incresae.
But T1969 improves a bit for some reason.
Metric Decrease:
T1969
- - - - -
9 changed files:
- compiler/GHC/Core/Lint.hs
- compiler/GHC/Core/Opt/OccurAnal.hs
- compiler/GHC/Core/Opt/WorkWrap/Utils.hs
- compiler/GHC/Core/Subst.hs
- + compiler/GHC/Core/SubstTypeLets.hs
- compiler/GHC/Driver/Config/Core/Lint.hs
- compiler/ghc.cabal.in
- testsuite/tests/corelint/LintEtaExpand.stderr
- testsuite/tests/corelint/T21115b.stderr
Changes:
=====================================
compiler/GHC/Core/Lint.hs
=====================================
@@ -46,6 +46,7 @@ import GHC.Core.FVs
import GHC.Core.Utils
import GHC.Core.Stats ( coreBindsStats )
import GHC.Core.DataCon
+import GHC.Core.SubstTypeLets( substTypeLets )
import GHC.Core.Ppr
import GHC.Core.Coercion
import GHC.Core.Type as Type
@@ -178,65 +179,7 @@ Note [Linting function types]
All saturated applications of funTyCon are represented with the FunTy constructor.
See Note [Function type constructors and FunTy] in GHC.Builtin.Types.Prim
- We check this invariant in lintType.
-
-Note [Linting type lets]
-~~~~~~~~~~~~~~~~~~~~~~~~
-In the desugarer, it's very very convenient to be able to say (in effect)
- let a = Type Bool in
- let x::a = True in <body>
-That is, use a type let. See Note [Core type and coercion invariant] in "GHC.Core".
-One place it is used is in mkWwBodies; see Note [Join points and beta-redexes]
-in GHC.Core.Opt.WorkWrap.Utils. (Maybe there are other "clients" of this feature; I'm not sure).
-
-* Hence when linting <body> we need to remember that a=Int, else we
- might reject a correct program. So we carry a type substitution (in
- this example [a -> Bool]) and apply this substitution before
- comparing types. In effect, in Lint, type equality is always
- equality-modulo-le-subst. This is in the le_subst field of
- LintEnv. But nota bene:
-
- (SI1) The le_subst substitution is applied to types and coercions only
-
- (SI2) The result of that substitution is used only to check for type
- equality, to check well-typed-ness, /but is then discarded/.
- The result of substitution does not outlive the CoreLint pass.
-
- (SI3) The InScopeSet of le_subst includes only TyVar and CoVar binders.
-
-* The function
- lintInTy :: Type -> LintM (Type, Kind)
- returns a substituted type.
-
-* When we encounter a binder (like x::a) we must apply the substitution
- to the type of the binding variable. lintBinders does this.
-
-* Clearly we need to clone tyvar binders as we go.
-
-* But take care (#17590)! We must also clone CoVar binders:
- let a = TYPE (ty |> cv)
- in \cv -> blah
- blindly substituting for `a` might capture `cv`.
-
-* Alas, when cloning a coercion variable we might choose a unique
- that happens to clash with an inner Id, thus
- \cv_66 -> let wild_X7 = blah in blah
- We decide to clone `cv_66` because it's already in scope. Fine,
- choose a new unique. Aha, X7 looks good. So we check the lambda
- body with le_subst of [cv_66 :-> cv_X7]
-
- This is all fine, even though we use the same unique as wild_X7.
- As (SI2) says, we do /not/ return a new lambda
- (\cv_X7 -> let wild_X7 = blah in ...)
- We simply use the le_subst substitution in types/coercions only, when
- checking for equality.
-
-* We still need to check that Id occurrences are bound by some
- enclosing binding. We do /not/ use the InScopeSet for the le_subst
- for this purpose -- it contains only TyCoVars. Instead we have a separate
- le_ids for the in-scope Id binders.
-
-Sigh. We might want to explore getting rid of type-let!
+We check this invariant in lintType.
Note [Bad unsafe coercion]
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -311,6 +254,7 @@ path does not result in allocation in the hot path. This can be surprisingly
impactful. Changing `lint_app` reduced allocations for one test program I was
looking at by ~4%.
+
************************************************************************
* *
Beginning and ending passes
@@ -407,26 +351,37 @@ data LintPassResultConfig = LintPassResultConfig
, lpr_platform :: !Platform
, lpr_makeLintFlags :: !LintFlags
, lpr_passPpr :: !SDoc
+ , lpr_preSubst :: !Bool -- True <=> run substTypeLets before linting
+ -- See Note [Substituting type-lets]
, lpr_localsInScope :: ![Var]
}
lintPassResult :: Logger -> LintPassResultConfig
-> CoreProgram -> IO ()
lintPassResult logger cfg binds
- = do { let warns_and_errs = lintCoreBindings'
- (LintConfig
+ = do { let lint_config = LintConfig
{ l_diagOpts = lpr_diagOpts cfg
, l_platform = lpr_platform cfg
, l_flags = lpr_makeLintFlags cfg
, l_vars = lpr_localsInScope cfg
- })
- binds
+ }
+
+ -- Do the pre-substitution if necessary
+ -- See Note [Substituting type-lets] in GHC.Core.SubstTypeLets
+ -- especially wrinkle (STL2)
+ ; let binds1 | lpr_preSubst cfg = substTypeLets binds
+ | otherwise = binds
+
+ -- Do the main Lint pass itself
+ ; let warns_and_errs = lintCoreBindings' lint_config binds1
+
+ -- Report the results
; Err.showPass logger $
"Core Linted result of " ++
renderWithContext defaultSDocContext (lpr_passPpr cfg)
; displayLintResults logger
(lpr_passPpr cfg)
- (pprCoreBindings binds) warns_and_errs
+ (pprCoreBindings binds1) warns_and_errs
}
displayLintResults :: Logger
@@ -472,8 +427,7 @@ lintCoreBindings' cfg binds
; checkL (null ext_dups) (dupExtVars ext_dups)
-- Typecheck the bindings
- ; lintRecBindings TopLevel all_pairs $ \_ ->
- return () }
+ ; lintRecBindings TopLevel all_pairs $ return () }
where
all_pairs = flattenBinds binds
-- Put all the top-level binders in scope at the start
@@ -555,11 +509,11 @@ Check a core binding, returning the list of variables bound.
-- Let
lintRecBindings :: TopLevelFlag -> [(Id, CoreExpr)]
- -> ([OutId] -> LintM a) -> LintM (a, [UsageEnv])
+ -> LintM a -> LintM (a, [UsageEnv])
lintRecBindings top_lvl pairs thing_inside
- = lintIdBndrs top_lvl bndrs $ \ bndrs' ->
- do { ues <- zipWithM lint_pair bndrs' rhss
- ; a <- thing_inside bndrs'
+ = lintIdBndrs top_lvl bndrs $
+ do { ues <- zipWithM lint_pair bndrs rhss
+ ; a <- thing_inside
; return (a, ues) }
where
(bndrs, rhss) = unzip pairs
@@ -569,14 +523,14 @@ lintRecBindings top_lvl pairs thing_inside
; lintLetBind top_lvl Recursive bndr' rhs rhs_ty
; return ue }
-lintLetBody :: LintLocInfo -> [OutId] -> CoreExpr -> LintM (OutType, UsageEnv)
+lintLetBody :: LintLocInfo -> [Id] -> CoreExpr -> LintM (Type, UsageEnv)
lintLetBody loc bndrs body
= do { (body_ty, body_ue) <- addLoc loc (lintCoreExpr body)
; mapM_ (lintJoinBndrType body_ty) bndrs
; return (body_ty, body_ue) }
-lintLetBind :: TopLevelFlag -> RecFlag -> OutId
- -> CoreExpr -> OutType -> LintM ()
+lintLetBind :: TopLevelFlag -> RecFlag -> Id
+ -> CoreExpr -> Type -> LintM ()
-- Binder's type, and the RHS, have already been linted
-- This function checks other invariants
lintLetBind top_lvl rec_flag binder rhs rhs_ty
@@ -667,7 +621,7 @@ lintLetBind top_lvl rec_flag binder rhs rhs_ty
-- join point.
--
-- See Note [Checking StaticPtrs].
-lintRhs :: Id -> CoreExpr -> LintM (OutType, UsageEnv)
+lintRhs :: Id -> CoreExpr -> LintM (Type, UsageEnv)
-- NB: the Id can be Linted or not -- it's only used for
-- its OccInfo and join-pointer-hood
lintRhs bndr rhs
@@ -682,7 +636,7 @@ lintRhs _bndr rhs = fmap lf_check_static_ptrs getLintFlags >>= go
where
-- Allow occurrences of 'makeStatic' at the top-level but produce errors
-- otherwise.
- go :: StaticPtrCheck -> LintM (OutType, UsageEnv)
+ go :: StaticPtrCheck -> LintM (Type, UsageEnv)
go AllowAtTopLevel
| (binders0, rhs') <- collectTyBinders rhs
, Just (fun, t, info, e) <- collectMakeStaticArgs rhs'
@@ -699,7 +653,7 @@ lintRhs _bndr rhs = fmap lf_check_static_ptrs getLintFlags >>= go
-- | Lint the RHS of a join point with expected join arity of @n@ (see Note
-- [Join points] in "GHC.Core").
-lintJoinLams :: JoinArity -> Maybe Id -> CoreExpr -> LintM (OutType, UsageEnv)
+lintJoinLams :: JoinArity -> Maybe Id -> CoreExpr -> LintM (Type, UsageEnv)
lintJoinLams join_arity enforce rhs
= go join_arity rhs
where
@@ -887,13 +841,8 @@ suspicious and worth investigating if you have a seg-fault or bizarre behaviour.
************************************************************************
-}
-lintCoreExpr :: InExpr -> LintM (OutType, UsageEnv)
--- The returned type has the substitution from the monad
--- already applied to it:
--- lintCoreExpr e subst = exprType (subst e)
---
--- The returned "type" can be a kind, if the expression is (Type ty)
-
+lintCoreExpr :: CoreExpr -> LintM (Type, UsageEnv)
+-- The returned type is the type of the expression
-- If you edit this function, you may need to update the GHC formalism
-- See Note [GHC Formalism]
@@ -920,7 +869,7 @@ lintCoreExpr (Cast expr co)
; lintCoercion co
; lintRole co Representational (coercionRole co)
- ; Pair from_ty to_ty <- substCoKindM co
+ ; let Pair from_ty to_ty = coercionKind co
; checkValueType (typeKind to_ty) $
text "target of cast" <+> quotes (ppr co)
; ensureEqTys from_ty expr_ty (mkCastErr expr co from_ty expr_ty)
@@ -934,15 +883,10 @@ lintCoreExpr (Tick tickish expr)
lintCoreExpr (Let (NonRec tv (Type ty)) body)
| isTyVar tv
- = -- See Note [Linting type lets]
- do { ty' <- lintTypeAndSubst ty
- ; lintTyCoBndr tv $ \ tv' ->
- do { addLoc (RhsOf tv) $ lintTyKind tv' ty'
- -- Now extend the substitution so we
- -- take advantage of it in the body
- ; extendTvSubstL tv ty' $
- addLoc (BodyOfLet tv) $
- lintCoreExpr body } }
+ = do { lintType ty
+ ; lintTyCoBndr tv $
+ do { addLoc (RhsOf tv) $ lintTyKind tv ty
+ ; addLoc (BodyOfLet tv) $ lintCoreExpr body } }
lintCoreExpr (Let (NonRec bndr rhs) body)
| isId bndr
@@ -951,10 +895,10 @@ lintCoreExpr (Let (NonRec bndr rhs) body)
-- See Note [Multiplicity of let binders] in Var
-- Now lint the binder
- ; lintBinder LetBind bndr $ \bndr' ->
- do { lintLetBind NotTopLevel NonRecursive bndr' rhs rhs_ty
- ; addAliasUE bndr' let_ue $
- lintLetBody (BodyOfLet bndr') [bndr'] body } }
+ ; lintBinder LetBind bndr $
+ do { lintLetBind NotTopLevel NonRecursive bndr rhs rhs_ty
+ ; addAliasUE bndr let_ue $
+ lintLetBody (BodyOfLet bndr) [bndr] body } }
| otherwise
= failWithL (mkLetErr bndr rhs) -- Not quite accurate
@@ -973,8 +917,8 @@ lintCoreExpr e@(Let (Rec pairs) body)
-- See Note [Multiplicity of let binders] in Var
; ((body_type, body_ue), ues) <-
- lintRecBindings NotTopLevel pairs $ \ bndrs' ->
- lintLetBody (BodyOfLetRec bndrs') bndrs' body
+ lintRecBindings NotTopLevel pairs $
+ lintLetBody (BodyOfLetRec bndrs) bndrs body
; return (body_type, body_ue `addUE` scaleUE ManyTy (foldr1WithDefault zeroUE addUE ues)) }
where
bndrs = map fst pairs
@@ -986,7 +930,7 @@ lintCoreExpr e@(App _ _)
-- N.B. we may have an over-saturated application of the form:
-- runRW (\s -> \x -> ...) y
, ty_arg1 : ty_arg2 : cont_arg : rest <- args
- = do { let lint_rw_cont :: CoreArg -> Mult -> UsageEnv -> LintM (OutType, UsageEnv)
+ = do { let lint_rw_cont :: CoreArg -> Mult -> UsageEnv -> LintM (Type, UsageEnv)
lint_rw_cont expr@(Lam _ _) mult fun_ue
= do { (arg_ty, arg_ue) <- lintJoinLams 1 (Just fun) expr
; let app_ue = addUE fun_ue (scaleUE mult arg_ue)
@@ -1036,74 +980,73 @@ lintCoreExpr (Type ty)
lintCoreExpr (Coercion co)
-- See Note [Coercions in terms]
= do { addLoc (InCo co) $ lintCoercion co
- ; ty <- substTyM (coercionType co)
+ ; let ty = coercionType co
; return (ty, zeroUE) }
----------------------
-lintIdOcc :: InId -> Int -- Number of arguments (type or value) being passed
- -> LintM (OutType, UsageEnv) -- returns type of the *variable*
-lintIdOcc in_id nargs
- = addLoc (OccOf in_id) $
- do { checkL (isNonCoVarId in_id)
- (text "Non term variable" <+> ppr in_id)
+lintIdOcc :: Id -> Int -- Number of arguments (type or value) being passed
+ -> LintM (Type, UsageEnv) -- returns type of the *variable*
+lintIdOcc id nargs
+ = addLoc (OccOf id) $
+ do { checkL (isNonCoVarId id)
+ (text "Non term variable" <+> ppr id)
-- See GHC.Core Note [Variable occurrences in Core]
- -- Check that the type of the occurrence is the same
- -- as the type of the binding site. The inScopeIds are
- -- /un-substituted/, so this checks that the occurrence type
- -- is identical to the binder type.
- -- This makes things much easier for things like:
- -- /\a. \(x::Maybe a). /\a. ...(x::Maybe a)...
- -- The "::Maybe a" on the occurrence is referring to the /outer/ a.
- -- If we compared /substituted/ types we'd risk comparing
- -- (Maybe a) from the binding site with bogus (Maybe a1) from
- -- the occurrence site. Comparing un-substituted types finesses
- -- this altogether
- ; out_ty <- lintVarOcc in_id
+ ; lintVarOcc id
-- Check for a nested occurrence of the StaticPtr constructor.
-- See Note [Checking StaticPtrs].
; when (nargs /= 0) $
- checkL (idName in_id /= makeStaticName) $
+ checkL (idName id /= makeStaticName) $
text "Found makeStatic nested in an expression"
- ; checkDeadIdOcc in_id
+ ; checkDeadIdOcc id
- ; case isDataConId_maybe in_id of
+ ; case isDataConId_maybe id of
Nothing -> return ()
Just dc -> checkTypeDataConOcc "expression" dc
- ; checkJoinOcc in_id nargs
- ; usage <- varCallSiteUsage in_id
-
- ; return (out_ty, usage) }
+ ; checkJoinOcc id nargs
+ ; usage <- varCallSiteUsage id
+ ; return (idType id, usage) }
+------------------
lintCoreFun :: CoreExpr
- -> Int -- Number of arguments (type or val) being passed
- -> LintM (OutType, UsageEnv) -- Returns type of the *function*
+ -> Int -- Number of arguments (type or val) being passed
+ -> LintM (Type, UsageEnv) -- Returns type of the *function*
lintCoreFun (Var var) nargs
= lintIdOcc var nargs
lintCoreFun (Lam var body) nargs
- -- Act like lintCoreExpr of Lam, but *don't* call markAllJoinsBad;
- -- See Note [Beta redexes]
+ -- Act like lintCoreExpr of Lam, but *don't* necessarily call markAllJoinsBad;
+ -- See Note [Join points and beta-redexes]
| nargs /= 0
= lintLambda var $ lintCoreFun body (nargs - 1)
lintCoreFun expr nargs
- = markAllJoinsBadIf (nargs /= 0) $
- -- See Note [Join points are less general than the paper]
- lintCoreExpr expr
+ = do { mark_bad_joins
+ <- if nargs == 0
+ then -- Saturated lambda
+ -- See Note [Join points and beta-redexes]
+ do { flags <- getLintFlags
+ ; return (not (lf_allow_beta_joins flags)) }
+ else -- Something else
+ -- See Note [Join points are less general than the paper]
+ return True
+
+ ; markAllJoinsBadIf mark_bad_joins $
+ lintCoreExpr expr }
+
------------------
lintLambda :: Var -> LintM (Type, UsageEnv) -> LintM (Type, UsageEnv)
lintLambda var lintBody =
addLoc (LambdaBodyOf var) $
- lintBinder LambdaBind var $ \ var' ->
+ lintBinder LambdaBind var $
do { (body_ty, ue) <- lintBody
- ; ue' <- checkLinearity ue var'
- ; return (mkLamType var' body_ty, ue') }
+ ; ue' <- checkLinearity ue var
+ ; return (mkLamType var body_ty, ue') }
------------------
checkDeadIdOcc :: Id -> LintM ()
-- Occurrences of an Id should never be dead....
@@ -1117,8 +1060,8 @@ checkDeadIdOcc id
= return ()
------------------
-lintJoinBndrType :: OutType -- Type of the body
- -> OutId -- Possibly a join Id
+lintJoinBndrType :: Type -- Type of the body
+ -> Id -- Possibly a join Id
-> LintM ()
-- Checks that the return type of a join Id matches the body
-- E.g. join j x = rhs in body
@@ -1337,8 +1280,51 @@ checkLinearity body_ue lam_var =
return body_ue'
Nothing -> return body_ue -- A type variable
-{- Note [Linting join points with casts or ticks]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{- Note [Join points and beta-redexes]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In the worker/wrapper pass, the worker invokes the original function by calling
+it with arguments, thus producing a beta-redex for the simplifier to munch away:
+
+ \x y z -> e => (\x y z -> e) wx wy wz
+
+But we need to take care if `e` invokes a join point. For example:
+
+ join j1 x = ...
+ join j2 y = if y == 0 then 0 else j1 y
+=>
+ join j1 x = ...
+ join $wj2 y# = (\y -> if y == 0 then 0 else jump j1 y) (I# y#)
+ join j2 y = case y of I# y# -> jump $wj2 y#
+
+Now the jump to `j1` is inside a lambda and inside an application. That is ill-typed
+from Lint's point of view. And yet, after one round of simplification it'll all be
+fine.
+
+You might wonder if we could use a `let` instead of a lambda for the worker:
+
+ join $wj2 y# = let y = I# y#
+ in if y == 0 then 0 else jump j1 y
+
+That would solve the join-point problem, but it really doesn't work because the
+lets shadow each other. The lambda arguments should not "see" any of the
+lambda-bound variables.
+
+So our solution is this:
+
+* Use straightforward applicaion in the worker-wrapper pass, creating a eta-redex.
+ See the call to `mkApps` in GHC.Core.Opt.WorkWrap.Utils.mkWwBodies.
+
+* Tell Lint not to complain about a join-point invocation hidden under a
+ saturated beta-redex. The code is rather simple: see `lintCoreFun`.
+
+* We guard this with a Lint flag `lf_allow_beta_joins`.
+
+* Teach occurrence analysis that `j1` is still a join point, despite its
+ call being nested inside the beta-redex. See Note [occAnal for applications]
+ in GHC.Core.Opt.OccurAnal.
+
+Note [Linting join points with casts or ticks]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
As per Note [Join points, casts, and ticks] in GHC.Core, we have to be careful
when a cast or tick occurs in between a join point binding and a corresponding
join point occurrence.
@@ -1409,33 +1395,6 @@ lose track of why an expression is bottom, so we shouldn't make too
much fuss when that happens.
-Note [Beta redexes]
-~~~~~~~~~~~~~~~~~~~
-Consider:
-
- join j @x y z = ... in
- (\@x y z -> jump j @x y z) @t e1 e2
-
-This is clearly ill-typed, since the jump is inside both an application and a
-lambda, either of which is enough to disqualify it as a tail call (see Note
-[Invariants on join points] in GHC.Core). However, strictly from a
-lambda-calculus perspective, the term doesn't go wrong---after the two beta
-reductions, the jump *is* a tail call and everything is fine.
-
-Why would we want to allow this when we have let? One reason is that a compound
-beta redex (that is, one with more than one argument) has different scoping
-rules: naively reducing the above example using lets will capture any free
-occurrence of y in e2. More fundamentally, type lets are tricky; many passes,
-such as Float Out, tacitly assume that the incoming program's type lets have
-all been dealt with by the simplifier. Thus we don't want to let-bind any types
-in, say, GHC.Core.Subst.simpleOptPgm, which in some circumstances can run immediately
-before Float Out.
-
-All that said, currently GHC.Core.Subst.simpleOptPgm is the only thing using this
-loophole, doing so to avoid re-traversing large functions (beta-reducing a type
-lambda without introducing a type let requires a substitution). TODO: Improve
-simpleOptPgm so that we can forget all this ever happened.
-
************************************************************************
* *
\subsection[lintCoreArgs]{lintCoreArgs}
@@ -1449,23 +1408,23 @@ subtype of the required type, as one would expect.
-- Takes the functions type and arguments as argument.
-- Returns the *result* of applying the function to arguments.
-- e.g. f :: Int -> Bool -> Int would return `Int` as result type.
-lintCoreArgs :: (OutType, UsageEnv) -> [InExpr] -> LintM (OutType, UsageEnv)
+lintCoreArgs :: (Type, UsageEnv) -> [CoreExpr] -> LintM (Type, UsageEnv)
lintCoreArgs (fun_ty, fun_ue) args
- = lintApp (text "expression")
- lintTyArg lintValArg fun_ty args fun_ue
+ = lintApp (text "expression") lintTyArg lintValArg fun_ty args fun_ue
-lintTyArg :: InExpr -> LintM OutType
+lintTyArg :: CoreExpr -> LintM Type
-- Type argument
lintTyArg (Type arg_ty)
= do { checkL (not (isCoercionTy arg_ty))
(text "Unnecessary coercion-to-type injection:"
<+> ppr arg_ty)
- ; lintTypeAndSubst arg_ty }
+ ; lintType arg_ty
+ ; return arg_ty }
lintTyArg arg
= failWithL (hang (text "Expected type argument but found") 2 (ppr arg))
-lintValArg :: InExpr -> Mult -> UsageEnv -> LintM (OutType, UsageEnv)
+lintValArg :: CoreExpr -> Mult -> UsageEnv -> LintM (Type, UsageEnv)
lintValArg arg mult fun_ue
= do { (arg_ty, arg_ue) <- markAllJoinsBad $ lintCoreExpr arg
-- See Note [Representation polymorphism invariants] in GHC.Core
@@ -1485,12 +1444,18 @@ lintValArg arg mult fun_ue
-----------------
lintAltBinders :: UsageEnv
-> Var -- Case binder
- -> OutType -- Scrutinee type
- -> OutType -- Constructor type
+ -> Type -- Scrutinee type
+ -> Type -- Constructor type
-> [(Mult, OutVar)] -- Binders
-> LintM UsageEnv
-- If you edit this function, you may need to update the GHC formalism
-- See Note [GHC Formalism]
+{-
+lintAltBinders rhs_ue _case_bndr scrut_ty con_ty bndrs
+ = do { (res_ty, rhs_ue') <- lintApp (text ".") lintTyBndr lintValBndr con_ty bndrs
+ ; ensureEqTys res_ty scrut_ty (mkBadPatMsg con_ty scrut_ty)
+ ; return rhs_ue }
+-}
lintAltBinders rhs_ue _case_bndr scrut_ty con_ty []
= do { ensureEqTys con_ty scrut_ty (mkBadPatMsg con_ty scrut_ty)
; return rhs_ue }
@@ -1505,6 +1470,7 @@ lintAltBinders rhs_ue case_bndr scrut_ty con_ty ((var_w, bndr):bndrs)
; rhs_ue' <- checkCaseLinearity rhs_ue case_bndr var_w bndr
; lintAltBinders rhs_ue' case_bndr scrut_ty con_ty' bndrs }
+
-- | Implements the case rules for linearity
checkCaseLinearity :: UsageEnv -> Var -> Mult -> Var -> LintM UsageEnv
checkCaseLinearity ue case_bndr var_w bndr = do
@@ -1529,7 +1495,7 @@ checkCaseLinearity ue case_bndr var_w bndr = do
-----------------
-lintTyApp :: OutType -> OutType -> LintM OutType
+lintTyApp :: Type -> Type -> LintM Type
lintTyApp fun_ty arg_ty
| Just (tv,body_ty) <- splitForAllTyVar_maybe fun_ty
= do { lintTyKind tv arg_ty
@@ -1547,8 +1513,8 @@ lintTyApp fun_ty arg_ty
-- | @lintValApp arg fun_ty arg_ty@ lints an application of @fun arg@
-- where @fun :: fun_ty@ and @arg :: arg_ty@, returning the type of the
-- application.
-lintValApp :: CoreExpr -> OutType -> OutType -> UsageEnv -> UsageEnv
- -> LintM (OutType, UsageEnv)
+lintValApp :: CoreExpr -> Type -> Type -> UsageEnv -> UsageEnv
+ -> LintM (Type, UsageEnv)
lintValApp arg fun_ty arg_ty fun_ue arg_ue
| Just (_, w, arg_ty', res_ty') <- splitFunTy_maybe fun_ty
= do { ensureEqTys arg_ty' arg_ty (mkAppMsg arg_ty' arg_ty arg)
@@ -1559,9 +1525,7 @@ lintValApp arg fun_ty arg_ty fun_ue arg_ue
where
err2 = mkNonFunAppMsg fun_ty arg_ty arg
-lintTyKind :: OutTyVar -> OutType -> LintM ()
--- Both args have had substitution applied
-
+lintTyKind :: OutTyVar -> Type -> LintM ()
-- If you edit this function, you may need to update the GHC formalism
-- See Note [GHC Formalism]
lintTyKind tyvar arg_ty
@@ -1579,36 +1543,36 @@ lintTyKind tyvar arg_ty
************************************************************************
-}
-lintCaseExpr :: CoreExpr -> InId -> InType -> [CoreAlt] -> LintM (OutType, UsageEnv)
+lintCaseExpr :: CoreExpr -> Id -> Type -> [CoreAlt] -> LintM (Type, UsageEnv)
lintCaseExpr scrut case_bndr alt_ty alts
= do { let e = Case scrut case_bndr alt_ty alts -- Just for error messages
-- Check the scrutinee
- ; (scrut_ty', scrut_ue) <- markAllJoinsBad $ lintCoreExpr scrut
+ ; (scrut_ty, scrut_ue) <- markAllJoinsBad $ lintCoreExpr scrut
-- See Note [Join points are less general than the paper]
-- in GHC.Core
- ; alt_ty' <- addLoc (CaseTy scrut) $ lintValueType alt_ty
+ ; addLoc (CaseTy scrut) $ lintValueType alt_ty
- ; checkCaseAlts e scrut scrut_ty' alts
+ ; checkCaseAlts e scrut scrut_ty alts
-- Lint the case-binder. Must do this after linting the scrutinee
-- because the case-binder isn't in scope in the scrutineex
- ; lintBinder CaseBind case_bndr $ \case_bndr' ->
+ ; lintBinder CaseBind case_bndr $
-- Don't use lintIdBndr on case_bndr, because unboxed tuple is legitimate
- do { let case_bndr_ty' = idType case_bndr'
- scrut_mult = idMult case_bndr'
+ do { let case_bndr_ty = idType case_bndr
+ scrut_mult = idMult case_bndr
- ; ensureEqTys case_bndr_ty' scrut_ty' (mkScrutMsg case_bndr case_bndr_ty' scrut_ty')
+ ; ensureEqTys case_bndr_ty scrut_ty (mkScrutMsg case_bndr case_bndr_ty scrut_ty)
-- See GHC.Core Note [Case expression invariants] item (7)
; -- Check the alternatives
- ; alt_ues <- mapM (lintCoreAlt case_bndr' scrut_ty' scrut_mult alt_ty') alts
+ ; alt_ues <- mapM (lintCoreAlt case_bndr scrut_ty scrut_mult alt_ty) alts
; let case_ue = (scaleUE scrut_mult scrut_ue) `addUE` supUEs alt_ues
- ; return (alt_ty', case_ue) } }
+ ; return (alt_ty, case_ue) } }
-checkCaseAlts :: InExpr -> InExpr -> OutType -> [CoreAlt] -> LintM ()
+checkCaseAlts :: CoreExpr -> CoreExpr -> Type -> [CoreAlt] -> LintM ()
-- a) Check that the alts are non-empty
-- b1) Check that the DEFAULT comes first, if it exists
-- b2) Check that the others are in increasing order
@@ -1683,17 +1647,17 @@ checkCaseAlts e scrut scrut_ty alts
is_lit_alt (Alt (LitAlt _) _ _) = True
is_lit_alt _ = False
-lintAltExpr :: CoreExpr -> OutType -> LintM UsageEnv
+lintAltExpr :: CoreExpr -> Type -> LintM UsageEnv
lintAltExpr expr ann_ty
= do { (actual_ty, ue) <- lintCoreExpr expr
; ensureEqTys actual_ty ann_ty (mkCaseAltMsg expr actual_ty ann_ty)
; return ue }
-- See GHC.Core Note [Case expression invariants] item (6)
-lintCoreAlt :: OutId -- Case binder
- -> OutType -- Type of scrutinee
+lintCoreAlt :: Id -- Case binder
+ -> Type -- Type of scrutinee
-> Mult -- Multiplicity of scrutinee
- -> OutType -- Type of the alternative
+ -> Type -- Type of the alternative
-> CoreAlt
-> LintM UsageEnv
-- If you edit this function, you may need to update the GHC formalism
@@ -1738,11 +1702,11 @@ lintCoreAlt case_bndr scrut_ty _scrut_mult alt_ty alt@(Alt (DataAlt con) args rh
; multiplicities = map binderMult $ fst $ splitPiTys con_payload_ty }
-- And now bring the new binders into scope
- ; lintBinders CasePatBind args $ \ args' -> do
+ ; lintBinders CasePatBind args $ do
{ rhs_ue <- lintAltExpr rhs alt_ty
; rhs_ue' <- addLoc (CasePat alt) $
lintAltBinders rhs_ue case_bndr scrut_ty con_payload_ty
- (zipEqual multiplicities args')
+ (zipEqual multiplicities args)
; return $ deleteUE rhs_ue' case_bndr
}
}
@@ -1784,54 +1748,52 @@ lintLinearBinder doc actual_usage described_usage
-}
-- When we lint binders, we (one at a time and in order):
--- 1. Lint var types or kinds (possibly substituting)
--- 2. Add the binder to the in scope set, and if its a coercion var,
--- we may extend the substitution to reflect its (possibly) new kind
-lintBinders :: HasDebugCallStack => BindingSite -> [InVar] -> ([OutVar] -> LintM a) -> LintM a
-lintBinders _ [] linterF = linterF []
-lintBinders site (var:vars) linterF = lintBinder site var $ \var' ->
- lintBinders site vars $ \ vars' ->
- linterF (var':vars')
+-- 1. Lint var types or kinds
+-- 2. Add the binder to the in scope set
+lintBinders :: HasDebugCallStack => BindingSite -> [Var] -> LintM a -> LintM a
+lintBinders _ [] linterF = linterF
+lintBinders site (var:vars) linterF = lintBinder site var $
+ lintBinders site vars $
+ linterF
-- If you edit this function, you may need to update the GHC formalism
-- See Note [GHC Formalism]
-lintBinder :: HasDebugCallStack => BindingSite -> InVar -> (OutVar -> LintM a) -> LintM a
+lintBinder :: HasDebugCallStack => BindingSite -> Var -> LintM a -> LintM a
lintBinder site var linterF
| isTyCoVar var = lintTyCoBndr var linterF
| otherwise = lintIdBndr NotTopLevel site var linterF
-lintTyCoBndr :: HasDebugCallStack => TyCoVar -> (OutTyCoVar -> LintM a) -> LintM a
+lintTyCoBndr :: HasDebugCallStack => TyCoVar -> LintM a -> LintM a
lintTyCoBndr tcv thing_inside
- = do { tcv_type' <- lintTypeAndSubst (varType tcv)
- ; let tcv_kind' = typeKind tcv_type'
+ = do { let tcv_type = varType tcv
+ tcv_kind = typeKind tcv_type
+ ; lintType (varType tcv)
-- See (FORALL1) and (FORALL2) in GHC.Core.Type
; if (isTyVar tcv)
then -- Check that in (forall (a:ki). blah) we have ki:Type
- lintL (isLiftedTypeKind tcv_kind') $
+ lintL (isLiftedTypeKind tcv_kind) $
hang (text "TyVar whose kind does not have kind Type:")
- 2 (ppr tcv <+> dcolon <+> ppr tcv_type' <+> dcolon <+> ppr tcv_kind')
+ 2 (ppr tcv <+> dcolon <+> ppr tcv_type <+> dcolon <+> ppr tcv_kind)
else -- Check that in (forall (cv::ty). blah),
-- then ty looks like (t1 ~# t2)
- lintL (isCoVarType tcv_type') $
+ lintL (isCoVarType tcv_type) $
text "CoVar with non-coercion type:" <+> pprTyVar tcv
- ; addInScopeTyCoVar tcv tcv_type' thing_inside }
+ ; addInScopeTyCoVar tcv thing_inside }
-lintIdBndrs :: forall a. TopLevelFlag -> [InId] -> ([OutId] -> LintM a) -> LintM a
+lintIdBndrs :: forall a. TopLevelFlag -> [Id] -> LintM a -> LintM a
lintIdBndrs top_lvl ids thing_inside
= go ids thing_inside
where
- go :: [Id] -> ([Id] -> LintM a) -> LintM a
- go [] thing_inside = thing_inside []
- go (id:ids) thing_inside = lintIdBndr top_lvl LetBind id $ \id' ->
- go ids $ \ids' ->
- thing_inside (id' : ids')
+ go :: [Id] -> LintM a -> LintM a
+ go [] thing_inside = thing_inside
+ go (id:ids) thing_inside = lintIdBndr top_lvl LetBind id $
+ go ids $
+ thing_inside
lintIdBndr :: TopLevelFlag -> BindingSite
- -> InVar -> (OutVar -> LintM a) -> LintM a
--- Do substitution on the type of a binder and add the var with this
--- new type to the in-scope set of the second argument
+ -> Var -> LintM a -> LintM a
-- ToDo: lint its rules
lintIdBndr top_lvl bind_site id thing_inside
= assertPpr (isId id) (ppr id) $
@@ -1869,9 +1831,9 @@ lintIdBndr top_lvl bind_site id thing_inside
; lintL (not (bind_site == LambdaBind && isEvaldUnfolding (idUnfolding id)))
(text "Lambda binder with value or OtherCon unfolding.")
- ; out_ty <- addLoc (IdTy id) (lintValueType id_ty)
+ ; addLoc (IdTy id) (lintValueType id_ty)
- ; addInScopeId id out_ty thing_inside }
+ ; addInScopeId id thing_inside }
where
id_ty = idType id
@@ -1891,62 +1853,44 @@ lintIdBndr top_lvl bind_site id thing_inside
{- Note [Linting types and coercions]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Notice that
- lintType :: InType -> LintM ()
- lintCoercion :: InCoercion -> LintM ()
+ lintType :: Type -> LintM ()
+ lintCoercion :: Coercion -> LintM ()
Neither returns anything.
-If you need the kind of the type, then do `typeKind` and then apply
-the ambient substitution using `substTyM`. Note that the substitution
-empty unless there is shadowing or type-lets; and if the substitution is
-empty, the `substTyM` is a no-op.
-
-It is better to take the kind and then substitute, rather than substitute
-and then take the kind, becaues the kind is usually smaller.
-
-Note: you might wonder if we should apply the same logic to expressions.
-Why do we have
- lintExpr :: InExpr -> LintM OutType
-Partly inertia; but also taking the type of an expresison involve looking
-down a deep chain of let's, whereas that is not true of taking the kind
-of a type. It'd be worth an experiment though.
-
-Historical note: in the olden days we had
- lintType :: InType -> LintM OutType
-but that burned a huge amount of allocation building an OutType that was
-often discarded, or used only to get its kind.
-
-I also experimented with
- lintType :: InType -> LintM OutKind
-but that too was slower. It is also much simpler to return ()! If we
-return the kind we have to duplicate the logic in `typeKind`; and it is
-much worse for coercions.
+Note: you might wonder why we have
+ lintExpr :: CoreExpr -> LintM Type
+ lintType :: Type -> LintM ()
+
+That is, linting an expression yields its type, but linting a type does not
+yield its kind. Partly inertia; but:
+
+* Taking the type of an expresison involves looking down a deep chain of let's,
+ whereas that is not true of taking the kind of a type. It'd be worth an
+ experiment though.
+
+* I did experiment with
+ lintType :: Type -> LintM Kind
+ but that too was slower. It is also much simpler to return ()! If we return
+ the kind we have to duplicate the logic in `typeKind`; and it is much worse
+ for coercions.
-}
-lintValueType :: Type -> LintM OutType
+lintValueType :: Type -> LintM ()
-- Types only, not kinds
--- Check the type, and apply the substitution to it
--- See Note [Linting type lets]
lintValueType ty
= addLoc (InType ty) $
- do { ty' <- lintTypeAndSubst ty
- ; let sk = typeKind ty'
+ do { lintType ty
+ ; let sk = typeKind ty
; lintL (isTYPEorCONSTRAINT sk) $
hang (text "Ill-kinded type:" <+> ppr ty)
- 2 (text "has kind:" <+> ppr sk)
- ; return ty' }
+ 2 (text "has kind:" <+> ppr sk)}
checkTyCon :: TyCon -> LintM ()
checkTyCon tc
= checkL (not (isTcTyCon tc)) (text "Found TcTyCon:" <+> ppr tc)
-------------------
-lintTypeAndSubst :: InType -> LintM OutType
-lintTypeAndSubst ty = do { lintType ty; substTyM ty }
- -- In GHCi we may lint an expression with a free
- -- type variable. Then it won't be in the
- -- substitution, but it should be in scope
-
-lintType :: InType -> LintM ()
+lintType :: Type -> LintM ()
-- See Note [Linting types and coercions]
--
-- If you edit this function, you may need to update the GHC formalism
@@ -1956,8 +1900,7 @@ lintType (TyVarTy tv)
= failWithL (mkBadTyVarMsg tv)
| otherwise
- = do { _ <- lintVarOcc tv
- ; return () }
+ = lintVarOcc tv
lintType ty@(AppTy t1 t2)
| TyConApp {} <- t1
@@ -1965,7 +1908,7 @@ lintType ty@(AppTy t1 t2)
| otherwise
= do { let (fun_ty, arg_tys) = collect t1 [t2]
; lintType fun_ty
- ; fun_kind <- substTyM (typeKind fun_ty)
+ ; let fun_kind = typeKind fun_ty
; lint_ty_app ty fun_kind arg_tys }
where
collect (AppTy f a) as = collect f (a:as)
@@ -1997,21 +1940,21 @@ lintType ty@(FunTy af tw t1 t2)
lintType ty@(ForAllTy {})
= go [] ty
where
- go :: [OutTyCoVar] -> InType -> LintM ()
+ go :: [OutTyCoVar] -> Type -> LintM ()
-- Loop, collecting the forall-binders
go tcvs ty@(ForAllTy (Bndr tcv _) body_ty)
| not (isTyCoVar tcv)
= failWithL (text "Non-TyVar or Non-CoVar bound in type:" <+> ppr ty)
| otherwise
- = lintTyCoBndr tcv $ \tcv' ->
+ = lintTyCoBndr tcv $
do { -- See GHC.Core.TyCo.Rep Note [Unused coercion variable in ForAllTy]
-- Suspicious because it works on InTyCoVar; c.f. ForAllCo
when (isCoVar tcv) $
lintL (anyFreeVarsOfType (== tcv) body_ty) $
text "Covar does not occur in the body:" <+> (ppr tcv $$ ppr body_ty)
- ; go (tcv' : tcvs) body_ty }
+ ; go (tcv : tcvs) body_ty }
go tcvs body_ty
= do { lintType body_ty
@@ -2019,7 +1962,7 @@ lintType ty@(ForAllTy {})
lintType (CastTy ty co)
= do { lintType ty
- ; ty_kind <- substTyM (typeKind ty)
+ ; let ty_kind = typeKind ty
; co_lk <- lintStarCoercion co
; ensureEqTys ty_kind co_lk (mkCastTyErr ty co ty_kind co_lk) }
@@ -2027,14 +1970,14 @@ lintType (LitTy l) = lintTyLit l
lintType (CoercionTy co) = lintCoercion co
-----------------
-lintForAllBody :: [OutTyCoVar] -> InType -> LintM ()
+lintForAllBody :: [OutTyCoVar] -> Type -> LintM ()
-- Do the checks for the body of a forall-type
lintForAllBody tcvs body_ty
= do { -- For type variables, check for skolem escape
-- See Note [Phantom type variables in kinds] in GHC.Core.Type
-- The kind of (forall cv. th) is liftedTypeKind, so no
-- need to check for skolem-escape in the CoVar case
- body_kind <- substTyM (typeKind body_ty)
+ let body_kind = typeKind body_ty
; case occCheckExpand tcvs body_kind of
Just {} -> return ()
Nothing -> failWithL $
@@ -2045,7 +1988,7 @@ lintForAllBody tcvs body_ty
; checkValueType body_kind (text "the body of forall:" <+> ppr body_ty) }
-----------------
-lintTySynFamApp :: Bool -> InType -> TyCon -> [InType] -> LintM ()
+lintTySynFamApp :: Bool -> Type -> TyCon -> [Type] -> LintM ()
-- The TyCon is a type synonym or a type family (not a data family)
-- See Note [Linting type synonym applications]
-- c.f. GHC.Tc.Validity.check_syn_tc_app
@@ -2071,21 +2014,21 @@ lintTySynFamApp report_unsat ty tc tys
-----------------
-- Confirms that a kind is really TYPE r or Constraint
-checkValueType :: OutKind -> SDoc -> LintM ()
+checkValueType :: Kind -> SDoc -> LintM ()
checkValueType kind doc
= lintL (isTYPEorCONSTRAINT kind)
(text "Non-Type-like kind when Type-like expected:" <+> ppr kind $$
text "when checking" <+> doc)
-----------------
-lintArrow :: SDoc -> FunTyFlag -> InType -> InType -> InType -> LintM ()
+lintArrow :: SDoc -> FunTyFlag -> Type -> Type -> Type -> LintM ()
-- If you edit this function, you may need to update the GHC formalism
-- See Note [GHC Formalism]
lintArrow what af t1 t2 tw -- Eg lintArrow "type or kind `blah'" k1 k2 kw
-- or lintArrow "coercion `blah'" k1 k2 kw
- = do { k1 <- substTyM (typeKind t1)
- ; k2 <- substTyM (typeKind t2)
- ; kw <- substTyM (typeKind tw)
+ = do { let k1 = typeKind t1
+ k2 = typeKind t2
+ kw = typeKind tw
; unless (isTYPEorCONSTRAINT k1) (report (text "argument") t1 k1)
; unless (isTYPEorCONSTRAINT k2) (report (text "result") t2 k2)
; unless (isMultiplicityTy kw) (report (text "multiplicity") tw kw)
@@ -2111,29 +2054,29 @@ lintTyLit (StrTyLit _) = return ()
lintTyLit (CharTyLit _) = return ()
-----------------
-lint_ty_app :: InType -> OutKind -> [InType] -> LintM ()
+lint_ty_app :: Type -> Kind -> [Type] -> LintM ()
lint_ty_app ty = lint_tyco_app (text "type" <+> quotes (ppr ty))
-lint_co_app :: HasDebugCallStack => Coercion -> OutKind -> [InType] -> LintM ()
+lint_co_app :: HasDebugCallStack => Coercion -> Kind -> [Type] -> LintM ()
lint_co_app co = lint_tyco_app (text "coercion" <+> quotes (ppr co))
-lint_tyco_app :: SDoc -> OutKind -> [InType] -> LintM ()
+lint_tyco_app :: SDoc -> Kind -> [Type] -> LintM ()
lint_tyco_app msg fun_kind arg_tys
-- See Note [Avoiding compiler perf traps when constructing error messages.]
- = do { _ <- lintApp msg (\ty -> do { lintType ty; substTyM ty })
- (\ty _ _ -> do { lintType ty; ki <- substTyM (typeKind ty); return (ki,()) })
- fun_kind arg_tys ()
+ = do { _ <- lintApp msg (\ty -> do { lintType ty; return ty })
+ (\ty _ _ -> do { lintType ty; return (typeKind ty,()) })
+ fun_kind arg_tys ()
; return () }
----------------
lintApp :: forall in_a acc. Outputable in_a =>
SDoc
- -> (in_a -> LintM OutType) -- Lint the thing and return its value
- -> (in_a -> Mult -> acc -> LintM (OutKind, acc)) -- Lint the thing and return its type
- -> OutType
+ -> (in_a -> LintM Type) -- Lint the thing and return its value
+ -> (in_a -> Mult -> acc -> LintM (Kind, acc)) -- Lint the thing and return its type
+ -> Type
-> [in_a] -- The arguments, always "In" things
-> acc -- Used (only) for UsageEnv in /term/ applications
- -> LintM (OutType,acc)
+ -> LintM (Type,acc)
-- lintApp is a performance-critical function, which deals with multiple
-- applications such as (/\a./\b./\c. expr) @ta @tb @tc
-- When returning the type of this expression we want to avoid substituting a:=ta,
@@ -2158,7 +2101,7 @@ lintApp msg lint_forall_arg lint_arrow_arg !orig_fun_ty all_args acc
; let init_subst = mkEmptySubst in_scope
- go :: Subst -> OutType -> acc -> [in_a] -> LintM (OutType, acc)
+ go :: Subst -> Type -> acc -> [in_a] -> LintM (Type, acc)
-- The Subst applies (only) to the fun_ty
-- c.f. GHC.Core.Type.piResultTys, which has a similar loop
@@ -2202,7 +2145,7 @@ lintApp msg lint_forall_arg lint_arrow_arg !orig_fun_ty all_args acc
-- explicitly and don't capture them as free variables. Otherwise this binder might
-- become a thunk that get's allocated in the hot code path.
-- See Note [Avoiding compiler perf traps when constructing error messages.]
-lint_app_fail_msg :: (Outputable a2) => SDoc -> OutType -> a2 -> SDoc -> SDoc
+lint_app_fail_msg :: (Outputable a2) => SDoc -> Type -> a2 -> SDoc -> SDoc
lint_app_fail_msg msg kfn arg_tys extra
= vcat [ hang (text "Application error in") 2 msg
, nest 2 (text "Function type =" <+> ppr kfn)
@@ -2215,7 +2158,7 @@ lint_app_fail_msg msg kfn arg_tys extra
* *
********************************************************************* -}
-lintCoreRule :: OutVar -> OutType -> CoreRule -> LintM ()
+lintCoreRule :: OutVar -> Type -> CoreRule -> LintM ()
lintCoreRule _ _ (BuiltinRule {})
= return () -- Don't bother
@@ -2223,7 +2166,7 @@ lintCoreRule fun fun_ty rule@(Rule { ru_name = name, ru_bndrs = bndrs
, ru_args = args, ru_rhs = rhs })
= noMultiplicityChecks $ -- Skip linearity checking for rules
-- See Note [Linting linearity]
- lintBinders LambdaBind bndrs $ \ _ ->
+ lintBinders LambdaBind bndrs $
do { (lhs_ty, _) <- lintCoreArgs (fun_ty, zeroUE) args
; (rhs_ty, _) <- case idJoinPointHood fun of
JoinPoint join_arity
@@ -2311,10 +2254,10 @@ Note [Join points and unfoldings/rules] in "GHC.Core.Opt.OccurAnal" for further
{- Note [Asymptotic efficiency]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When linting coercions (and types actually) we return a linted
-(substituted) coercion. Then we often have to take the coercionKind of
-that returned coercion. If we get long chains, that can be asymptotically
-inefficient, notably in
+When linting coercions we traverse the coercion. Then we often have to take the
+coercionKind of that returned coercion. If we get long chains, that can be
+asymptotically inefficient, notably in
+
* TransCo
* InstCo
* SelCo (cf #9233)
@@ -2326,30 +2269,23 @@ the bad perf bites us in practice.
A solution would be to return the kind and role of the coercion,
as well as the linted coercion. Or perhaps even *only* the kind and role,
which is what used to happen. But that proved tricky and error prone
-(#17923), so now we return the coercion.
+(#17923).
-}
-- lintStarCoercion lints a coercion, confirming that its lh kind and
-- its rh kind are both *; also ensures that the role is Nominal
-- Returns the lh kind
-lintStarCoercion :: InCoercion -> LintM OutType
+lintStarCoercion :: Coercion -> LintM Type
lintStarCoercion g
= do { lintCoercion g
- ; Pair t1 t2 <- substCoKindM g
+ ; let Pair t1 t2 = coercionKind g
; checkValueType (typeKind t1) (text "the kind of the left type in" <+> ppr g)
; checkValueType (typeKind t2) (text "the kind of the right type in" <+> ppr g)
; lintRole g Nominal (coercionRole g)
; return t1 }
-substCoKindM :: InCoercion -> LintM (Pair OutType)
-substCoKindM co
- = do { let !(Pair lk rk) = coercionKind co
- ; lk' <- substTyM lk
- ; rk' <- substTyM rk
- ; return (Pair lk' rk') }
-
-lintCoercion :: HasDebugCallStack => InCoercion -> LintM ()
+lintCoercion :: HasDebugCallStack => Coercion -> LintM ()
-- See Note [Linting types and coercions]
--
-- If you edit this function, you may need to update the GHC formalism
@@ -2361,7 +2297,7 @@ lintCoercion (CoVarCo cv)
2 (text "With offending type:" <+> ppr (varType cv)))
| otherwise -- C.f. lintType (TyVarTy tv), which has better docs
- = do { _ <- lintVarOcc cv; return () }
+ = lintVarOcc cv
lintCoercion (Refl ty) = lintType ty
lintCoercion (GRefl _r ty MRefl) = lintType ty
@@ -2369,8 +2305,8 @@ lintCoercion (GRefl _r ty MRefl) = lintType ty
lintCoercion (GRefl _r ty (MCo co))
= do { lintType ty
; lintCoercion co
- ; tk <- substTyM (typeKind ty)
- ; tl <- substTyM (coercionLKind co)
+ ; let tk = typeKind ty
+ tl = coercionLKind co
; ensureEqTys tk tl $
hang (text "GRefl coercion kind mis-match:" <+> ppr co)
2 (vcat [ppr ty, ppr tk, ppr tl])
@@ -2403,8 +2339,8 @@ lintCoercion co@(AppCo co1 co2)
= do { lintCoercion co1
; lintCoercion co2
; let !(Pair lt1 rt1) = coercionKind co1
- ; lk1 <- substTyM (typeKind lt1)
- ; rk1 <- substTyM (typeKind rt1)
+ lk1 = typeKind lt1
+ rk1 = typeKind rt1
; lint_co_app co lk1 [coercionLKind co2]
; lint_co_app co rk1 [coercionRKind co2]
@@ -2421,7 +2357,7 @@ lintCoercion co@(ForAllCo {})
= do { _ <- go [] co; return () }
where
go :: [OutTyCoVar] -- Binders in reverse order
- -> InCoercion -> LintM Role
+ -> Coercion -> LintM Role
go tcvs co@(ForAllCo { fco_tcv = tcv, fco_visL = visL, fco_visR = visR
, fco_kind = kind_mco, fco_body = body_co })
| not (isTyCoVar tcv)
@@ -2431,15 +2367,15 @@ lintCoercion co@(ForAllCo {})
= do { mb_lk <- case kind_mco of
MRefl -> return Nothing
MCo kind_co -> Just <$> lintStarCoercion kind_co
- ; lintTyCoBndr tcv $ \tcv' ->
+ ; lintTyCoBndr tcv $
do { case mb_lk of
Nothing -> return ()
- Just lk -> ensureEqTys (varType tcv') lk $
+ Just lk -> ensureEqTys (varType tcv) lk $
text "Kind mis-match in ForallCo" <+> ppr co
-- I'm not very sure about this part, because it traverses body_co
-- but at least it's on a cold path (a ForallCo for a CoVar)
- -- Also it works on InTyCoVar and InCoercion, which is suspect
+ -- Also it works on InTyCoVar and Coercion, which is suspect
; when (isCoVar tcv) $
do { lintL (visL == coreTyLamForAllTyFlag && visR == coreTyLamForAllTyFlag) $
text "Invalid visibility flags in CoVar ForAllCo" <+> ppr co
@@ -2448,7 +2384,7 @@ lintCoercion co@(ForAllCo {})
text "Covar can only appear in Refl and GRefl: " <+> ppr co }
-- See (FC6) in Note [ForAllCo] in GHC.Core.TyCo.Rep
- ; role <- go (tcv':tcvs) body_co
+ ; role <- go (tcv:tcvs) body_co
; when (role == Nominal) $
lintL (visL `eqForAllVis` visR) $
@@ -2505,8 +2441,8 @@ lintCoercion co@(UnivCo { uco_role = r, uco_prov = prov
-- Check the to and from types
; lintType ty1
; lintType ty2
- ; tk1 <- substTyM (typeKind ty1)
- ; tk2 <- substTyM (typeKind ty2)
+ ; let tk1 = typeKind ty1
+ tk2 = typeKind ty2
; when (r /= Phantom && isTYPEorCONSTRAINT tk1 && isTYPEorCONSTRAINT tk2)
(checkTypes ty1 ty2)
@@ -2560,8 +2496,8 @@ lintCoercion (SymCo co) = lintCoercion co
lintCoercion co@(TransCo co1 co2)
= do { lintCoercion co1
; lintCoercion co2
- ; rk1 <- substTyM (coercionRKind co1)
- ; lk2 <- substTyM (coercionLKind co2)
+ ; let rk1 = coercionRKind co1
+ lk2 = coercionLKind co2
; ensureEqTys rk1 lk2
(hang (text "Trans coercion mis-match:" <+> ppr co)
2 (vcat [ppr (coercionKind co1), ppr (coercionKind co2)]))
@@ -2569,7 +2505,7 @@ lintCoercion co@(TransCo co1 co2)
lintCoercion the_co@(SelCo cs co)
= do { lintCoercion co
- ; Pair s t <- substCoKindM co
+ ; let Pair s t = coercionKind co
; if -- forall (both TyVar and CoVar)
| Just _ <- splitForAllTyCoVar_maybe s
@@ -2604,7 +2540,7 @@ lintCoercion the_co@(SelCo cs co)
lintCoercion the_co@(LRCo _lr co)
= do { lintCoercion co
- ; Pair s t <- substCoKindM co
+ ; let Pair s t = coercionKind co
; lintRole co Nominal (coercionRole co)
; case (splitAppTy_maybe s, splitAppTy_maybe t) of
(Just {}, Just {}) -> return ()
@@ -2618,14 +2554,12 @@ lintCoercion orig_co@(InstCo co arg)
go (InstCo co arg) args = do { lintCoercion arg; go co (arg:args) }
go co args = do { lintCoercion co
; let Pair lty rty = coercionKind co
- ; lty' <- substTyM lty
- ; rty' <- substTyM rty
; in_scope <- getInScope
; let subst = mkEmptySubst in_scope
- ; go_args (subst, lty') (subst,rty') args }
+ ; go_args (subst, lty) (subst,rty) args }
-------------
- go_args :: (Subst, OutType) -> (Subst,OutType) -> [InCoercion]
+ go_args :: (Subst, Type) -> (Subst,Type) -> [Coercion]
-> LintM ()
go_args _ _ []
= return ()
@@ -2634,11 +2568,11 @@ lintCoercion orig_co@(InstCo co arg)
; go_args lty1 rty1 args }
-------------
- go_arg :: (Subst, OutType) -> (Subst,OutType) -> InCoercion
- -> LintM ((Subst,OutType), (Subst,OutType))
+ go_arg :: (Subst, Type) -> (Subst,Type) -> Coercion
+ -> LintM ((Subst,Type), (Subst,Type))
go_arg (lsubst,lty) (rsubst,rty) arg
= do { lintRole arg Nominal (coercionRole arg)
- ; Pair arg_lty arg_rty <- substCoKindM arg
+ ; let Pair arg_lty arg_rty = coercionKind arg
; case (splitForAllTyCoVar_maybe lty, splitForAllTyCoVar_maybe rty) of
-- forall over tvar
@@ -2662,11 +2596,11 @@ lintCoercion orig_co@(InstCo co arg)
lintCoercion this_co@(AxiomCo ax cos)
= do { mapM_ lintCoercion cos
; lint_roles 0 (coAxiomRuleArgRoles ax) cos
- ; prs <- mapM substCoKindM cos
+ ; let prs = map coercionKind cos
; lint_ax ax prs }
where
- lint_ax :: CoAxiomRule -> [Pair OutType] -> LintM ()
+ lint_ax :: CoAxiomRule -> [Pair Type] -> LintM ()
lint_ax (BuiltInFamRew bif) prs
= checkL (isJust (bifrw_proves bif prs)) bad_bif
lint_ax (BuiltInFamInj bif) prs
@@ -2754,8 +2688,8 @@ lintBranch this_co fam_tc branch arg_kinds
= do { checkL (arg_kinds `equalLength` (ktvs ++ cvs)) $
(bad_ax this_co (text "lengths"))
- ; subst <- getSubst
- ; let empty_subst = zapSubst subst
+ ; in_scope <- getInScope
+ ; let empty_subst = mkEmptySubst in_scope
; _ <- foldlM check_ki (empty_subst, empty_subst)
(zip (ktvs ++ cvs) arg_kinds)
@@ -2880,12 +2814,12 @@ lint_axiom ax@(CoAxiom { co_ax_tc = tc, co_ax_branches = branches
lint_branch :: TyCon -> CoAxBranch -> LintM ()
lint_branch ax_tc (CoAxBranch { cab_tvs = tvs, cab_cvs = cvs
, cab_lhs = lhs_args, cab_rhs = rhs })
- = lintBinders LambdaBind (tvs ++ cvs) $ \_ ->
+ = lintBinders LambdaBind (tvs ++ cvs) $
do { let lhs = mkTyConApp ax_tc lhs_args
; lintType lhs
; lintType rhs
- ; lhs_kind <- substTyM (typeKind lhs)
- ; rhs_kind <- substTyM (typeKind rhs)
+ ; let lhs_kind = typeKind lhs
+ rhs_kind = typeKind rhs
; lintL (not (lhs_kind `typesAreApart` rhs_kind)) $
hang (text "Inhomogeneous axiom")
2 (text "lhs:" <+> ppr lhs <+> dcolon <+> ppr lhs_kind $$
@@ -2969,35 +2903,26 @@ type LintLevel = Int
-- If you edit this type, you may need to update the GHC formalism
-- See Note [GHC Formalism]
data LintEnv
- = LE { le_flags :: LintFlags -- Linting the result of this pass
- , le_loc :: [LintLocInfo] -- Locations
-
- , le_subst :: Subst
- -- Current substitution, for TyCoVars only.
- -- Non-CoVar Ids don't appear in here, not even in the InScopeSet
- -- Used for (a) cloning to avoid shadowing of TyCoVars,
- -- so that eqType works ok
- -- (b) substituting for let-bound tyvars, when we have
- -- (let @a = Int -> Int in ...)
-
- , le_level :: LintLevel
- , le_in_vars :: VarEnv (InVar, OutType, LintLevel)
- -- Maps an InVar (i.e. its unique) to its binding InVar
- -- and to its OutType
- -- /All/ in-scope variables are here (term variables,
- -- type variables, and coercion variables)
- -- Used at an occurrence of the InVar
+ = LE { le_flags :: LintFlags -- Linting the result of this pass
+ , le_loc :: [LintLocInfo] -- Locations
+ , le_level :: LintLevel
+ , le_in_scope :: InScopeSet
+
+ , le_in_vars :: VarEnv (Var, LintLevel)
+ -- Maps an Var (i.e. its unique) to its binding Var and level
+ -- /All/ in-scope variables are here (term variables,
+ -- type variables, and coercion variables)
+ -- Used at an occurrence of the Var
, le_joins :: UniqMap Id JoinOcc
-- ^ Join points in scope that are valid
- -- A subset of the InScopeSet in le_subst
-- See Note [Join points]
, le_ue_aliases :: NameEnv UsageEnv
-- See Note [Linting linearity]
-- Assigns usage environments to the alias-like binders,
-- as found in non-recursive lets.
- -- Domain is OutIds
+ -- Domain is Ids
, le_platform :: Platform -- ^ Target platform
, le_diagOpts :: DiagOpts -- ^ Target platform
@@ -3011,7 +2936,8 @@ data LintFlags
, lf_check_linearity :: Bool -- ^ See Note [Linting linearity]
, lf_check_fixed_rep :: Bool -- ^ See Note [Checking for representation polymorphism]
, lf_check_rubbish_lits :: Bool -- ^ See Note [Checking for rubbish literals]
- , lf_allow_weak_joins :: Bool -- ^ See Note [Linting join points with casts or ticks]
+ , lf_allow_weak_joins :: Bool -- ^ See Note [Linting join points with casts or ticks]
+ , lf_allow_beta_joins :: Bool -- ^ See Note [Join points and beta-redexes]
}
-- See Note [Checking StaticPtrs]
@@ -3078,20 +3004,6 @@ top-level bindings. See SimplCore Note [Grand plan for static forms].
The linter checks that no occurrence or `makeStatic` occurs nested.
-Note [Type substitution]
-~~~~~~~~~~~~~~~~~~~~~~~~
-Why do we need a type substitution? Consider
- /\(a:*). \(x:a). /\(a:*). id a x
-This is ill typed, because (renaming variables) it is really
- /\(a:*). \(x:a). /\(b:*). id b x
-Hence, when checking an application, we can't naively compare x's type
-(at its binding site) with its expected type (at a use site). So we
-rename type binders as we go, maintaining a substitution.
-
-The same substitution also supports let-type, current expressed as
- (/\(a:*). body) ty
-Here we substitute 'ty' for 'a' in 'body', on the fly.
-
Note [Linting type synonym applications]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
When linting a type-synonym, or type-family, application
@@ -3353,12 +3265,12 @@ initL cfg m
where
vars = l_vars cfg
init_level = 0
- env = LE { le_flags = l_flags cfg
- , le_subst = mkEmptySubst (mkInScopeSetList vars)
- , le_level = init_level
- , le_in_vars = mkVarEnv [ (v,(v, varType v, init_level)) | v <- vars ]
- , le_joins = emptyUniqMap
- , le_loc = []
+ env = LE { le_flags = l_flags cfg
+ , le_level = init_level
+ , le_in_vars = mkVarEnv [ (v,(v, init_level)) | v <- vars ]
+ , le_in_scope = mkInScopeSetList vars
+ , le_joins = emptyUniqMap
+ , le_loc = []
, le_ue_aliases = emptyNameEnv
, le_platform = l_platform cfg
, le_diagOpts = l_diagOpts cfg
@@ -3421,8 +3333,7 @@ addMsg show_context env msgs msg
loc_msgs :: [(SrcLoc, SDoc)] -- Innermost first
loc_msgs = map dumpLoc (le_loc env)
- cxt_doc = vcat [ vcat $ reverse $ map snd loc_msgs
- , text "Substitution:" <+> ppr (le_subst env) ]
+ cxt_doc = vcat $ reverse $ map snd loc_msgs
context | show_context = cxt_doc
| otherwise = whenPprDebug cxt_doc
@@ -3449,73 +3360,45 @@ inCasePat = LintM $ \ env errs -> fromBoxedLResult (Just (is_case_pat env), errs
is_case_pat (LE { le_loc = CasePat {} : _ }) = True
is_case_pat _other = False
-addInScopeId :: InId -> OutType -> (OutId -> LintM a) -> LintM a
+addInScopeId :: Id -> LintM a -> LintM a
-- Unlike addInScopeTyCoVar, this function does no cloning; Ids never get cloned
-addInScopeId in_id out_ty thing_inside
+addInScopeId id thing_inside
= LintM $ \ env errs ->
- let !(out_id, env') = add env
- in unLintM (thing_inside out_id) env' errs
-
+ unLintM thing_inside (add env) errs
where
add env@(LE { le_level = level, le_in_vars = id_vars, le_joins = valid_joins
- , le_ue_aliases = aliases, le_subst = subst })
- = (out_id, env1)
+ , le_ue_aliases = aliases, le_in_scope = in_scope })
+ = env { le_level = level1, le_in_vars = in_vars'
+ , le_in_scope = in_scope `extendInScopeSet` id
+ , le_joins = valid_joins', le_ue_aliases = aliases' }
where
level1 = level + 1
- env1 = env { le_level = level1, le_in_vars = in_vars'
- , le_joins = valid_joins', le_ue_aliases = aliases' }
- in_vars' = extendVarEnv id_vars in_id (in_id, out_ty, level1)
- aliases' = delFromNameEnv aliases (idName in_id)
+ in_vars' = extendVarEnv id_vars id (id, level1)
+ aliases' = delFromNameEnv aliases (idName id)
-- aliases': when shadowing an alias, we need to make sure the
-- Id is no longer classified as such. E.g.
-- let x = <e1> in case x of x { _DEFAULT -> <e2> }
-- Occurrences of 'x' in e2 shouldn't count as occurrences of e1.
- -- A very tiny optimisation, not sure if it's really worth it
- -- Short-cut when the substitution is a no-op
- out_id | isEmptyTCvSubst subst = in_id
- | otherwise = setIdType in_id out_ty
-
valid_joins'
- | isJoinId out_id = addToUniqMap valid_joins in_id NormalJoinOcc -- Overwrite with new arity
- | otherwise = delFromUniqMap valid_joins in_id -- Remove any existing binding
+ | isJoinId id = addToUniqMap valid_joins id NormalJoinOcc -- Overwrite with new arity
+ | otherwise = delFromUniqMap valid_joins id -- Remove any existing binding
-addInScopeTyCoVar :: InTyCoVar -> OutType -> (OutTyCoVar -> LintM a) -> LintM a
+addInScopeTyCoVar :: TyCoVar -> LintM a -> LintM a
-- This function clones to avoid shadowing of TyCoVars
-addInScopeTyCoVar tcv tcv_type thing_inside
- = LintM $ \ env@(LE { le_level = level, le_in_vars = in_vars, le_subst = subst }) errs ->
- let (tcv', subst') = subst_bndr subst
- level' = level + 1
+addInScopeTyCoVar tcv thing_inside
+ = LintM $ \ env@(LE { le_level = level, le_in_vars = in_vars
+ , le_in_scope = in_scope }) errs ->
+ let level' = level + 1
env' = env { le_level = level'
- , le_in_vars = extendVarEnv in_vars tcv (tcv, tcv_type, level')
- , le_subst = subst' }
- in unLintM (thing_inside tcv') env' errs
- where
- subst_bndr subst
- | isEmptyTCvSubst subst -- No change in kind
- , not (tcv `elemInScopeSet` in_scope) -- Not already in scope
- = -- Do not extend the substitution, just the in-scope set
- (if (varType tcv `eqType` tcv_type) then (\x->x) else
- pprTrace "addInScopeTyCoVar" (
- vcat [ text "tcv" <+> ppr tcv <+> dcolon <+> ppr (varType tcv)
- , text "tcv_type" <+> ppr tcv_type ])) $
- (tcv, subst `extendSubstInScope` tcv)
-
- -- Clone, and extend the substitution
- | let tcv' = uniqAway in_scope (setVarType tcv tcv_type)
- = (tcv', extendTCvSubstWithClone subst tcv tcv')
- where
- in_scope = substInScopeSet subst
+ , le_in_scope = in_scope `extendInScopeSet` tcv
+ , le_in_vars = extendVarEnv in_vars tcv (tcv, level') }
+ in unLintM thing_inside env' errs
-getInVarEnv :: LintM (VarEnv (InId, OutType, LintLevel))
+getInVarEnv :: LintM (VarEnv (Id, LintLevel))
getInVarEnv = LintM (\env errs -> fromBoxedLResult (Just (le_in_vars env), errs))
-extendTvSubstL :: TyVar -> Type -> LintM a -> LintM a
-extendTvSubstL tv ty m
- = LintM $ \ env errs ->
- unLintM m (env { le_subst = Type.extendTvSubst (le_subst env) tv ty }) errs
-
markAllJoinsBad :: LintM a -> LintM a
markAllJoinsBad m
= LintM $ \ env errs -> unLintM m (env { le_joins = emptyUniqMap }) errs
@@ -3549,54 +3432,42 @@ markAllJoinsBadIf False m = m
getValidJoins :: LintM (UniqMap Id JoinOcc)
getValidJoins = LintM (\ env errs -> fromBoxedLResult (Just (le_joins env), errs))
-getSubst :: LintM Subst
-getSubst = LintM (\ env errs -> fromBoxedLResult (Just (le_subst env), errs))
-
-substTyM :: InType -> LintM OutType
--- Apply the substitution to the type
--- The substitution is often empty, in which case it is a no-op
-substTyM ty
- = do { subst <- getSubst
- ; return (substTy subst ty) }
-
getUEAliases :: LintM (NameEnv UsageEnv)
getUEAliases = LintM (\ env errs -> fromBoxedLResult (Just (le_ue_aliases env), errs))
getInScope :: LintM InScopeSet
-getInScope = LintM (\ env errs -> fromBoxedLResult (Just (substInScopeSet $ le_subst env), errs))
+getInScope = LintM (\ env errs -> fromBoxedLResult (Just (le_in_scope env), errs))
-lintVarOcc :: InVar -> LintM OutType
+lintVarOcc :: Var -> LintM ()
-- Used at an occurrence of a variable: term variables, type variables, and coercion variables
-- Checks
-- - that it is in scope
-- - that it is not a GlobalId bound by a LocalId
--- - that the InType at the ocurrence matches the InType at the binding site
+-- - that the Type at the ocurrence matches the Type at the binding site
-- - that the variables free in its type are not shadowed at the occurrence site
lintVarOcc v_occ
| isGlobalId v_occ
- = return (idType v_occ)
+ = return ()
| otherwise
= do { in_var_env <- getInVarEnv
; case lookupVarEnv in_var_env v_occ of
Nothing -> failWithL (text pp_what <+> quotes (ppr v_occ)
<+> text "is out of scope")
- Just (v_bndr, out_ty, bind_level)
+ Just (v_bndr, bind_level)
-> do { let bndr_ty = idType v_bndr
; check_bad_global v_bndr
; check_occ_type_match bndr_ty
- ; check_occ_type_scope in_var_env bndr_ty bind_level
- ; return out_ty }
-
+ ; check_occ_type_scope in_var_env bndr_ty bind_level }
}
where
- occ_ty :: InType
+ occ_ty :: Type
occ_ty = idType v_occ
pp_what | isTyVar v_occ = "The type variable"
| isCoVar v_occ = "The coercion variable"
| otherwise = "The value variable"
- check_bad_global :: InVar -> LintM ()
+ check_bad_global :: Var -> LintM ()
-- 'check_bad_global' checks for the case where an /occurrence/ is
-- a GlobalId, but there is an enclosing binding for a LocalId.
-- NB: the in-scope variables are mostly LocalIds, checked by lintIdBndr,
@@ -3616,26 +3487,26 @@ lintVarOcc v_occ
| otherwise
= return ()
- check_occ_type_match :: InType -> LintM ()
+ check_occ_type_match :: Type -> LintM ()
-- Check that the type in /binder/ and the type in the /occurrence/ are the same
check_occ_type_match bndr_ty
- = ensureEqTys bndr_ty occ_ty $ -- Compares InTypes
+ = ensureEqTys bndr_ty occ_ty $ -- Compares Types
mkBndrOccTypeMismatchMsg v_occ bndr_ty occ_ty
- check_occ_type_scope :: VarEnv (InVar,OutType,LintLevel) -> InType -> LintLevel -> LintM ()
+ check_occ_type_scope :: VarEnv (Var,LintLevel) -> Type -> LintLevel -> LintM ()
-- Check that the free vars of the binder's type
-- are not shadowed at the occurrence site
check_occ_type_scope in_var_env bndr_ty bind_level
= checkL (null bad_fvs) $
mkBndrOccFreeVarMsg v_occ occ_ty bad_fvs
where
- bad_fvs :: [InVar]
+ bad_fvs :: [Var]
bad_fvs = filter is_bad (tyCoVarsOfTypeList bndr_ty)
- is_bad :: InVar -> Bool
+ is_bad :: Var -> Bool
-- True of a variable bound inside bind_level
is_bad v = case lookupVarEnv in_var_env v of
- Just (_, _, v_level) -> v_level > bind_level
+ Just (_, v_level) -> v_level > bind_level
Nothing -> True
lookupJoinId :: Id -> LintM (Maybe (JoinArity, JoinOcc))
@@ -3647,21 +3518,21 @@ lookupJoinId id
Just join_occ -> return $ Just (idJoinArity id, join_occ)
Nothing -> return Nothing }
-addAliasUE :: OutId -> UsageEnv -> LintM a -> LintM a
+addAliasUE :: Id -> UsageEnv -> LintM a -> LintM a
addAliasUE id ue thing_inside = LintM $ \ env errs ->
let new_ue_aliases =
extendNameEnv (le_ue_aliases env) (getName id) ue
in
unLintM thing_inside (env { le_ue_aliases = new_ue_aliases }) errs
-varCallSiteUsage :: OutId -> LintM UsageEnv
+varCallSiteUsage :: Id -> LintM UsageEnv
varCallSiteUsage id =
do m <- getUEAliases
return $ case lookupNameEnv m (getName id) of
Nothing -> singleUsageUE id
Just id_ue -> id_ue
-ensureEqTys :: OutType -> OutType -> SDoc -> LintM ()
+ensureEqTys :: Type -> Type -> SDoc -> LintM ()
-- check ty2 is subtype of ty1 (ie, has same structure but usage
-- annotations need only be consistent, not equal)
-- Assumes ty1,ty2 are have already had the substitution applied
@@ -3885,7 +3756,7 @@ mkLetErr bndr rhs
hang (text "Rhs:")
4 (ppr rhs)]
-mkTyAppMsg :: OutType -> Type -> SDoc
+mkTyAppMsg :: Type -> Type -> SDoc
mkTyAppMsg ty arg_ty
= vcat [text "Illegal type application:",
hang (text "Function type:")
@@ -4006,13 +3877,13 @@ mkJoinBndrOccMismatchMsg bndr join_arity_bndr join_arity_occ
, text "Arity at binding site:" <+> ppr join_arity_bndr
, text "Arity at occurrence: " <+> ppr join_arity_occ ]
-mkBndrOccTypeMismatchMsg :: InVar -> InType -> InType -> SDoc
+mkBndrOccTypeMismatchMsg :: Var -> Type -> Type -> SDoc
mkBndrOccTypeMismatchMsg var bndr_ty occ_ty
= vcat [ text "Mismatch in type between binder and occurrence"
, text "Binder: " <+> ppr var <+> dcolon <+> ppr bndr_ty
, text "Occurrence:" <+> ppr var <+> dcolon <+> ppr occ_ty ]
-mkBndrOccFreeVarMsg :: InVar -> InType -> [TyCoVar] -> SDoc
+mkBndrOccFreeVarMsg :: Var -> Type -> [TyCoVar] -> SDoc
mkBndrOccFreeVarMsg var occ_ty bad_tvs
= vcat [ text "Free vars of type are shadowed:" <+> ppr bad_tvs
, text "Occurrence:" <+> ppr var <+> dcolon <+> ppr occ_ty ]
=====================================
compiler/GHC/Core/Opt/OccurAnal.hs
=====================================
@@ -2676,6 +2676,8 @@ occAnalArgs :: OccEnv -> CoreExpr -> [CoreExpr]
-> WithUsageDetails CoreExpr
-- The `fun` argument is just an accumulating parameter,
-- the base for building the application we return
+--
+-- We have applied markAllNonTail to the returned usage-details
occAnalArgs env fun args one_shots
= go emptyDetails fun args one_shots
where
@@ -2686,7 +2688,9 @@ occAnalArgs env fun args one_shots
encl | Var f <- fun, isDeadEndSig (idDmdSig f) = OccScrut
| otherwise = OccVanilla
- go uds fun [] _ = WUD uds fun
+ go uds fun [] _ = WUD (markAllNonTail uds) fun
+ -- markAllNonTail: calls in arguments are not tail calls!
+
go uds fun (arg:args) one_shots
= go (uds `andUDs` arg_uds) (fun `App` arg') args one_shots'
where
@@ -2778,8 +2782,7 @@ occAnalApp env (Var fun_id, args, ticks)
all_uds = fun_uds `andUDs` final_args_uds
- !final_args_uds = markAllNonTail $
- markAllInsideLamIf (isRhsEnv env && is_exp) $
+ !final_args_uds = markAllInsideLamIf (isRhsEnv env && is_exp) $
-- isRhsEnv: see Note [OccEncl]
args_uds
-- We mark the free vars of the argument of a constructor or PAP
@@ -2809,33 +2812,46 @@ occAnalApp env (Var fun_id, args, ticks)
-- See Note [Sources of one-shot information], bullet point A']
occAnalApp env (fun, args, ticks)
- = let app_out = mkTicks ticks app'
- in WUD (markAllNonTail (fun_uds `andUDs` args_uds)) app_out
-
+ = WUD (fun_uds `andUDs` args_uds) (mkTicks ticks app')
where
!(WUD args_uds app') = occAnalArgs env fun' args []
- !(WUD fun_uds fun') = occAnal (addAppCtxt env args) fun
- -- The addAppCtxt is a bit cunning. One iteration of the simplifier
- -- often leaves behind beta redexes like
- -- (\x y -> e) a1 a2
- -- Here we would like to mark x,y as one-shot, and treat the whole
- -- thing much like a let. We do this by pushing some OneShotLam items
- -- onto the context stack.
-
-addAppCtxt :: OccEnv -> [Arg CoreBndr] -> OccEnv
-addAppCtxt env@(OccEnv { occ_one_shots = ctxt }) args
- | n_val_args > 0
- = env { occ_one_shots = replicate n_val_args OneShotLam ++ ctxt
- , occ_encl = OccVanilla }
- -- OccVanilla: the function part of the application
- -- is no longer on OccRhs or OccScrut
- | otherwise
- = env
- where
- n_val_args = valArgCount args
+ !(WUD fun_uds fun') = go_fun env fun args
+
+ -- See Note [occAnal for applications]
+ go_fun env (Lam bndr body) (_ : args)
+ = addInScopeOne env bndr $ \ env' ->
+ let !(WUD body_uds body') = go_fun env' body args
+ !bndr' = tagLamBinder body_uds bndr
+ in WUD body_uds (Lam bndr' body')
+ go_fun env fun args
+ | null args
+ = occAnal env fun
+ | otherwise
+ = let !env' = env { occ_encl = OccVanilla }
+ -- OccVanilla: the function part of the
+ -- application is no longer OccRhs or OccScrut
+ !(WUD fun_uds fun') = occAnal env' fun
+ in WUD (markAllNonTail fun_uds) fun'
+{- Note [occAnal for applications]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+One iteration of the simplifier sometimes leaves behind beta redexes like
+ (\x y -> e) a1 a2
+This happens particularly in worker/wrapper; see Note [Join points and beta-redexes]
+in GHC.Core.Lint. In these cases there are two things we want to take care of
+in the occurrence analyser:
+
+* We don't want to mark variables inside `e` as `InsideLam`; that would just
+ delay inlining them for another iteration of the Simplifier.
+
+* If there is a join-point invocation inside `e`, we don't want to complain about
+ lost join points. See Note [Join points and beta-redexes] in GHC.Core.Lint for
+ more detail.
+
+It is easy to address both of these: in `occAnalApp`, simply walk down the
+function, matching lambdas with arguments. This is done by the local `go_fun`
+loop.
-{-
Note [Sources of one-shot information]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The occurrence analyser obtains one-shot-lambda information from two sources:
=====================================
compiler/GHC/Core/Opt/WorkWrap/Utils.hs
=====================================
@@ -241,10 +241,10 @@ mkWwBodies opts fun_id ww_arity arg_vars res_ty demands res_cpr
= (work_args, work_args, work_marks)
call_work work_fn = mkVarApps (Var work_fn) work_call_args
- call_rhs fn_rhs = mkAppsBeta fn_rhs fn_args
- -- See Note [Join points and beta-redexes]
+ call_rhs fn_rhs = mkApps fn_rhs fn_args
+ -- See Note [Join points and beta-redexes] in GHC.Core.Lint
wrapper_body = mkLams cloned_arg_vars . wrap_fn_cpr . wrap_fn_str . call_work
- -- See Note [Call-by-value for worker args]
+ -- See Note [Call-by-value for worker args]
work_seq_str_flds = mkStrictFieldSeqs (zip work_lam_args work_call_str)
worker_body = mkLams work_lam_args . work_seq_str_flds . work_fn_cpr . call_rhs
worker_args_dmds= [ idDemandInfo v | v <- work_call_args, isId v]
@@ -280,14 +280,6 @@ mkWwBodies opts fun_id ww_arity arg_vars res_ty demands res_cpr
arity_ok | isJoinId fun_id = ww_arity <= n_dmds
| otherwise = ww_arity == n_dmds
--- | Version of 'GHC.Core.mkApps' that does beta reduction on-the-fly.
--- PRECONDITION: The arg expressions are not free in any of the lambdas binders.
-mkAppsBeta :: CoreExpr -> [CoreArg] -> CoreExpr
--- The precondition holds for our call site in mkWwBodies, because all the FVs
--- of as are either cloned_arg_vars (and thus fresh) or fresh worker args.
-mkAppsBeta (Lam b body) (a:as) = bindNonRec b a $! mkAppsBeta body as
-mkAppsBeta f as = mkApps f as
-
-- See Note [Limit w/w arity]
isWorkerSmallEnough :: Int -> Int -> [Var] -> Bool
isWorkerSmallEnough max_worker_args old_n_args vars
@@ -525,36 +517,6 @@ Solution is simple: put the void argument /last/:
c.f Note [SpecConstr void argument insertion] in GHC.Core.Opt.SpecConstr
-Note [Join points and beta-redexes]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Originally, the worker would invoke the original function by calling it with
-arguments, thus producing a beta-redex for the simplifier to munch away:
-
- \x y z -> e => (\x y z -> e) wx wy wz
-
-Now that we have special rules about join points, however, this is Not Good if
-the original function is itself a join point, as then it may contain invocations
-of other join points:
-
- join j1 x = ...
- join j2 y = if y == 0 then 0 else j1 y
-
- =>
-
- join j1 x = ...
- join $wj2 y# = let wy = I# y# in (\y -> if y == 0 then 0 else jump j1 y) wy
- join j2 y = case y of I# y# -> jump $wj2 y#
-
-There can't be an intervening lambda between a join point's declaration and its
-occurrences, so $wj2 here is wrong. But of course, this is easy enough to fix:
-
- ...
- let join $wj2 y# = let wy = I# y# in let y = wy in if y == 0 then 0 else j1 y
- ...
-
-Hence we simply do the beta-reduction here. (This would be harder if we had to
-worry about hygiene, but luckily wy is freshly generated.)
-
Note [Freshen WW arguments]
~~~~~~~~~~~~~~~~~~~~~~~~~~~
When we do a worker/wrapper split, we must freshen the arg vars of the original
=====================================
compiler/GHC/Core/Subst.hs
=====================================
@@ -13,7 +13,8 @@ module GHC.Core.Subst (
-- ** Substituting into expressions and related types
deShadowBinds, substRuleInfo, substRulesForImportedIds,
- substTyUnchecked, substCo, substExpr, substExprSC, substBind, substBindSC,
+ substTy, substTyUnchecked, substCo,
+ substExpr, substExprSC, substBind, substBindSC,
substUnfolding, substUnfoldingSC,
lookupIdSubst, lookupIdSubst_maybe, substIdType, substIdOcc,
substTickish, substDVarSet, substIdInfo,
@@ -42,8 +43,7 @@ import GHC.Core.FVs
import GHC.Core.Seq
import GHC.Core.Utils
- -- We are defining local versions
-import GHC.Core.Type hiding ( substTy )
+import GHC.Core.Type
import GHC.Core.Coercion( mkCoVarCo, substCoVarBndr )
import GHC.Core.TyCo.FVs
=====================================
compiler/GHC/Core/SubstTypeLets.hs
=====================================
@@ -0,0 +1,127 @@
+{-
+(c) The University of Glasgow 2006
+(c) The GRASP/AQUA Project, Glasgow University, 1993-1998
+-}
+
+module GHC.Core.SubstTypeLets(
+ substTypeLets
+ ) where
+
+import GHC.Prelude
+
+import GHC.Core
+import GHC.Core.Subst
+import GHC.Core.Utils( mkInScopeSetBndrs )
+
+import GHC.Types.Var
+
+import GHC.Utils.Misc( mapSnd )
+import GHC.Utils.Outputable
+import GHC.Utils.Panic
+
+{- Note [Substituting type-lets]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+When desugaring pattern matching we really, really need non-Lint-acceptable type-lets.
+Suppose we have
+ f (MkT a (Just a (x::a)) (y::a)) = rhs1
+ f (MkT b (Nothing b) (z::b)) = rhs2
+where
+ MkT :: ∀ a. Maybe a -> a -> T
+
+We desugar this to
+ f x = case x of
+ MkT w (v :: Maybe w) (p:w)
+ -> let { a=w, b=w }
+ in let { y:a=p, z:b=p }
+ in case v of
+ Just a (x:a) -> rhs1 [y::a]
+ Nothing b -> rhs2 [z::b]
+
+Look at those type-lets { a=w, b=w }. They make the type variables in the
+/two/ separately-typechecked clauses for `f` line up with the /single/ pattern
+match on `x`, which binds the type variable `w`.
+
+Key point: the body of the let is only type-correct /after/ substituting
+a:=w, b:=w. Even the next let, { y:a=p } isn't type-correct without that
+substitution, because (p:w).
+
+So the `substTypeLets` pass runs before we Lint the output of the desugarer.
+When it finds a nested type-let
+ let @a = ty in body
+it substitutes a:=ty in `body`
+
+Wrinkles
+
+(STL1) It only substitutes /nested/ type-lets, not top level.
+
+(STL2) You might think that we'd run it unconditionally, after desugaring. But actually,
+ the Simplifier (or SimpleOpt) will deal with these type-lets, so it is just Lint
+ that we must placate. We don't want to incur the cost of this pass except when
+ we are Linting.
+
+ TL;DR: we do substTypeLets as a pre-pass to the Lint pass that immediately follows
+ desugaring. See `GHC.Core.lintPassResult`, and the `lpr_preSubst` field in
+ `LintPassResultConfig`.
+-}
+
+substTypeLets :: CoreProgram -> CoreProgram
+substTypeLets binds = map stl_top binds
+ where
+ stl_top (NonRec b r) = NonRec b (stlExpr empty_subst r)
+ stl_top (Rec prs) = Rec (mapSnd (stlExpr empty_subst) prs)
+
+ empty_subst = mkEmptySubst $
+ mkInScopeSetBndrs binds
+
+----------------------
+stlBind :: Subst -> CoreBind -> (Subst, CoreBind)
+stlBind subst (Rec prs)
+ = assertPpr (not (any isTyVar bndrs)) (ppr prs) $
+ (subst', Rec prs')
+ where
+ (bndrs,rhss) = unzip prs
+ (subst', bndrs') = substRecBndrs subst bndrs
+ rhss' = map (stlExpr subst') rhss
+ prs' = bndrs' `zip` rhss'
+
+stlBind subst (NonRec bndr rhs)
+ = (subst', NonRec bndr' (stlExpr subst rhs))
+ where
+ (subst', bndr') = substBndr subst bndr
+
+----------------------
+stlExpr :: Subst -> CoreExpr -> CoreExpr
+
+stlExpr subst (Let (NonRec tv (Type ty)) body)
+ = -- This equation is the main payload of the entire pass!
+ stlExpr (extendTvSubst subst tv ty) body
+
+stlExpr subst (Let bind body)
+ = Let bind' (stlExpr subst' body)
+ where
+ (subst', bind') = stlBind subst bind
+
+stlExpr subst (Lam bndr body)
+ = Lam bndr' (stlExpr subst' body)
+ where
+ (subst', bndr') = substBndr subst bndr
+
+stlExpr subst (Case scrut bndr ty alts)
+ = Case (stlExpr subst scrut) bndr' (substTy subst ty)
+ (map stl_alt alts)
+ where
+ (subst', bndr') = substBndr subst bndr
+
+ stl_alt (Alt con bndrs rhs)
+ = Alt con bndrs' (stlExpr subst'' rhs)
+ where
+ (subst'', bndrs') = substBndrs subst' bndrs
+
+-- Simple cases
+stlExpr _ (Lit l) = Lit l
+stlExpr subst (Var v) = lookupIdSubst subst v
+stlExpr subst (App e1 e2) = App (stlExpr subst e1) (stlExpr subst e2)
+stlExpr subst (Type ty) = Type (substTy subst ty)
+stlExpr subst (Tick t e) = Tick (substTickish subst t) (stlExpr subst e)
+stlExpr subst (Cast e co) = Cast (stlExpr subst e) (substCo subst co)
+stlExpr subst (Coercion co) = Coercion (substCo subst co)
=====================================
compiler/GHC/Driver/Config/Core/Lint.hs
=====================================
@@ -52,6 +52,7 @@ endPassHscEnvIO hsc_env name_ppr_ctx pass binds rules
-- | Type-check a 'CoreProgram'. See Note [Core Lint guarantee].
lintCoreBindings :: DynFlags -> CoreToDo -> [Var] -> CoreProgram -> WarnsAndErrs
+-- ToDo: this function is not called within GHC. Why does it exist?
lintCoreBindings dflags coreToDo vars -- binds
= lintCoreBindings' $ LintConfig
{ l_diagOpts = initDiagOpts dflags
@@ -104,10 +105,15 @@ initLintPassResultConfig dflags extra_vars pass = LintPassResultConfig
{ lpr_diagOpts = initDiagOpts dflags
, lpr_platform = targetPlatform dflags
, lpr_makeLintFlags = perPassFlags dflags pass
- , lpr_passPpr = ppr pass
+ , lpr_passPpr = ppr pass
+ , lpr_preSubst = doPreSubst pass
, lpr_localsInScope = extra_vars
}
+doPreSubst :: CoreToDo -> Bool
+doPreSubst CoreDesugar = True
+doPreSubst _ = False
+
perPassFlags :: DynFlags -> CoreToDo -> LintFlags
perPassFlags dflags pass
= (defaultLintFlags dflags)
@@ -116,7 +122,8 @@ perPassFlags dflags pass
, lf_check_static_ptrs = check_static_ptrs
, lf_check_linearity = check_linearity
, lf_check_rubbish_lits = check_rubbish
- , lf_allow_weak_joins = allow_weak_joins }
+ , lf_allow_weak_joins = allow_weak_joins
+ , lf_allow_beta_joins = allow_beta_joins }
where
-- See Note [Checking for global Ids]
check_globals = case pass of
@@ -158,6 +165,11 @@ perPassFlags dflags pass
CorePrep -> True
_ -> False
+ -- See Note [Join points and beta-redexes] in GHC.Core.Lint
+ allow_beta_joins = case pass of
+ CoreDoWorkerWrapper -> True
+ _ -> False
+
initLintConfig :: DynFlags -> [Var] -> LintConfig
initLintConfig dflags vars =LintConfig
{ l_diagOpts = initDiagOpts dflags
@@ -175,4 +187,5 @@ defaultLintFlags dflags = LF { lf_check_global_ids = False
, lf_check_fixed_rep = True
, lf_check_rubbish_lits = True
, lf_allow_weak_joins = False
+ , lf_allow_beta_joins = False
}
=====================================
compiler/ghc.cabal.in
=====================================
@@ -411,6 +411,7 @@ Library
GHC.Core.SimpleOpt
GHC.Core.Stats
GHC.Core.Subst
+ GHC.Core.SubstTypeLets
GHC.Core.Tidy
GHC.CoreToIface
GHC.CoreToStg
=====================================
testsuite/tests/corelint/LintEtaExpand.stderr
=====================================
@@ -1,32 +1,16 @@
<no location info>: warning:
• The first argument of ‘coerce’ does not have a fixed runtime representation:
a :: TYPE k
- Substitution: <InScope = {a q}
- IdSubst = []
- TvSubst = []
- CvSubst = []>
in coerce BAD 1
<no location info>: warning:
• The first argument of ‘coerce’ does not have a fixed runtime representation:
‘q’ is not concrete.
- Substitution: <InScope = {a q}
- IdSubst = []
- TvSubst = []
- CvSubst = []>
in coerce BAD 2
<no location info>: warning:
• The result of the first argument of the primop ‘catch#’ does not have a fixed runtime representation:
a :: TYPE q
- Substitution: <InScope = {a q}
- IdSubst = []
- TvSubst = []
- CvSubst = []>
in catch# BAD 1
<no location info>: warning:
• The result of the first argument of the primop ‘catch#’ does not have a fixed runtime representation:
‘q’ is not concrete.
- Substitution: <InScope = {a q}
- IdSubst = []
- TvSubst = []
- CvSubst = []>
in catch# BAD 2
=====================================
testsuite/tests/corelint/T21115b.stderr
=====================================
@@ -6,10 +6,6 @@ T21115b.hs:9:1: warning:
In the body of lambda with binder ds :: Double#
In the body of a let with binder fail :: (# #) -> Int#
In the body of a let with binder fail :: (# #) -> Int#
- Substitution: <InScope = {}
- IdSubst = []
- TvSubst = []
- CvSubst = []>
*** Offending Program ***
Rec {
$trModule = Module (TrNameS "main"#) (TrNameS "T21115b"#)
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b97d30ebf122333335da4371514ad86…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b97d30ebf122333335da4371514ad86…
You're receiving this email because of your account on gitlab.haskell.org.
1
0
[Git][ghc/ghc][wip/supersven/correctly_propagate_host-build-target] Unset CFLAGS for install phase
by Sven Tennie (＠supersven) 06 Apr '26
by Sven Tennie (＠supersven) 06 Apr '26
06 Apr '26
Sven Tennie pushed to branch wip/supersven/correctly_propagate_host-build-target at Glasgow Haskell Compiler / GHC
Commits:
38a28bd0 by Sven Tennie at 2026-04-06T11:46:06+02:00
Unset CFLAGS for install phase
- - - - -
1 changed file:
- .gitlab/ci.sh
Changes:
=====================================
.gitlab/ci.sh
=====================================
@@ -628,6 +628,10 @@ function install_bindist() {
*)
read -r -a args <<< "${INSTALL_CONFIGURE_ARGS:-}"
+ # These are meant for the ./configure script of the build phase
+ unset CFLAGS
+ unset CONF_CC_OPTS_STAGE2
+
run ${CONFIGURE_WRAPPER:-} ./configure \
--prefix="$instdir" \
"${args[@]+"${args[@]}"}" || fail "bindist configure failed"
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/38a28bd0e82f3463372ea9f960d3550…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/38a28bd0e82f3463372ea9f960d3550…
You're receiving this email because of your account on gitlab.haskell.org.
1
0
[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: Add utility pprTrace_ function
by Marge Bot (＠marge-bot) 06 Apr '26
by Marge Bot (＠marge-bot) 06 Apr '26
06 Apr '26
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
4bf040c6 by sheaf at 2026-04-05T14:56:29-04:00
Add utility pprTrace_ function
This function is useful for quick debugging, as it can be added to a
where clause to pretty-print debugging information:
fooBar x y
| cond = body1
| otherwise = body2
where
!_ = pprTrace_ "fooBar" $
vcat [ text "x:" <+> ppr x
, text "y:" <+> ppr y
, text "cond:" <+> ppr cond
]
- - - - -
eb2d16cb by Andrew Lelechenko at 2026-04-06T05:02:32-04:00
base: improve error message for Data.Char.chr
As per https://github.com/haskell/core-libraries-committee/issues/384
- - - - -
6 changed files:
- compiler/GHC/Utils/Trace.hs
- libraries/base/changelog.md
- libraries/base/tests/enum01.stdout
- libraries/base/tests/enum01.stdout-alpha-dec-osf3
- libraries/base/tests/enum01.stdout-ws-64
- libraries/ghc-internal/src/GHC/Internal/Char.hs
Changes:
=====================================
compiler/GHC/Utils/Trace.hs
=====================================
@@ -1,6 +1,7 @@
-- | Tracing utilities
module GHC.Utils.Trace
( pprTrace
+ , pprTrace_
, pprTraceM
, pprTraceDebug
, pprTraceIt
@@ -43,6 +44,22 @@ pprTrace str doc x
| unsafeHasNoDebugOutput = x
| otherwise = pprDebugAndThen traceSDocContext trace (text str) doc x
+-- | A version of 'pprTrace' that is useful for quick debugging:
+--
+-- @
+-- fooBar x y
+-- | cond = body1
+-- | otherwise = body2
+-- where
+-- !_ = pprTrace_ "fooBar" $
+-- vcat [ text "x:" <+> ppr x
+-- , text "y:" <+> ppr y
+-- , text "cond:" <+> ppr cond
+-- ]
+-- @
+pprTrace_ :: String -> SDoc -> ()
+pprTrace_ str doc = pprTrace str doc ()
+
pprTraceM :: Applicative f => String -> SDoc -> f ()
pprTraceM str doc = pprTrace str doc (pure ())
=====================================
libraries/base/changelog.md
=====================================
@@ -28,6 +28,7 @@
* Hide implementation details when throwing exceptions in throw and throwSTM. ([CLC proposal #387](https://github.com/haskell/core-libraries-committee/issues/387))
* Change `hIsReadable` and `hIsWritable` such that they always throw a respective exception when encountering a closed or semi-closed handle, not just in the case of a file handle. ([CLC proposal #371](github.com/haskell/core-libraries-committee/issues/371))
* Annotate `onException` continuation with `WhileHandling`. ([CLC Proposal #397](https://github.com/haskell/core-libraries-committee/issues/397))
+ * Improve error message for `Data.Char.chr`. ([CLC Proposal #384](https://github.com/haskell/core-libraries-committee/issues/384))
## 4.22.0.0 *TBA*
* Shipped with GHC 9.14.1
=====================================
libraries/base/tests/enum01.stdout
=====================================
@@ -81,7 +81,7 @@ Testing Enum Char:
pred (maxBound::Char) = '\1114110'
pred (minBound::Char) = error "Prelude.Enum.Char.pred: bad argument"
(map (toEnum::Int->Char) [123,ord (minBound::Char), ord(maxBound::Char)]) = "{\NUL\1114111"
- (toEnum::Int->Char) (minBound::Int) = error "Prelude.chr: bad argument: (-2147483648)"
+ (toEnum::Int->Char) (minBound::Int) = error "Data.Char.chr: argument outside Unicode range: 0..1114111: (-2147483648)"
(map fromEnum ['X',minBound,maxBound]) = [88,0,1114111]
(take 7 ['\NUL' .. ]) = "\NUL\SOH\STX\ETX\EOT\ENQ\ACK"
(take 7 ['\250' .. ]) = "\250\251\252\253\254\255\256"
=====================================
libraries/base/tests/enum01.stdout-alpha-dec-osf3
=====================================
@@ -65,7 +65,7 @@ Testing Enum Char:
pred (maxBound::Char) = '\1114110'
pred (minBound::Char) = error "Prelude.Enum.Char.pred: bad argument"
(map (toEnum::Int->Char) [123,ord (minBound::Char), ord(maxBound::Char)]) = "{\NUL\1114111"
- (toEnum::Int->Char) (minBound::Int) = error "Prelude.chr: bad argument"
+ (toEnum::Int->Char) (minBound::Int) = error "Data.Char.chr: argument outside Unicode range: 0..1114111:"
(map fromEnum ['X',minBound,maxBound]) = [88,0,1114111]
(take 7 ['\NUL' .. ]) = "\NUL\SOH\STX\ETX\EOT\ENQ\ACK"
(take 7 ['\250' .. ]) = "\250\251\252\253\254\255\256"
=====================================
libraries/base/tests/enum01.stdout-ws-64
=====================================
@@ -81,7 +81,7 @@ Testing Enum Char:
pred (maxBound::Char) = '\1114110'
pred (minBound::Char) = error "Prelude.Enum.Char.pred: bad argument"
(map (toEnum::Int->Char) [123,ord (minBound::Char), ord(maxBound::Char)]) = "{\NUL\1114111"
- (toEnum::Int->Char) (minBound::Int) = error "Prelude.chr: bad argument: (-9223372036854775808)"
+ (toEnum::Int->Char) (minBound::Int) = error "Data.Char.chr: argument outside Unicode range: 0..1114111: (-9223372036854775808)"
(map fromEnum ['X',minBound,maxBound]) = [88,0,1114111]
(take 7 ['\NUL' .. ]) = "\NUL\SOH\STX\ETX\EOT\ENQ\ACK"
(take 7 ['\250' .. ]) = "\250\251\252\253\254\255\256"
=====================================
libraries/ghc-internal/src/GHC/Internal/Char.hs
=====================================
@@ -12,7 +12,7 @@ module GHC.Internal.Char
import GHC.Internal.Classes (eqChar, neChar)
import GHC.Internal.Base (otherwise, (++))
-import GHC.Internal.Err (errorWithoutStackTrace)
+import GHC.Internal.Err (error)
import GHC.Internal.Show
import GHC.Internal.Prim (chr#, int2Word#, leWord#, Int#, Char#)
import GHC.Internal.Types (Char(..), Int(..), isTrue#)
@@ -29,4 +29,7 @@ safe_chr# i#
{-# NOINLINE chr_error #-}
chr_error :: Int# -> Char#
-chr_error i# = errorWithoutStackTrace ("Prelude.chr: bad argument: " ++ showSignedInt (I# 9#) (I# i#) "")
+chr_error i# = error ("Data.Char.chr: argument outside Unicode range: 0..1114111: " ++ showSignedInt (I# 9#) (I# i#) "")
+-- It's not really "Data.Char", but we assume that
+-- the majority of users will import it from "base:Data.Char"
+-- and not from "ghc-internal:GHC.Internal.Char".
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5e924580d77c483967fd2d3d4591ce…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5e924580d77c483967fd2d3d4591ce…
You're receiving this email because of your account on gitlab.haskell.org.
1
0