Repository navigation
Job::removeJob: call job_handlerst_remove_job instead of the vmethod - #5909
Merged
Merged
Conversation
The globals table has provided job_handlerst_remove_job for years, so the indirect vmethod call (with the GCC workaround) is no longer needed. Same pattern as Buildings::completeBuild. Fixes DFHack#5903
ab9rf
approved these changes
Sep 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #5903.
DFHack::Job::removeJobcalled thejob_handler::cancel_jobvmethod through a manual pointer indirection to stop GCC from optimizing the call out. The globals table has providedjob_handlerst_remove_jobfor years, so the workaround is no longer needed; this calls the global function directly, using the samestd::functionreinterpret_cast pattern asBuildings::completeBuild.No changelog entry since this is not user-visible.
Testing
dfhack.job.removeJobon a job with item refs removed it cleanly (job list 716 -> 715, no crash).