max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

refactor: simplify AddConstAsyncResult.commitCheckEnv use (#9715)

Browse source 
Also gets rid of some artifical `blocked (untracked)` time
This commit is contained in:
Sebastian Ullrich 2025-08-06 13:24:11 +02:00 • committed by GitHub
parent 285d271505
commit 42e472ff3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Lean/Elab/MutualDef.lean
View file

@ -1236,13 +1236,8 @@ where
let ctx ← CommandContextInfo.save
infoPromise.resolve <| .context (.commandCtx ctx) <| .node info (← getInfoTrees)
async.commitConst (← getEnv)
let cancelTk ← IO.CancelToken.new
let checkAct ← wrapAsyncAsSnapshot (desc := s!"finishing proof of {declId.declName}")
(cancelTk? := cancelTk) fun _ => do profileitM Exception "elaboration" (← getOptions) do
processDeriving #[header]
async.commitCheckEnv (← getEnv)
let checkTask ← BaseIO.mapTask (t := (← getEnv).checked) checkAct
Core.logSnapshotTask { stx? := none, task := checkTask, cancelTk? := cancelTk }
processDeriving #[header]
async.commitCheckEnv (← getEnv)
Core.logSnapshotTask { stx? := none, task := (← BaseIO.asTask (act ())), cancelTk? := cancelTk }
applyAttributesAt declId.declName view.modifiers.attrs .afterTypeChecking
applyAttributesAt declId.declName view.modifiers.attrs .afterCompilation

11
src/Lean/Environment.lean
View file

@ -1123,9 +1123,9 @@ def AddConstAsyncResult.commitConst (res : AddConstAsyncResult) (env : Environme
/--
Assuming `Lean.addDecl` has been run for the constant to be added on the async environment branch,
commits the full constant info from that call to the main environment, waits for the final kernel
environment resulting from the `addDecl` call, and commits it to the main branch as well, unblocking
kernel additions there. All `commitConst` preconditions apply.
commits the full constant info from that call to the main environment, (asynchronously) waits for
the final kernel environment resulting from the `addDecl` call, and commits it to the main branch as
well, unblocking kernel additions there. All `commitConst` preconditions apply.
-/
def AddConstAsyncResult.commitCheckEnv (res : AddConstAsyncResult) (env : Environment) :
IO Unit := do
@ -1133,8 +1133,9 @@ def AddConstAsyncResult.commitCheckEnv (res : AddConstAsyncResult) (env : Enviro
-- `info?`
if !(← res.constPromise.isResolved) then
res.commitConst env
res.checkedEnvPromise.resolve env.checked.get
res.allRealizationsPromise.resolve env.allRealizations.get
BaseIO.chainTask (sync := true) env.checked fun checked => do
res.checkedEnvPromise.resolve checked
BaseIO.chainTask (sync := true) env.allRealizations res.allRealizationsPromise.resolve
/--
Checks whether `findAsync?` would return a result.