Verified Commit 28d5ce7d authored by Camil Staps's avatar Camil Staps 🐧

Fix: propagate compilation errors through DOptimiseABC and DGenerateByteCode stages

parent cb0a2d34
Pipeline #22796 passed with stage
in 1 minute
......@@ -754,7 +754,7 @@ step intr (DGene paths (ASyncCodeGenerationWin busy_processes win_max_n_processe
step intr (DOptimiseABC [!mdn:rest] ds) ps
# cgo = PR_GetCodeGenOptions ds.project
| not cgo.optimise_abc
| not ds.ok || not cgo.optimise_abc
# (paths,ds) = ds!modpaths
= step intr (DGenerateByteCode -1 paths ds) ps
# (tp,ps) = getCurrentProc ps
......@@ -767,6 +767,8 @@ step intr (DOptimiseABC [!] ds) ps
= step intr (DGenerateByteCode -1 paths ds) ps
step intr (DGenerateByteCode -1 paths ds) ps
| not ds.ok
= step intr (DLink ds) ps
# cgo = PR_GetCodeGenOptions ds.project
| not cgo.generate_bytecode
# ps = showInfo (Level1 "Linking...") ps
......@@ -787,6 +789,8 @@ step intr (DGenerateByteCode -1 paths ds) ps
= step intr (DLink ds) ps
= step intr (DGenerateByteCode version paths ds) ps
step intr (DGenerateByteCode version [!mdn:rest] ds) ps
| not ds.ok
= step intr (DLink ds) ps
# cgo = PR_GetCodeGenOptions ds.project
# (tp,ps) = getCurrentProc ps
# ((modinfo,abccache,fileinfo),ps) = FI_GetFileInfo tp mdn ds.abccache ds.fileinfo ps
......@@ -794,6 +798,8 @@ step intr (DGenerateByteCode version [!mdn:rest] ds) ps
# ds & abccache=abccache, fileinfo=fileinfo, ok=ok
= cont (DGenerateByteCode version rest ds,ps)
step intr (DGenerateByteCode _ [!] ds) ps
| not ds.ok
= step intr (DLink ds) ps
#! ps = showInfo (Level1 "Linking...") ps
= step intr (DLink ds) ps
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment