- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/romes/step-out-5] 2 commits: docs: Case continuation BCOs
by Rodrigo Mesquita (＠alt-romes) 16 Jun '25

16 Jun '25

Rodrigo Mesquita pushed to branch wip/romes/step-out-5 at Glasgow Haskell Compiler / GHC Commits: 4518ebaf by Rodrigo Mesquita at 2025-06-16T13:50:30+01:00 docs: Case continuation BCOs This commit documents a subtle interaction between frames for case BCOs and their parents frames. Namely, case continuation BCOs may refer to (non-local) variables that are part of the parent's frame. The note expanding a bit on these details is called [Case continuation BCOs] - - - - - c7b043ae by Rodrigo Mesquita at 2025-06-16T14:45:00+01:00 debugger: Implement step-out feature Implements support for stepping-out of a function (aka breaking right after returning from a function) in the interactive debugger. It also introduces a GHCi command :stepout to step-out of a function being debugged in the interpreter. The feature is described as: Stop at the first breakpoint immediately after returning from the current function scope. Known limitations: because a function tail-call does not push a stack frame, if step-out is used inside of a function that was tail-called, execution will not be returned to its caller, but rather its caller's first non-tail caller. On the other hand, it means the debugger follows the more realistic execution of the program. In the following example: .. code-block:: none f = do a b <--- (1) set breakpoint then step in here c b = do ... d <--- (2) step-into this tail call d = do ... something <--- (3) step-out here ... Stepping-out will stop execution at the `c` invokation in `f`, rather than stopping at `b`. The key idea is simple: When step-out is enabled, traverse the runtime stack until a continuation BCO is found -- and enable the breakpoint heading that BCO explicitly using its tick-index. The details are specified in `Note [Debugger: Step-out]` in `rts/Interpreter.c`. Since PUSH_ALTS BCOs (representing case continuations) were never headed by a breakpoint (unlike the case alternatives they push), we introduced the BRK_ALTS instruction to allow the debugger to set a case continuation to stop at the breakpoint heading the alternative that is taken. This is further described in `Note [Debugger: BRK_ALTS]`. Fixes #26042 - - - - - 40 changed files: - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Driver/Config.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Runtime/Eval/Types.hs - compiler/GHC/StgToByteCode.hs - docs/users_guide/ghci.rst - ghc/GHCi/UI.hs - libraries/ghc-heap/GHC/Exts/Heap/Closures.hs - libraries/ghc-heap/GHC/Exts/Heap/FFIClosures_ProfilingDisabled.hsc - libraries/ghc-heap/GHC/Exts/Heap/FFIClosures_ProfilingEnabled.hsc - libraries/ghc-heap/tests/parse_tso_flags.hs - libraries/ghci/GHCi/Debugger.hs - libraries/ghci/GHCi/Message.hs - libraries/ghci/GHCi/Run.hs - + rts/Debugger.cmm - rts/Disassembler.c - rts/Interpreter.c - rts/Interpreter.h - rts/RtsSymbols.c - rts/StgMiscClosures.cmm - rts/include/rts/Bytecodes.h - rts/include/rts/Constants.h - rts/include/rts/storage/Closures.h - rts/rts.cabal - + testsuite/tests/ghci.debugger/scripts/T26042a.hs - + testsuite/tests/ghci.debugger/scripts/T26042a.script - + testsuite/tests/ghci.debugger/scripts/T26042a.stdout - + testsuite/tests/ghci.debugger/scripts/T26042b.hs - + testsuite/tests/ghci.debugger/scripts/T26042b.script - + testsuite/tests/ghci.debugger/scripts/T26042b.stdout - + testsuite/tests/ghci.debugger/scripts/T26042c.hs - + testsuite/tests/ghci.debugger/scripts/T26042c.script - + testsuite/tests/ghci.debugger/scripts/T26042c.stdout - + testsuite/tests/ghci.debugger/scripts/T26042d.hs - + testsuite/tests/ghci.debugger/scripts/T26042e.hs - + testsuite/tests/ghci.debugger/scripts/T26042f.hs - + testsuite/tests/ghci.debugger/scripts/T26042g.hs - testsuite/tests/ghci.debugger/scripts/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2d7995dca4abd94a3f36a14e8262f6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2d7995dca4abd94a3f36a14e8262f6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/step-out-5] BRK_ALTS BCO
by Rodrigo Mesquita (＠alt-romes) 16 Jun '25

16 Jun '25

Rodrigo Mesquita pushed to branch wip/romes/step-out-5 at Glasgow Haskell Compiler / GHC Commits: 2d7995dc by Rodrigo Mesquita at 2025-06-16T12:05:34+01:00 BRK_ALTS BCO - - - - - 6 changed files: - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/StgToByteCode.hs - rts/Disassembler.c - rts/Interpreter.c - rts/include/rts/Bytecodes.h Changes: ===================================== compiler/GHC/ByteCode/Asm.hs ===================================== @@ -858,7 +858,7 @@ assembleI platform i = case i of , Op np ] - BRK_INTERNAL active -> emit_ bci_BRK_INTERNAL [SmallOp active] + BRK_ALTS active -> emit_ bci_BRK_ALTS [SmallOp active] #if MIN_VERSION_rts(1,0,3) BCO_NAME name -> do np <- lit1 (BCONPtrStr name) ===================================== compiler/GHC/ByteCode/Instr.hs ===================================== @@ -272,9 +272,10 @@ data BCInstr !UnitId -- breakpoint info module unit id !Word16 -- breakpoint info index (RemotePtr CostCentre) - -- An internal breakpoint should only be set by the compiler or RTS - -- See Note [BRK_INTERNAL] - | BRK_INTERNAL !Word16 {- enabled? -} + + -- An internal breakpoint for triggering a break on any case alternative + -- See Note [Debugger: BRK_ALTS] + | BRK_ALTS !Word16 {- enabled? -} #if MIN_VERSION_rts(1,0,3) -- | A "meta"-instruction for recording the name of a BCO for debugging purposes. @@ -471,7 +472,7 @@ instance Outputable BCInstr where <+> text "<tick_module>" <+> text "<tick_module_unitid>" <+> ppr tickx <+> text "<info_module>" <+> text "<info_module_unitid>" <+> ppr infox <+> text "<cc>" - ppr (BRK_INTERNAL active) = text "BRK_INTERNAL" <+> ppr active + ppr (BRK_ALTS active) = text "BRK_ALTS" <+> ppr active #if MIN_VERSION_rts(1,0,3) ppr (BCO_NAME nm) = text "BCO_NAME" <+> text (show nm) #endif @@ -597,7 +598,7 @@ bciStackUse OP_INDEX_ADDR{} = 0 bciStackUse SWIZZLE{} = 0 bciStackUse BRK_FUN{} = 0 -bciStackUse BRK_INTERNAL{} = 0 +bciStackUse BRK_ALTS{} = 0 -- These insns actually reduce stack use, but we need the high-tide level, -- so can't use this info. Not that it matters much. ===================================== compiler/GHC/StgToByteCode.hs ===================================== @@ -1372,7 +1372,10 @@ doCase d s p scrut bndr alts | ubx_tuple_frame = SLIDE 0 2 `consOL` alt_final0 | otherwise = alt_final0 alt_final - = BRK_INTERNAL 0 `consOL` alt_final1 + | gopt Opt_InsertBreakpoints (hsc_dflags hsc_env) + -- See Note [Debugger: BRK_ALTS] + = BRK_ALTS 0 `consOL` alt_final1 + | otherwise = alt_final1 add_bco_name <- shouldAddBcoName let @@ -1392,6 +1395,37 @@ doCase d s p scrut bndr alts _ -> panic "schemeE(StgCase).push_alts" in return (PUSH_ALTS alt_bco scrut_rep `consOL` scrut_code) +{- +Note [Debugger: BRK_ALTS] +~~~~~~~~~~~~~~~~~~~~~~~~~ +As described in Note [Debugger: Step-out] in rts/Interpreter.c, to implement +the stepping-out debugger feature we traverse the heap at runtime, identify +the continuation BCO, and explicitly enable that BCO's breakpoint thus ensuring +we stop exactly when we return to the continuation. + +However, a case continuation BCO (pushed by PUSH_ALTS), which computes what +case alternative BCO to take, never gets a user-facing breakpoint tick (BRK_FUN): + + 1) It's not useful to a user stepping through the program to always have a + breakpoint after the scrutinee is evaluated but before the case alternative + is selected. The associated source span would also be slightly awkward to choose. + + 2) It's not easy to add a source-tick before the case alternatives because in + essentially all internal representations they are given as a list of Alts + rather than an expression. + +To provide the debugger a way to enable at runtime the case continuation +breakpoints regardless, we introduce at the start of every PUSH_ALTS BCO a +BRK_ALTS instruction. + +The BRK_ALTS instruction, if enabled (by its single arg), ensures we stop at +the breakpoint heading the case alternative we take. Under the hood, this means +that when BRK_ALTS is enabled we set TSO_STOP_NEXT_BREAKPOINT just before +selecting the alternative. + +It's important that BRK_ALTS (just like BRK_FUN) is the first instruction of +the BCO, since that's where the debugger will look to enable it at runtime. +-} -- ----------------------------------------------------------------------------- -- Deal with tuples ===================================== rts/Disassembler.c ===================================== @@ -94,8 +94,8 @@ disInstr ( StgBCO *bco, int pc ) debugBelch("\n"); pc += 6; break; - case bci_BRK_INTERNAL: - debugBelch ("BRK_INTERNAL %d\n", BCO_NEXT); + case bci_BRK_ALTS: + debugBelch ("BRK_ALTS %d\n", BCO_NEXT); break; case bci_SWIZZLE: { W_ stkoff = BCO_GET_LARGE_ARG; ===================================== rts/Interpreter.c ===================================== @@ -643,10 +643,12 @@ interpretBCO (Capability* cap) // ACTIVATE the breakpoint by tick index ((StgInt*)breakPoints->payload)[tick_index] = 0; } - else if ((bco_instrs[0] & 0xFF) == bci_BRK_INTERNAL) { + else if ((bco_instrs[0] & 0xFF) == bci_BRK_ALTS) { // ACTIVATE BRK_ALTS by setting its only argument to ON bco_instrs[1] = 1; } + // else: if there is no BRK instruction perhaps we should keep + // traversing; that said, the continuation should always have a BRK } else /* type == STOP_FRAME */ { /* No continuation frame to further stop at: Nothing to do */ @@ -1588,14 +1590,11 @@ run_BCO: goto nextInsn; } - case bci_BRK_INTERNAL: + /* See Note [Debugger: BRK_ALTS] */ + case bci_BRK_ALTS: { - printf("BREAK INTERNAL\n"); StgWord16 active = BCO_NEXT; - printf("BREAK INTERNAL: %d\n", active); if (active) { - printf("BREAK INTERNAL is active\n"); - // Break on next! cap->r.rCurrentTSO->flags |= TSO_STOP_NEXT_BREAKPOINT; } ===================================== rts/include/rts/Bytecodes.h ===================================== @@ -214,7 +214,7 @@ #define bci_OP_INDEX_ADDR_32 242 #define bci_OP_INDEX_ADDR_64 243 -#define bci_BRK_INTERNAL 244 +#define bci_BRK_ALTS 244 /* If you need to go past 255 then you will run into the flags */ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2d7995dca4abd94a3f36a14e8262f67… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2d7995dca4abd94a3f36a14e8262f67… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/step-out-5] Complete implementation of step-out RTS level
by Rodrigo Mesquita (＠alt-romes) 16 Jun '25

16 Jun '25

Rodrigo Mesquita pushed to branch wip/romes/step-out-5 at Glasgow Haskell Compiler / GHC Commits: 9efbbddb by Rodrigo Mesquita at 2025-06-16T11:15:11+01:00 Complete implementation of step-out RTS level - - - - - 1 changed file: - rts/Interpreter.c Changes: ===================================== rts/Interpreter.c ===================================== @@ -595,77 +595,67 @@ interpretBCO (Capability* cap) debugBelch("\n\n"); ); - // On entering interpretBCO, check if the step-out flag is set for this - // thread. If yes, push a step-out frame between the first frame and second - // frame. - // - // This frame will be responsible for enabling the first breakpoint that - // comes after it is evaluated (i.e. for breaking right after evaluation of - // this bco returns). - // - // See Note [Debugger: Step-out] for details - // TODOOOOOOOOOOOOOOOO UPDATES + /* If the "step-out" flag is set for this thread, find the *continuation* + * BCO on the stack and activate its breakpoint specifically. Be careful to + * use SafeSp macros to handle stack underflows. + * + * See Note [Debugger: Step-out] + */ if (cap->r.rCurrentTSO->flags & TSO_STOP_AFTER_RETURN) { - StgPtr frame; StgBCO* bco; StgWord16* bco_instrs; - frame = Sp; - - frame += stack_frame_sizeW((StgClosure *)frame); // ignore first BCO because this is the one we are stopped at. We only want to stop at the next one up the stack. - - // Insert the stg_stop_after_ret_frame after the first frame that is NOT a - // case continuation BCO. - // - // Do /not/ insert a step-out frame between case continuation - // frames and their parent BCO frame. Case continuation BCOs may have - // non-local stack references. See Note [Case continuation BCOs]. - - // UPDATE COMMENTS: NOW FIND STOP FRAME AND ACTIVATE IT - while (get_itbl((StgClosure*)frame)->type != RET_BCO) - { // TODO: HANDLE IF STACK BOTTOM - frame += stack_frame_sizeW((StgClosure *)frame); - printf("Wasn't right, keep going\n"); - } - - printf("Found frame\n"); + StgHalfWord type; - // TODO: Handle stack bottom edge case!? if frame == STACK BOTTOM... - // stack underflow *and* overflow... + /* Store the entry Sp; traverse the stack modifying Sp (using Sp macros); + * restore Sp afterwards. */ + StgPtr restoreStackPointer = Sp; - // Then write it. - // ((StgStopAfterRetFrame*)frame)->enabled = 1; + /* The first BCO on the stack is the one we are already stopped at. + * Skip it. */ + Sp = SafeSpWP(stack_frame_sizeW((StgClosure *)Sp)); - // TODO: Write profiling info if needed + /* Traverse upwards until continuation BCO, or the end */ + while ((type = get_itbl((StgClosure*)Sp)->type) != RET_BCO + && type != STOP_FRAME) { + Sp = SafeSpWP(stack_frame_sizeW((StgClosure *)Sp)); + } - bco = (StgBCO*)(frame[1]); // BCO is first argument of RET_BCO frame - ASSERT(get_itbl((StgClosure*)bco)->type == BCO); - bco_instrs = (StgWord16*)(bco->instrs->payload); + ASSERT(type == RET_BCO || type == STOP_FRAME); + if (type == RET_BCO) { - if ((bco_instrs[0] /* BRK_FUN ALWAYS FIRST INSTR */ & 0xFF) == bci_BRK_FUN) { - printf("Found BRK FUN\n"); - printf("Enabling breakpoint of BCO: %p\n", bco); + bco = (StgBCO*)(SpW(1)); // BCO is first arg of a RET_BCO + ASSERT(get_itbl((StgClosure*)bco)->type == BCO); + bco_instrs = (StgWord16*)(bco->instrs->payload); - int brk_array, tick_index; - StgArrBytes *breakPoints; - StgPtr* ptrs; + /* A breakpoint instruction (BRK_FUN or BRK_ALTS) is always the first + * instruction in a BCO */ + if ((bco_instrs[0] & 0xFF) == bci_BRK_FUN) { + int brk_array, tick_index; + StgArrBytes *breakPoints; + StgPtr* ptrs; - ptrs = (StgPtr*)(&bco->ptrs->payload[0]); - brk_array = bco_instrs[1]; - tick_index = bco_instrs[6]; + ptrs = (StgPtr*)(&bco->ptrs->payload[0]); + brk_array = bco_instrs[1]; + tick_index = bco_instrs[6]; - breakPoints = (StgArrBytes *) BCO_PTR(brk_array); - // ACTIVATE - ((StgInt*)breakPoints->payload)[tick_index] = 0; + breakPoints = (StgArrBytes *) BCO_PTR(brk_array); + // ACTIVATE the breakpoint by tick index + ((StgInt*)breakPoints->payload)[tick_index] = 0; + } + else if ((bco_instrs[0] & 0xFF) == bci_BRK_INTERNAL) { + // ACTIVATE BRK_ALTS by setting its only argument to ON + bco_instrs[1] = 1; + } } - else if ((bco_instrs[0] & 0xFF) == bci_BRK_INTERNAL) { - printf("Found BRK INTERNAL\n"); - printf("Enabling breakpoint of BCO: %p\n", bco); - bco_instrs[1] = 1; // ACTIVATE + else /* type == STOP_FRAME */ { + /* No continuation frame to further stop at: Nothing to do */ } - // Frame was pushed, mark as done to not do it again + // Mark as done to not do it again cap->r.rCurrentTSO->flags &= ~TSO_STOP_AFTER_RETURN; + + Sp = restoreStackPointer; } // ------------------------------------------------------------------------ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9efbbddb8ffa2078ea38fc2b6de6d66… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9efbbddb8ffa2078ea38fc2b6de6d66… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26115] 4 commits: Fix inverted test
by Simon Peyton Jones (＠simonpj) 16 Jun '25

16 Jun '25

Simon Peyton Jones pushed to branch wip/T26115 at Glasgow Haskell Compiler / GHC Commits: 4cca8e5e by Simon Peyton Jones at 2025-06-16T09:53:00+01:00 Fix inverted test - - - - - a0406056 by Simon Peyton Jones at 2025-06-16T10:22:16+01:00 Missing close paren in tc-trace - - - - - 24cc2a81 by Simon Peyton Jones at 2025-06-16T10:22:34+01:00 A bit more tc-tracing for record updates - - - - - c9c848ad by Simon Peyton Jones at 2025-06-16T10:22:51+01:00 Don't create implications for FunSigCtxt unless we have to - - - - - 4 changed files: - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Utils/Unify.hs Changes: ===================================== compiler/GHC/Core/Opt/Specialise.hs ===================================== @@ -2965,15 +2965,14 @@ singleCall spec_env id args unitBag (CI { ci_key = args , ci_fvs = fvVarSet call_fvs }) } where - call_fvs | gopt Opt_PolymorphicSpecialisation (se_dflags spec_env) - = specArgsFVs isLocalVar args - | otherwise - = specArgsFVs isLocalId args + poly_spec = gopt Opt_PolymorphicSpecialisation (se_dflags spec_env) - -- specArgFreeIds: we specifically look for free Ids, not TyVars - -- see (MP1) in Note [Specialising polymorphic dictionaries] - -- - -- We don't include the 'id' itself. + -- With -fpolymorphic-specialisation, keep just local /Ids/ + -- Otherwise, keep /all/ free vars including TyVars + -- See (MP1) in Note [Specialising polymorphic dictionaries] + -- But NB: we don't include the 'id' itself. + call_fvs | poly_spec = specArgsFVs isLocalId args + | otherwise = specArgsFVs isLocalVar args mkCallUDs :: SpecEnv -> OutExpr -> [OutExpr] -> UsageDetails mkCallUDs env fun args @@ -3504,7 +3503,7 @@ What should we do when a value is specialised to a *strict* unboxed value? in h:t Could convert let to case: - + map_*_Int# f (x:xs) = case f x of h# -> let t = map f xs in h#:t ===================================== compiler/GHC/Tc/Gen/App.hs ===================================== @@ -460,6 +460,7 @@ finishApp tc_head@(tc_fun,_) tc_args app_res_rho res_wrap ; res_expr <- if isTagToEnum tc_fun then tcTagToEnum tc_head tc_args app_res_rho else return (rebuildHsApps tc_head tc_args) + ; traceTc "End tcApp }" (ppr tc_fun) ; return (mkHsWrap res_wrap res_expr) } checkResultTy :: HsExpr GhcRn ===================================== compiler/GHC/Tc/Gen/Expr.hs ===================================== @@ -1481,6 +1481,7 @@ expandRecordUpd record_expr possible_parents rbnds res_ty vcat [ text "relevant_con:" <+> ppr relevant_con , text "res_ty:" <+> ppr res_ty , text "ds_res_ty:" <+> ppr ds_res_ty + , text "ds_expr:" <+> ppr ds_expr ] ; return (ds_expr, ds_res_ty, RecordUpdCtxt relevant_cons upd_fld_names ex_tvs) } ===================================== compiler/GHC/Tc/Utils/Unify.hs ===================================== @@ -583,7 +583,6 @@ alwaysBuildImplication :: SkolemInfoAnon -> Bool -- See Note [When to build an implication] alwaysBuildImplication (SigSkol ctxt _ _) = case ctxt of - FunSigCtxt {} -> True -- RHS of a binding with a signature SpecInstCtxt -> True -- SpecInstCtxt: this is rather delicate _ -> False alwaysBuildImplication _ = False @@ -591,6 +590,10 @@ alwaysBuildImplication _ = False {- Commmented out for now while I figure out about error messages. See #14185 +Caution: we get some duplication of errors if we build more implications. +Because we get one error for each function RHS, even if it's for +the same class constraint. + alwaysBuildImplication (SigSkol ctxt _ _) = case ctxt of FunSigCtxt {} -> True -- RHS of a binding with a signature View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/13a1fcecf95a5809d4dc9d84ac8dfb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/13a1fcecf95a5809d4dc9d84ac8dfb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/improve-implicit-lifting-error] Improve error messages when implicit lifting fails
by Matthew Pickering (＠mpickering) 16 Jun '25

16 Jun '25

Matthew Pickering pushed to branch wip/improve-implicit-lifting-error at Glasgow Haskell Compiler / GHC Commits: df4a756c by Matthew Pickering at 2025-06-16T09:42:19+01:00 Improve error messages when implicit lifting fails This patch concerns programs which automatically try to fix level errors by inserting `Lift`. For example: ``` foo x = [| x |] ~> foo x = [| $(lift x) |] ``` Before, there were two problems with the message. 1. (#26031), the location of the error was reported as the whole quotation. 2. (#26035), the message just mentions there is no Lift instance, but gives no indicate why the user program needed a Lift instance in the first place. This problem is especially bad when you disable `ImplicitStagePersistence`, so you just end up with a confusing "No instance for" message rather than an error message about levels This patch fixes both these issues. Firstly, `PendingRnSplice` differentiates between a user-written splice and an implicit lift. Then, the Lift instance is precisely requested with a specific origin in the typechecker. If the instance fails to be solved, the message is reported using the `TcRnBadlyLevelled` constructor (like a normal level error). Fixes #26031, #26035 - - - - - 42 changed files: - compiler/GHC/Hs/Expr.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Types/Origin.hs - testsuite/tests/annotations/should_fail/annfail03.stderr - testsuite/tests/annotations/should_fail/annfail09.stderr - testsuite/tests/quasiquotation/qq001/qq001.stderr - testsuite/tests/quasiquotation/qq002/qq002.stderr - testsuite/tests/quasiquotation/qq003/qq003.stderr - testsuite/tests/quasiquotation/qq004/qq004.stderr - + testsuite/tests/quotes/LiftErrMsg.hs - + testsuite/tests/quotes/LiftErrMsg.stderr - + testsuite/tests/quotes/LiftErrMsgDefer.hs - + testsuite/tests/quotes/LiftErrMsgDefer.stderr - + testsuite/tests/quotes/LiftErrMsgTyped.hs - + testsuite/tests/quotes/LiftErrMsgTyped.stderr - testsuite/tests/quotes/T10384.stderr - testsuite/tests/quotes/TH_localname.stderr - testsuite/tests/quotes/all.T - testsuite/tests/splice-imports/SI03.stderr - testsuite/tests/splice-imports/SI05.stderr - testsuite/tests/splice-imports/SI16.stderr - testsuite/tests/splice-imports/SI18.stderr - testsuite/tests/splice-imports/SI20.stderr - testsuite/tests/splice-imports/SI25.stderr - testsuite/tests/splice-imports/SI28.stderr - testsuite/tests/splice-imports/SI31.stderr - testsuite/tests/th/T16976z.stderr - testsuite/tests/th/T17820a.stderr - testsuite/tests/th/T17820b.stderr - testsuite/tests/th/T17820c.stderr - testsuite/tests/th/T17820d.stderr - testsuite/tests/th/T17820e.stderr - testsuite/tests/th/T23829_hasty.stderr - testsuite/tests/th/T23829_hasty_b.stderr - testsuite/tests/th/T5795.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/df4a756c890c5cc075575f0c50d2d4d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/df4a756c890c5cc075575f0c50d2d4d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-apporv-Oct24] fix RepPolyDoBind error message herald
by Apoorv Ingle (＠ani) 16 Jun '25

16 Jun '25

Apoorv Ingle pushed to branch wip/spj-apporv-Oct24 at Glasgow Haskell Compiler / GHC Commits: f7f418af by Apoorv Ingle at 2025-06-15T23:20:01-05:00 fix RepPolyDoBind error message herald - - - - - 1 changed file: - compiler/GHC/Tc/Gen/App.hs Changes: ===================================== compiler/GHC/Tc/Gen/App.hs ===================================== @@ -854,7 +854,8 @@ tcInstFun do_ql inst_final fun_orig (tc_fun, rn_fun, fun_ctxt) fun_sigma rn_args -- Rule IARG from Fig 4 of the QL paper: go1 pos acc fun_ty (EValArg { ea_arg = arg, ea_ctxt = ctxt } : rest_args) - = do { let herald = ExpectedFunTyArg (HsExprTcThing tc_fun) (unLoc arg) + = do { let herald | DoOrigin <- fun_orig = ExpectedFunTySyntaxOp fun_orig tc_fun -- cf. RepPolyDoBind.hs + | otherwise = ExpectedFunTyArg (HsExprTcThing tc_fun) (unLoc arg) ; (wrap, arg_ty, res_ty) <- -- NB: matchActualFunTy does the rep-poly check. -- For example, suppose we have f :: forall r (a::TYPE r). a -> Int View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f7f418af96e46614c0dc2ff09935e5a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f7f418af96e46614c0dc2ff09935e5a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-apporv-Oct24] 32 commits: Add necessary flag for js linking
by Apoorv Ingle (＠ani) 15 Jun '25

15 Jun '25

Apoorv Ingle pushed to branch wip/spj-apporv-Oct24 at Glasgow Haskell Compiler / GHC Commits: 1d99d3e4 by maralorn at 2025-06-12T03:47:39-04:00 Add necessary flag for js linking - - - - - 974d5734 by maralorn at 2025-06-12T03:47:39-04:00 Don’t use additional linker flags to detect presence of -fno-pie in configure.ac This mirrors the behavior of ghc-toolchain - - - - - 1e9eb118 by Andrew Lelechenko at 2025-06-12T03:48:21-04:00 Add HasCallStack to Control.Monad.Fail.fail CLC proposal https://github.com/haskell/core-libraries-committee/issues/327 2% compile-time allocations increase in T3064, likely because `fail` is now marginally more expensive to compile. Metric Increase: T3064 - - - - - 6d12060f by meooow25 at 2025-06-12T14:26:07-04:00 Bump containers submodule to 0.8 Also * Disable -Wunused-imports for containers * Allow containers-0.8 for in-tree packages * Bump some submodules so that they allow containers-0.8. These are not at any particular versions. * Remove unused deps containers and split from ucd2haskell * Fix tests affected by the new containers and hpc-bin - - - - - 537bd233 by Peng Fan at 2025-06-12T14:27:02-04:00 NCG/LA64: Optimize code generation and reduce build-directory size. 1. makeFarBranches: Prioritize fewer instruction sequences. 2. Prefer instructions with immediate numbers to reduce register moves, e.g. andi,ori,xori,addi. 3. Ppr: Remove unnecessary judgments. 4. genJump: Avoid "ld+jr" as much as possible. 5. BCOND and BCOND1: Implement conditional jumps with two jump ranges, with limited choice of the shortest. 6. Implement FSQRT, CLT, CTZ. 7. Remove unnecessary code. - - - - - 19f20861 by Simon Peyton Jones at 2025-06-13T09:51:11-04:00 Improve redundant constraints for instance decls Addresses #25992, which showed that the default methods of an instance decl could make GHC fail to report redundant constraints. Figuring out how to do this led me to refactor the computation of redundant constraints. See the entirely rewritten Note [Tracking redundant constraints] in GHC.Tc.Solver.Solve - - - - - 1d02798e by Matthew Pickering at 2025-06-13T09:51:54-04:00 Refactor the treatment of nested Template Haskell splices * The difference between a normal splice, a quasiquoter and implicit splice caused by lifting is stored in the AST after renaming. * Information that the renamer learns about splices is stored in the relevant splice extension points (XUntypedSpliceExpr, XQuasiQuote). * Normal splices and quasi quotes record the flavour of splice (exp/pat/dec etc) * Implicit lifting stores information about why the lift was attempted, so if it fails, that can be reported to the user. * After renaming, the decision taken to attempt to implicitly lift a variable is stored in the `XXUntypedSplice` extension field in the `HsImplicitLiftSplice` constructor. * Since all the information is stored in the AST, in `HsUntypedSplice`, the type of `PendingRnSplice` now just stores a `HsUntypedSplice`. * Error messages since the original program can be easily printed, this is noticeable in the case of implicit lifting. * The user-written syntax is directly type-checked. Before, some desugaring took place in the * Fixes .hie files to work better with nested splices (nested splices are not indexed) * The location of the quoter in a quasiquote is now located, so error messages will precisely point to it (and again, it is indexed by hie files) In the future, the typechecked AST should also retain information about the splices and the specific desugaring being left to the desugarer. Also, `runRnSplice` should call `tcUntypedSplice`, otherwise the typechecking logic is duplicated (see the `QQError` and `QQTopError` tests for a difference caused by this). - - - - - f93798ba by Cheng Shao at 2025-06-13T09:52:35-04:00 libffi: update to 3.5.1 Bumps libffi submodule. - - - - - c7aa0c10 by Andreas Klebinger at 2025-06-15T05:47:24-04:00 Revert "Specialise: Don't float out constraint components." This reverts commit c9abb87ccc0c91cd94f42b3e36270158398326ef. Turns out two benchmarks from #19747 regresses by a factor of 7-8x if we do not float those out. - - - - - fd998679 by Krzysztof Gogolewski at 2025-06-15T05:48:06-04:00 Fix EPT enforcement when mixing unboxed tuples and non-tuples The code was assuming that an alternative cannot be returning a normal datacon and an unboxed tuple at the same time. However, as seen in #26107, this can happen when using a GADT to refine the representation type. The solution is just to conservatively return TagDunno. - - - - - e14783a3 by Apoorv Ingle at 2025-06-15T21:39:01-05:00 - Remove one `SrcSpan` field from `VAExpansion`. It is no longer needed. - Make `tcExpr` take a `Maybe HsThingRn` which will be passed on to tcApp and used by splitHsApps to determine a more accurate `AppCtx` - `tcXExpr` is less hacky now - do not look through HsExpansion applications - kill OrigPat and remove HsThingRn From VAExpansion - look through XExpr ExpandedThingRn while inferring type of head - always set in generated code after stepping inside a ExpandedThingRn - fixing record update error messages - remove special case of tcbody from tcLambdaMatches - wrap last stmt expansion in a HsPar so that the error messages are prettier - remove special case of dsExpr for ExpandedThingTc - make EExpand (HsExpr GhcRn) instead of EExpand HsThingRn - fixing error messages for rebindable - - - - - 91c2d201 by Apoorv Ingle at 2025-06-15T21:39:01-05:00 some progress on tick - - - - - 7593d235 by Apoorv Ingle at 2025-06-15T21:39:01-05:00 remove adhoc cases from ticks - - - - - 74f719ce by Apoorv Ingle at 2025-06-15T21:39:01-05:00 fix the case where head of the application chain is an expanded expression and the argument is a type application c.f. T19167.hs - - - - - 30967800 by Apoorv Ingle at 2025-06-15T21:39:01-05:00 move setQLInstLevel inside tcInstFun - - - - - b4f58765 by Apoorv Ingle at 2025-06-15T21:39:01-05:00 ignore ds warnings originating from gen locations - - - - - ca0448c1 by Apoorv Ingle at 2025-06-15T21:39:01-05:00 filter expr stmts error msgs - - - - - 749b439c by Apoorv Ingle at 2025-06-15T21:39:01-05:00 exception for AppDo while making error ctxt - - - - - a4fd8806 by Apoorv Ingle at 2025-06-15T21:39:01-05:00 moving around things for locations and error ctxts - - - - - f03ad641 by Apoorv Ingle at 2025-06-15T21:39:01-05:00 popErrCtxt doesn't push contexts and popErrCtxts in the first argument to bind and >> in do expansion statements - - - - - 4b93567b by Apoorv Ingle at 2025-06-15T21:39:01-05:00 accept test cases with changed error messages ------------------------- Metric Decrease: T9020 ------------------------- - - - - - 7e6e55df by Apoorv Ingle at 2025-06-15T21:39:01-05:00 look through PopErrCtxt while splitting exprs in application chains - - - - - 046b5742 by Apoorv Ingle at 2025-06-15T21:39:01-05:00 remove special case for HsExpanded in Ticks - - - - - 22f119ae by Apoorv Ingle at 2025-06-15T21:39:01-05:00 check the right origin for record selector incomplete warnings - - - - - 77542fbb by Apoorv Ingle at 2025-06-15T21:39:01-05:00 kill VAExpansion - - - - - c945aa37 by Apoorv Ingle at 2025-06-15T21:39:01-05:00 pass CtOrigin to tcApp for instantiateSigma - - - - - 66dac62d by Apoorv Ingle at 2025-06-15T21:39:01-05:00 do not suppress pprArising - - - - - f959d3f1 by Apoorv Ingle at 2025-06-15T21:40:24-05:00 kill VACall - - - - - 795f9ff5 by Apoorv Ingle at 2025-06-15T21:40:30-05:00 kill AppCtxt - - - - - 26d45bdc by Apoorv Ingle at 2025-06-15T21:40:30-05:00 remove addHeadCtxt - - - - - f2648832 by Apoorv Ingle at 2025-06-15T21:40:30-05:00 fix pprArising for MonadFailErrors - - - - - 662f38ff by Apoorv Ingle at 2025-06-15T21:40:30-05:00 rename ctxt to sloc - - - - - 142 changed files: - compiler/GHC/Builtin/Names/TH.hs - compiler/GHC/CmmToAsm/LA64.hs - compiler/GHC/CmmToAsm/LA64/CodeGen.hs - compiler/GHC/CmmToAsm/LA64/Instr.hs - compiler/GHC/CmmToAsm/LA64/Ppr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Expr.hs-boot - compiler/GHC/Hs/Instances.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Pmc.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Ticks.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Lexer.x - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Stg/EnforceEpt/Types.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Gen/App.hs - + compiler/GHC/Tc/Gen/App.hs-boot - compiler/GHC/Tc/Gen/Do.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/Match.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Gen/Splice.hs-boot - compiler/GHC/Tc/Instance/Class.hs - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/TyCl/Instance.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Types/ErrCtxt.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Types/TH.hs - compiler/GHC/Tc/Utils/Concrete.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Name/Reader.hs - compiler/GHC/Types/ThLevelIndex.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/ghc.cabal.in - ghc/ghc-bin.cabal.in - hadrian/hadrian.cabal - hadrian/src/Settings/Warnings.hs - libffi-tarballs - libraries/base/changelog.md - libraries/base/tests/IO/withBinaryFile002.stderr - libraries/base/tests/IO/withFile002.stderr - libraries/base/tests/IO/withFileBlocking002.stderr - libraries/containers - libraries/ghc-boot/ghc-boot.cabal.in - libraries/ghc-heap/ghc-heap.cabal.in - libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fail.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs-boot - libraries/ghc-internal/src/GHC/Internal/IO.hs-boot - libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs-boot - libraries/ghc-internal/tools/ucd2haskell/ucd2haskell.cabal - libraries/ghci/ghci.cabal.in - libraries/haskeline - libraries/hpc - m4/fp_gcc_supports_no_pie.m4 - m4/fptools_set_c_ld_flags.m4 - testsuite/tests/deSugar/should_compile/T10662.stderr - testsuite/tests/deSugar/should_compile/T3263-1.stderr - testsuite/tests/deSugar/should_compile/T3263-2.stderr - testsuite/tests/deSugar/should_run/DsDoExprFailMsg.stderr - testsuite/tests/deSugar/should_run/DsMonadCompFailMsg.stderr - testsuite/tests/default/default-fail05.stderr - testsuite/tests/dependent/should_fail/T13135_simple.stderr - testsuite/tests/diagnostic-codes/codes.stdout - testsuite/tests/hpc/fork/hpc_fork.stdout - testsuite/tests/hpc/function/tough.stdout - testsuite/tests/hpc/function2/tough2.stdout - testsuite/tests/hpc/simple/hpc001.stdout - testsuite/tests/indexed-types/should_fail/T2693.stderr - testsuite/tests/indexed-types/should_fail/T5439.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/linear/should_fail/LinearTHFail.stderr - testsuite/tests/linters/notes.stdout - testsuite/tests/partial-sigs/should_fail/T10999.stderr - testsuite/tests/perf/compiler/hard_hole_fits.stderr - testsuite/tests/plugins/test-defaulting-plugin.stderr - testsuite/tests/polykinds/T13393.stderr - testsuite/tests/printer/T17697.stderr - testsuite/tests/quasiquotation/T3953.stderr - + testsuite/tests/quotes/QQError.hs - + testsuite/tests/quotes/QQError.stderr - testsuite/tests/quotes/T10384.stderr - testsuite/tests/quotes/TH_localname.stderr - testsuite/tests/quotes/all.T - testsuite/tests/rebindable/DoRestrictedM.hs - + testsuite/tests/rep-poly/T26107.hs - testsuite/tests/rep-poly/all.T - + testsuite/tests/th/QQInQuote.hs - + testsuite/tests/th/QQTopError.hs - + testsuite/tests/th/QQTopError.stderr - testsuite/tests/th/T10598_TH.stderr - testsuite/tests/th/T14681.stderr - testsuite/tests/th/T15321.stderr - testsuite/tests/th/T17804.stderr - testsuite/tests/th/T5508.stderr - testsuite/tests/th/TH_Lift.stderr - testsuite/tests/th/all.T - testsuite/tests/th/overloaded/TH_overloaded_constraints_fail.stderr - testsuite/tests/typecheck/should_compile/T14590.stderr - + testsuite/tests/typecheck/should_compile/T25992.hs - + testsuite/tests/typecheck/should_compile/T25992.stderr - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr - testsuite/tests/typecheck/should_compile/valid_hole_fits.stderr - testsuite/tests/typecheck/should_fail/DoExpansion1.stderr - testsuite/tests/typecheck/should_fail/DoExpansion2.stderr - testsuite/tests/typecheck/should_fail/T10971d.stderr - testsuite/tests/typecheck/should_fail/T13311.stderr - testsuite/tests/typecheck/should_fail/T24064.stderr - testsuite/tests/typecheck/should_fail/T3613.stderr - testsuite/tests/typecheck/should_fail/T7851.stderr - testsuite/tests/typecheck/should_fail/T8603.stderr - testsuite/tests/typecheck/should_fail/T9612.stderr - testsuite/tests/typecheck/should_fail/tcfail097.stderr - testsuite/tests/typecheck/should_fail/tcfail128.stderr - testsuite/tests/typecheck/should_fail/tcfail168.stderr - testsuite/tests/warnings/should_fail/CaretDiagnostics1.stderr - utils/check-exact/ExactPrint.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs - utils/haddock/haddock-library/haddock-library.cabal - utils/haddock/hypsrc-test/ref/src/Quasiquoter.html - utils/hpc - utils/hsc2hs - utils/iserv/iserv.cabal.in The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/74cfa6acef0a6c261b10b821669d7c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/74cfa6acef0a6c261b10b821669d7c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26115] 5 commits: Fix the solve-once business for quantified constraints
by Simon Peyton Jones (＠simonpj) 15 Jun '25

15 Jun '25

Simon Peyton Jones pushed to branch wip/T26115 at Glasgow Haskell Compiler / GHC Commits: 024c8349 by Simon Peyton Jones at 2025-06-15T23:43:40+01:00 Fix the solve-once business for quantified constraints ... so that we solve the resulting implication - - - - - 4bf402c6 by Simon Peyton Jones at 2025-06-15T23:43:54+01:00 Add missing zap-occ-info - - - - - 1d2f05d1 by Simon Peyton Jones at 2025-06-15T23:44:06+01:00 Tracing only - - - - - d82e2219 by Simon Peyton Jones at 2025-06-15T23:44:28+01:00 Buuild an implication for spec-prags This is subtle -- ensures there are bindings to decompose in prepareSpecLHS - - - - - 13a1fcec by Simon Peyton Jones at 2025-06-15T23:46:58+01:00 Better zonking for AbsBinds prags - - - - - 5 changed files: - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/HsToCore/Binds.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/Tc/Zonk/Type.hs Changes: ===================================== compiler/GHC/Core/Opt/Specialise.hs ===================================== @@ -1784,43 +1784,6 @@ alreadyCovered env bndrs fn args is_active rules where in_scope = substInScopeSet (se_subst env) -{- -specRhs :: SpecEnv -> [InVar] -> InExpr -> [OutExpr] - -> SpecM (OutExpr, UsageDetails) - -specRhs env bndrs body [] -- Like specExpr (Lam bndrs body) - = specLam env' bndrs' body - where - (env', bndrs') = substBndrs env bndrs - -specRhs _env [] body args - = -- The caller should have ensured that there are no more - -- args than we have binders on the RHS - pprPanic "specRhs:too many args" (ppr args $$ ppr body) - -specRhs env@(SE { se_subst = subst }) (bndr:bndrs) body (arg:args) - | exprIsTrivial arg - , let env' = env { se_subst = Core.extendSubst subst bndr arg } - = specRhs env' bndrs body args - - - | otherwise -- Non-trivial argument; it must be a dictionary - = do { fresh_id <- newIdBndr "dx" (exprType arg) - ; let fresh_id' = fresh_id `addDictUnfolding` arg - dict_bind = mkDB (NonRec fresh_id' arg) - env' = env { se_subst = Core.extendSubst subst bndr (Var fresh_id') - `Core.extendSubstInScope` fresh_id' } - -- Ensure the new unfolding is in the in-scope set - ; (body', uds) <- specRhs env' bndrs body args - ; return (body', dict_bind `consDictBind` uds) } - -consDictBind :: DictBind -> UsageDetails -> UsageDetails -consDictBind db uds@MkUD{ud_binds=FDB{fdb_binds = binds, fdb_bndrs = bs}} - = uds { ud_binds = FDB{ fdb_binds = db `consOL` binds - , fdb_bndrs = bs `extendVarSetList` bindersOfDictBind db } } - --} - -- Convenience function for invoking lookupRule from Specialise -- The SpecEnv's InScopeSet should include all the Vars in the [CoreExpr] specLookupRule :: HasDebugCallStack @@ -2611,7 +2574,7 @@ specHeader subst (bndr:bndrs) (UnspecType : args) specHeader subst (bndr:bndrs) (_ : args) | isDeadBinder bndr - , let (subst1, bndr') = Core.substBndr subst bndr + , let (subst1, bndr') = Core.substBndr subst (zapIdOccInfo bndr) , Just rubbish_lit <- mkLitRubbish (idType bndr') = -- See Note [Drop dead args from specialisations] do { (useful, subst2, rule_bs, rule_es, spec_bs, spec_args) <- specHeader subst1 bndrs args ===================================== compiler/GHC/HsToCore/Binds.hs ===================================== @@ -1100,6 +1100,7 @@ dsSpec_help poly_nm poly_id poly_rhs inl bndrs ds_call ; tracePm "dsSpec(new route)" $ vcat [ text "poly_id" <+> ppr poly_id + , text "unfolding" <+> ppr (realIdUnfolding poly_id) , text "bndrs" <+> ppr bndrs , text "ds_call" <+> ppr ds_call , text "core_call" <+> ppr core_call ===================================== compiler/GHC/Tc/Solver/Solve.hs ===================================== @@ -1274,17 +1274,19 @@ solveForAllNC ev tvs theta body_pred -- Precondition: the constraint has already been rewritten by the inert set. solveForAll :: CtEvidence -> [TcTyVar] -> TcThetaType -> PredType -> ExpansionFuel -> TcS (StopOrContinue Void) -solveForAll ev tvs theta body_pred fuel = - case ev of - CtGiven {} -> - -- See Note [Solving a Given forall-constraint] - do { addInertForAll qci - ; stopWith ev "Given forall-constraint" } - CtWanted wtd -> - -- See Note [Solving a Wanted forall-constraint] - runSolverStage $ - do { tryInertQCs qci - ; Stage $ solveWantedForAll wtd tvs theta body_pred } +solveForAll ev tvs theta body_pred fuel + = case ev of + CtGiven {} -> + -- See Note [Solving a Given forall-constraint] + do { addInertForAll qci + ; stopWith ev "Given forall-constraint" } + CtWanted wtd -> + do { mode <- getTcSMode + ; case mode of -- See Note [TcSSpecPrag] in GHC.Tc.Solver.Monad. + TcSSpecPrag -> solveWantedForAll_spec wtd + _ -> runSolverStage $ + do { tryInertQCs qci + ; solveWantedForAll_norm wtd tvs theta body_pred } } where qci = QCI { qci_ev = ev, qci_tvs = tvs , qci_body = body_pred, qci_pend_sc = fuel } @@ -1312,82 +1314,78 @@ try_inert_qcs (QCI { qci_ev = ev_w }) inerts = = Nothing -- | Solve a (canonical) Wanted quantified constraint by emitting an implication. --- -- See Note [Solving a Wanted forall-constraint] -solveWantedForAll :: WantedCtEvidence -> [TcTyVar] -> TcThetaType -> PredType - -> TcS (StopOrContinue Void) -solveWantedForAll wtd@(WantedCt { ctev_dest = dest, ctev_loc = loc - , ctev_rewriters = rewriters }) +solveWantedForAll_norm :: WantedCtEvidence -> [TcTyVar] -> TcThetaType -> PredType + -> SolverStage Void +solveWantedForAll_norm wtd@(WantedCt { ctev_dest = dest, ctev_loc = loc + , ctev_rewriters = rewriters }) tvs theta body_pred - = -- We are about to do something irreversible (turning a quantified constraint - -- into an implication), so wrap the inner call in solveCompletelyIfRequired - -- to ensure we can roll back if we can't solve the implication fully. - -- See Note [TcSSpecPrag] in GHC.Tc.Solver.Monad. - do { mode <- getTcSMode - ; case mode of - TcSSpecPrag - -> do { traceTcS "solveWantedForAll {" (ppr wtd) - ; fully_solved <- tryTcS (setTcSMode TcSVanilla $ - solveSimpleWanteds (unitBag ct)) - ; if fully_solved - then do { traceTcS "solveWantedForAll: fully solved }" (ppr wtd) - ; return $ Stop ev (text "Fully solved:" <+> ppr wtd) } - else do { traceTcS "solveWantedForAll: fully solved }" (ppr wtd) - ; updInertIrreds (IrredCt ev IrredShapeReason) - -- Stash the unsolved quantified constraint in the irreds - ; return $ Stop ev (text "Not fully solved:" <+> ppr wtd) } } - - _ -> do { solve_by_emitting_implic - ; stopWith ev "Wanted forall-constraint (implication)" } } + = Stage $ + TcS.setSrcSpan (getCtLocEnvLoc $ ctLocEnv loc) $ + -- This setSrcSpan is important: the emitImplicationTcS uses that + -- TcLclEnv for the implication, and that in turn sets the location + -- for the Givens when solving the constraint (#21006) + + do { -- rec {..}: see Note [Keeping SkolemInfo inside a SkolemTv] + -- in GHC.Tc.Utils.TcType + -- Very like the code in tcSkolDFunType + rec { skol_info <- mkSkolemInfo skol_info_anon + ; (subst, skol_tvs) <- tcInstSkolTyVarsX skol_info empty_subst tvs + ; let inst_pred = substTy subst body_pred + inst_theta = substTheta subst theta + skol_info_anon = InstSkol is_qc (get_size inst_pred) } + + ; given_ev_vars <- mapM newEvVar inst_theta + ; (lvl, (w_id, wanteds)) + <- pushLevelNoWorkList (ppr skol_info) $ + do { let loc' = setCtLocOrigin loc (ScOrigin is_qc NakedSc) + -- Set the thing to prove to have a ScOrigin, so we are + -- careful about its termination checks. + -- See (QC-INV) in Note [Solving a Wanted forall-constraint] + ; wanted_ev <- newWantedNC loc' rewriters inst_pred + -- NB: inst_pred can be an equality + ; return ( wantedCtEvEvId wanted_ev + , unitBag (mkNonCanonical $ CtWanted wanted_ev)) } + + ; traceTcS "solveForAll" (ppr given_ev_vars $$ ppr wanteds $$ ppr w_id) + ; ev_binds <- emitImplicationTcS lvl skol_info_anon skol_tvs given_ev_vars wanteds + ; setWantedEvTerm dest EvCanonical $ + EvFun { et_tvs = skol_tvs, et_given = given_ev_vars + , et_binds = ev_binds, et_body = w_id } + ; stopWith (CtWanted wtd) "Wanted forall-constraint (implication)" } where - ev = CtWanted wtd - ct = mkNonCanonical ev is_qc = IsQC (ctLocOrigin loc) empty_subst = mkEmptySubst $ mkInScopeSet $ tyCoVarsOfTypes (body_pred:theta) `delVarSetList` tvs - -- This setSrcSpan is important: the emitImplicationTcS uses that - -- TcLclEnv for the implication, and that in turn sets the location - -- for the Givens when solving the constraint (#21006) - solve_by_emitting_implic - = TcS.setSrcSpan (getCtLocEnvLoc $ ctLocEnv loc) $ - do { -- rec {..}: see Note [Keeping SkolemInfo inside a SkolemTv] - -- in GHC.Tc.Utils.TcType - -- Very like the code in tcSkolDFunType - rec { skol_info <- mkSkolemInfo skol_info_anon - ; (subst, skol_tvs) <- tcInstSkolTyVarsX skol_info empty_subst tvs - ; let inst_pred = substTy subst body_pred - inst_theta = substTheta subst theta - skol_info_anon = InstSkol is_qc (get_size inst_pred) } - - ; given_ev_vars <- mapM newEvVar inst_theta - ; (lvl, (w_id, wanteds)) - <- pushLevelNoWorkList (ppr skol_info) $ - do { let loc' = setCtLocOrigin loc (ScOrigin is_qc NakedSc) - -- Set the thing to prove to have a ScOrigin, so we are - -- careful about its termination checks. - -- See (QC-INV) in Note [Solving a Wanted forall-constraint] - ; wanted_ev <- newWantedNC loc' rewriters inst_pred - -- NB: inst_pred can be an equality - ; return ( wantedCtEvEvId wanted_ev - , unitBag (mkNonCanonical $ CtWanted wanted_ev)) } - - ; traceTcS "solveForAll" (ppr given_ev_vars $$ ppr wanteds $$ ppr w_id) - ; ev_binds <- emitImplicationTcS lvl skol_info_anon skol_tvs given_ev_vars wanteds - - ; setWantedEvTerm dest EvCanonical $ - EvFun { et_tvs = skol_tvs, et_given = given_ev_vars - , et_binds = ev_binds, et_body = w_id } - } - -- Getting the size of the head is a bit horrible -- because of the special treament for class predicates get_size pred = case classifyPredType pred of ClassPred cls tys -> pSizeClassPred cls tys _ -> pSizeType pred +solveWantedForAll_spec :: WantedCtEvidence -> TcS (StopOrContinue Void) +-- Solve this implication constraint completely or not at all +solveWantedForAll_spec wtd + = do { traceTcS "solveWantedForAll {" (ppr wtd) + ; fully_solved <- tryTcS (setTcSMode TcSVanilla $ + solveWanteds (mkSimpleWC [ev])) + -- It's crucial to call solveWanteds here, not solveSimpleWanteds, + -- because solving `ev` will land in solveWantedForAll_norm, + -- which emits an implication, which we must then solve + ; if fully_solved + then do { traceTcS "solveWantedForAll: fully solved }" (ppr wtd) + ; return $ Stop ev (text "Fully solved:" <+> ppr wtd) } + else do { traceTcS "solveWantedForAll: not fully solved }" (ppr wtd) + ; updInertIrreds (IrredCt ev IrredShapeReason) + -- Stash the unsolved quantified constraint in the irreds + ; return $ Stop ev (text "Not fully solved:" <+> ppr wtd) } } + where + ev = CtWanted wtd + + {- Note [Solving a Wanted forall-constraint] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Solving a wanted forall (quantified) constraint ===================================== compiler/GHC/Tc/Utils/Unify.hs ===================================== @@ -581,6 +581,11 @@ implicationNeeded skol_info skol_tvs given alwaysBuildImplication :: SkolemInfoAnon -> Bool -- See Note [When to build an implication] +alwaysBuildImplication (SigSkol ctxt _ _) + = case ctxt of + FunSigCtxt {} -> True -- RHS of a binding with a signature + SpecInstCtxt -> True -- SpecInstCtxt: this is rather delicate + _ -> False alwaysBuildImplication _ = False {- Commmented out for now while I figure out about error messages. ===================================== compiler/GHC/Tc/Zonk/Type.hs ===================================== @@ -746,8 +746,12 @@ zonk_bind (XHsBindsLR (AbsBinds { abs_tvs = tyvars, abs_ev_vars = evs runZonkBndrT (zonkTyBndrsX tyvars ) $ \ new_tyvars -> runZonkBndrT (zonkEvBndrsX evs ) $ \ new_evs -> runZonkBndrT (zonkTcEvBinds_s ev_binds) $ \ new_ev_binds -> - do { (new_val_bind, new_exports) <- mfix $ \ ~(new_val_binds, _) -> - runZonkBndrT (extendIdZonkEnvRec $ collectHsBindsBinders CollNoDictBinders new_val_binds) $ \ _ -> + do { (new_val_bind, new_exports) <- mfix $ \ ~(new_val_binds, new_exports) -> + let new_bndrs = collectHsBindsBinders CollNoDictBinders new_val_binds + ++ map abe_poly new_exports + -- Tie the knot with the `abe_poly` binders too, since they + -- may be mentioned in the `abe_prags` of the `exports` + in runZonkBndrT (extendIdZonkEnvRec new_bndrs) $ \ _ -> do { new_val_binds <- mapM zonk_val_bind val_binds ; new_exports <- mapM zonk_export exports ; return (new_val_binds, new_exports) @@ -854,6 +858,7 @@ zonkLTcSpecPrags ps ; skol_tvs_ref <- lift $ newTcRef [] ; setZonkType (SkolemiseFlexi skol_tvs_ref) $ -- SkolemiseFlexi: see Note [Free tyvars on rule LHS] + runZonkBndrT (zonkCoreBndrsX bndrs) $ \ bndrs' -> do { spec_e' <- zonkLExpr spec_e ; skol_tvs <- lift $ readTcRef skol_tvs_ref View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a1c855b41b89277393b8df4a5636e1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a1c855b41b89277393b8df4a5636e1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/improve-implicit-lifting-error] 17 commits: haddock: Parse math even after ordinary characters
by Matthew Pickering (＠mpickering) 15 Jun '25

15 Jun '25

Matthew Pickering pushed to branch wip/improve-implicit-lifting-error at Glasgow Haskell Compiler / GHC Commits: 6558467c by Ryan Hendrickson at 2025-06-06T05:46:58-04:00 haddock: Parse math even after ordinary characters Fixes a bug where math sections were not recognized if preceded by a character that isn't special (like space or a markup character). - - - - - 265d0024 by ARATA Mizuki at 2025-06-06T05:47:48-04:00 AArch64 NCG: Fix sub-word arithmetic right shift As noted in Note [Signed arithmetic on AArch64], we should zero-extend sub-word values. Fixes #26061 - - - - - 05e9be18 by Simon Hengel at 2025-06-06T05:48:35-04:00 Allow Unicode in "message" and "hints" with -fdiagnostics-as-json (fixes #26075) - - - - - bfa6b70f by ARATA Mizuki at 2025-06-06T05:49:24-04:00 x86 NCG: Fix code generation of bswap64 on i386 Co-authored-by: sheaf <sam.derbyshire(a)gmail.com> Fix #25601 - - - - - 35826d8b by Matthew Pickering at 2025-06-08T22:00:41+01:00 Hadrian: Add option to generate .hie files for stage1 libraries The +hie_files flavour transformer can be enabled to produce hie files for stage1 libraries. The hie files are produced in the "extra-compilation-artifacts" folder and copied into the resulting bindist. At the moment the hie files are not produced for the release flavour, they add about 170M to the final bindist. Towards #16901 - - - - - e2467dbd by Ryan Hendrickson at 2025-06-09T13:07:05-04:00 Fix various failures to -fprint-unicode-syntax - - - - - 1d99d3e4 by maralorn at 2025-06-12T03:47:39-04:00 Add necessary flag for js linking - - - - - 974d5734 by maralorn at 2025-06-12T03:47:39-04:00 Don’t use additional linker flags to detect presence of -fno-pie in configure.ac This mirrors the behavior of ghc-toolchain - - - - - 1e9eb118 by Andrew Lelechenko at 2025-06-12T03:48:21-04:00 Add HasCallStack to Control.Monad.Fail.fail CLC proposal https://github.com/haskell/core-libraries-committee/issues/327 2% compile-time allocations increase in T3064, likely because `fail` is now marginally more expensive to compile. Metric Increase: T3064 - - - - - 6d12060f by meooow25 at 2025-06-12T14:26:07-04:00 Bump containers submodule to 0.8 Also * Disable -Wunused-imports for containers * Allow containers-0.8 for in-tree packages * Bump some submodules so that they allow containers-0.8. These are not at any particular versions. * Remove unused deps containers and split from ucd2haskell * Fix tests affected by the new containers and hpc-bin - - - - - 537bd233 by Peng Fan at 2025-06-12T14:27:02-04:00 NCG/LA64: Optimize code generation and reduce build-directory size. 1. makeFarBranches: Prioritize fewer instruction sequences. 2. Prefer instructions with immediate numbers to reduce register moves, e.g. andi,ori,xori,addi. 3. Ppr: Remove unnecessary judgments. 4. genJump: Avoid "ld+jr" as much as possible. 5. BCOND and BCOND1: Implement conditional jumps with two jump ranges, with limited choice of the shortest. 6. Implement FSQRT, CLT, CTZ. 7. Remove unnecessary code. - - - - - 19f20861 by Simon Peyton Jones at 2025-06-13T09:51:11-04:00 Improve redundant constraints for instance decls Addresses #25992, which showed that the default methods of an instance decl could make GHC fail to report redundant constraints. Figuring out how to do this led me to refactor the computation of redundant constraints. See the entirely rewritten Note [Tracking redundant constraints] in GHC.Tc.Solver.Solve - - - - - 1d02798e by Matthew Pickering at 2025-06-13T09:51:54-04:00 Refactor the treatment of nested Template Haskell splices * The difference between a normal splice, a quasiquoter and implicit splice caused by lifting is stored in the AST after renaming. * Information that the renamer learns about splices is stored in the relevant splice extension points (XUntypedSpliceExpr, XQuasiQuote). * Normal splices and quasi quotes record the flavour of splice (exp/pat/dec etc) * Implicit lifting stores information about why the lift was attempted, so if it fails, that can be reported to the user. * After renaming, the decision taken to attempt to implicitly lift a variable is stored in the `XXUntypedSplice` extension field in the `HsImplicitLiftSplice` constructor. * Since all the information is stored in the AST, in `HsUntypedSplice`, the type of `PendingRnSplice` now just stores a `HsUntypedSplice`. * Error messages since the original program can be easily printed, this is noticeable in the case of implicit lifting. * The user-written syntax is directly type-checked. Before, some desugaring took place in the * Fixes .hie files to work better with nested splices (nested splices are not indexed) * The location of the quoter in a quasiquote is now located, so error messages will precisely point to it (and again, it is indexed by hie files) In the future, the typechecked AST should also retain information about the splices and the specific desugaring being left to the desugarer. Also, `runRnSplice` should call `tcUntypedSplice`, otherwise the typechecking logic is duplicated (see the `QQError` and `QQTopError` tests for a difference caused by this). - - - - - f93798ba by Cheng Shao at 2025-06-13T09:52:35-04:00 libffi: update to 3.5.1 Bumps libffi submodule. - - - - - c7aa0c10 by Andreas Klebinger at 2025-06-15T05:47:24-04:00 Revert "Specialise: Don't float out constraint components." This reverts commit c9abb87ccc0c91cd94f42b3e36270158398326ef. Turns out two benchmarks from #19747 regresses by a factor of 7-8x if we do not float those out. - - - - - fd998679 by Krzysztof Gogolewski at 2025-06-15T05:48:06-04:00 Fix EPT enforcement when mixing unboxed tuples and non-tuples The code was assuming that an alternative cannot be returning a normal datacon and an unboxed tuple at the same time. However, as seen in #26107, this can happen when using a GADT to refine the representation type. The solution is just to conservatively return TagDunno. - - - - - 6b02f231 by Matthew Pickering at 2025-06-15T20:43:19+01:00 Improve error messages when implicit lifting fails This patch concerns programs which automatically try to fix level errors by inserting `Lift`. For example: ``` foo x = [| x |] ~> foo x = [| $(lift x) |] ``` Before, there were two problems with the message. 1. (#26031), the location of the error was reported as the whole quotation. 2. (#26035), the message just mentions there is no Lift instance, but gives no indicate why the user program needed a Lift instance in the first place. This problem is especially bad when you disable `ImplicitStagePersistence`, so you just end up with a confusing "No instance for" message rather than an error message about levels This patch fixes both these issues. Firstly, `PendingRnSplice` differentiates between a user-written splice and an implicit lift. Then, the Lift instance is precisely requested with a specific origin in the typechecker. If the instance fails to be solved, the message is reported using the `TcRnBadlyLevelled` constructor (like a normal level error). Fixes #26031, #26035 - - - - - 177 changed files: - compiler/GHC/Builtin/Names/TH.hs - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - compiler/GHC/CmmToAsm/LA64.hs - compiler/GHC/CmmToAsm/LA64/CodeGen.hs - compiler/GHC/CmmToAsm/LA64/Instr.hs - compiler/GHC/CmmToAsm/LA64/Ppr.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Expr.hs-boot - compiler/GHC/Hs/Instances.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Type.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Stg/EnforceEpt/Types.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Gen/Splice.hs-boot - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/TyCl/Instance.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Types/ErrCtxt.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Types/TH.hs - compiler/GHC/Tc/Utils/Concrete.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Error.hs - compiler/GHC/Types/Name/Reader.hs - compiler/GHC/Types/ThLevelIndex.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/ghc.cabal.in - ghc/ghc-bin.cabal.in - hadrian/doc/flavours.md - hadrian/doc/user-settings.md - hadrian/hadrian.cabal - hadrian/src/Context.hs - hadrian/src/Context/Path.hs - hadrian/src/Flavour.hs - hadrian/src/Flavour/Type.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/Release.hs - hadrian/src/Settings/Warnings.hs - libffi-tarballs - libraries/base/changelog.md - libraries/base/tests/IO/withBinaryFile002.stderr - libraries/base/tests/IO/withFile002.stderr - libraries/base/tests/IO/withFileBlocking002.stderr - libraries/containers - libraries/ghc-boot/ghc-boot.cabal.in - libraries/ghc-heap/ghc-heap.cabal.in - libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fail.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs-boot - libraries/ghc-internal/src/GHC/Internal/IO.hs-boot - libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs-boot - libraries/ghc-internal/tools/ucd2haskell/ucd2haskell.cabal - libraries/ghci/ghci.cabal.in - libraries/haskeline - libraries/hpc - m4/fp_gcc_supports_no_pie.m4 - m4/fptools_set_c_ld_flags.m4 - testsuite/tests/annotations/should_fail/annfail03.stderr - testsuite/tests/annotations/should_fail/annfail09.stderr - + testsuite/tests/cmm/should_run/T25601.hs - + testsuite/tests/cmm/should_run/T25601.stdout - + testsuite/tests/cmm/should_run/T25601a.cmm - testsuite/tests/cmm/should_run/all.T - + testsuite/tests/codeGen/should_run/T26061.hs - + testsuite/tests/codeGen/should_run/T26061.stdout - testsuite/tests/codeGen/should_run/all.T - testsuite/tests/deSugar/should_run/DsDoExprFailMsg.stderr - testsuite/tests/deSugar/should_run/DsMonadCompFailMsg.stderr - testsuite/tests/dependent/should_fail/T13135_simple.stderr - testsuite/tests/diagnostic-codes/codes.stdout - testsuite/tests/driver/json.stderr - testsuite/tests/driver/json_warn.stderr - testsuite/tests/ghci/scripts/T12550.stdout - testsuite/tests/ghci/scripts/T8959b.stderr - testsuite/tests/ghci/scripts/all.T - + testsuite/tests/ghci/scripts/print-unicode-syntax.script - + testsuite/tests/ghci/scripts/print-unicode-syntax.stderr - + testsuite/tests/ghci/scripts/print-unicode-syntax.stdout - testsuite/tests/ghci/should_run/T11825.stdout - testsuite/tests/hpc/fork/hpc_fork.stdout - testsuite/tests/hpc/function/tough.stdout - testsuite/tests/hpc/function2/tough2.stdout - testsuite/tests/hpc/simple/hpc001.stdout - 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/linear/should_fail/LinearTHFail.stderr - testsuite/tests/linters/notes.stdout - testsuite/tests/partial-sigs/should_fail/T10999.stderr - testsuite/tests/perf/compiler/hard_hole_fits.stderr - testsuite/tests/quasiquotation/T3953.stderr - testsuite/tests/quasiquotation/qq001/qq001.stderr - testsuite/tests/quasiquotation/qq002/qq002.stderr - testsuite/tests/quasiquotation/qq003/qq003.stderr - testsuite/tests/quasiquotation/qq004/qq004.stderr - + testsuite/tests/quotes/LiftErrMsg.hs - + testsuite/tests/quotes/LiftErrMsg.stderr - + testsuite/tests/quotes/LiftErrMsgDefer.hs - + testsuite/tests/quotes/LiftErrMsgDefer.stderr - + testsuite/tests/quotes/LiftErrMsgTyped.hs - + testsuite/tests/quotes/LiftErrMsgTyped.stderr - + testsuite/tests/quotes/QQError.hs - + testsuite/tests/quotes/QQError.stderr - testsuite/tests/quotes/T10384.stderr - testsuite/tests/quotes/TH_localname.stderr - testsuite/tests/quotes/all.T - testsuite/tests/rebindable/DoRestrictedM.hs - + testsuite/tests/rep-poly/T26107.hs - testsuite/tests/rep-poly/all.T - testsuite/tests/splice-imports/SI03.stderr - testsuite/tests/splice-imports/SI05.stderr - testsuite/tests/splice-imports/SI16.stderr - testsuite/tests/splice-imports/SI18.stderr - testsuite/tests/splice-imports/SI20.stderr - testsuite/tests/splice-imports/SI25.stderr - testsuite/tests/splice-imports/SI28.stderr - testsuite/tests/splice-imports/SI31.stderr - + testsuite/tests/th/QQInQuote.hs - + testsuite/tests/th/QQTopError.hs - + testsuite/tests/th/QQTopError.stderr - testsuite/tests/th/T10598_TH.stderr - testsuite/tests/th/T14681.stderr - testsuite/tests/th/T15321.stderr - testsuite/tests/th/T16976z.stderr - testsuite/tests/th/T17804.stderr - testsuite/tests/th/T17820a.stderr - testsuite/tests/th/T17820b.stderr - testsuite/tests/th/T17820c.stderr - testsuite/tests/th/T17820d.stderr - testsuite/tests/th/T17820e.stderr - testsuite/tests/th/T23829_hasty.stderr - testsuite/tests/th/T23829_hasty_b.stderr - testsuite/tests/th/T5508.stderr - testsuite/tests/th/T5795.stderr - testsuite/tests/th/TH_Lift.stderr - testsuite/tests/th/all.T - testsuite/tests/th/overloaded/TH_overloaded_constraints_fail.stderr - + testsuite/tests/typecheck/should_compile/T25992.hs - + testsuite/tests/typecheck/should_compile/T25992.stderr - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr - testsuite/tests/typecheck/should_compile/valid_hole_fits.stderr - testsuite/tests/typecheck/should_fail/tcfail097.stderr - utils/check-exact/ExactPrint.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs - utils/haddock/haddock-library/haddock-library.cabal - utils/haddock/haddock-library/src/Documentation/Haddock/Parser.hs - utils/haddock/haddock-library/test/Documentation/Haddock/ParserSpec.hs - utils/haddock/hypsrc-test/ref/src/Quasiquoter.html - utils/hpc - utils/hsc2hs - utils/iserv/iserv.cabal.in The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e180a7a9ec051147afcbe3462bf4a4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e180a7a9ec051147afcbe3462bf4a4… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-toRational] Fix issues with toRational for types capable to represent infinite and not-a-number values
by Bodigrim (＠Bodigrim) 15 Jun '25

15 Jun '25

Bodigrim pushed to branch wip/fix-toRational at Glasgow Haskell Compiler / GHC Commits: 8aa42af4 by Andrew Lelechenko at 2025-06-15T17:25:10+01:00 Fix issues with toRational for types capable to represent infinite and not-a-number values This commit fixes all of the following pitfalls: > toRational (read "Infinity" :: Double) 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137216 % 1 > toRational (read "NaN" :: Double) 269653970229347386159395778618353710042696546841345985910145121736599013708251444699062715983611304031680170819807090036488184653221624933739271145959211186566651840137298227914453329401869141179179624428127508653257226023513694322210869665811240855745025766026879447359920868907719574457253034494436336205824 % 1 > realToFrac (read "NaN" :: Double) -- With -O0 Infinity > realToFrac (read "NaN" :: Double) -- With -O1 NaN > realToFrac (read "NaN" :: Double) :: CDouble Infinity > realToFrac (read "NaN" :: CDouble) :: Double Infinity Implements https://github.com/haskell/core-libraries-committee/issues/338 - - - - - 4 changed files: - libraries/base/changelog.md - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/Real.hs - testsuite/tests/numeric/should_run/T9810.stdout Changes: ===================================== libraries/base/changelog.md ===================================== @@ -11,6 +11,7 @@ * `instance Functor NonEmpty` is now specified using `map` (rather than duplicating code). ([CLC proposal #300](https://github.com/haskell/core-libraries-committee/issues/300)) * `fail` from `MonadFail` now carries `HasCallStack` constraint. ([CLC proposal #327](https://github.com/haskell/core-libraries-committee/issues/327)) * The `Data.Enum.enumerate` function was introduced ([CLC #306](https://github.com/haskell/core-libraries-committee/issues/306)) + * Fix issues with toRational for types capable to represent infinite and not-a-number values ([CLC proposal #338](https://github.com/haskell/core-libraries-committee/issues/338) * Worker threads used by various `base` facilities are now labelled with descriptive thread labels ([CLC proposal #305](https://github.com/haskell/core-libraries-committee/issues/305), [GHC #25452](https://gitlab.haskell.org/ghc/ghc/-/issues/25452)). Specifically, these include: * `Control.Concurrent.threadWaitRead` * `Control.Concurrent.threadWaitWrite` ===================================== libraries/ghc-internal/src/GHC/Internal/Float.hs ===================================== @@ -430,14 +430,10 @@ naturalToFloat# (NB b) = case integerToBinaryFloat' (IP b) of -- | @since base-2.01 -- --- Beware that 'toRational' generates garbage for non-finite arguments: --- --- >>> toRational (1/0 :: Float) --- 340282366920938463463374607431768211456 % 1 --- >>> toRational (0/0 :: Float) --- 510423550381407695195061911147652317184 % 1 --- instance Real Float where + toRational x + | isInfinite x = if x > 0 then infinity else -infinity + | isNaN x = notANumber toRational (F# x#) = case decodeFloat_Int# x# of (# m#, e# #) @@ -686,14 +682,10 @@ naturalToDouble# (NB b) = case integerToBinaryFloat' (IP b) of -- | @since base-2.01 -- --- Beware that 'toRational' generates garbage for non-finite arguments: --- --- >>> toRational (1/0) --- 179769313 (and 300 more digits...) % 1 --- >>> toRational (0/0) --- 269653970 (and 300 more digits...) % 1 --- instance Real Double where + toRational x + | isInfinite x = if x > 0 then infinity else -infinity + | isNaN x = notANumber toRational (D# x#) = case integerDecodeDouble# x# of (# m, e# #) ===================================== libraries/ghc-internal/src/GHC/Internal/Real.hs ===================================== @@ -703,15 +703,6 @@ fromIntegral = fromInteger . toInteger -- | General coercion to 'Fractional' types. -- --- WARNING: This function goes through the 'Rational' type, which does not have values for 'NaN' for example. --- This means it does not round-trip. --- --- For 'Double' it also behaves differently with or without -O0: --- --- > Prelude> realToFrac nan -- With -O0 --- > -Infinity --- > Prelude> realToFrac nan --- > NaN realToFrac :: (Real a, Fractional b) => a -> b {-# NOINLINE [1] realToFrac #-} -- See Note [Allow time for type-specialisation rules to fire] ===================================== testsuite/tests/numeric/should_run/T9810.stdout ===================================== @@ -1,14 +1,14 @@ ## Double ## Infinity -Infinity -Infinity +NaN Infinity -Infinity Infinity ## Float ## Infinity -Infinity -Infinity +NaN Infinity -Infinity Infinity View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8aa42af4edde8c6614abd618237bde7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8aa42af4edde8c6614abd618237bde7… You're receiving this email because of your account on gitlab.haskell.org.

1 0