fix(llm): resolve two compile errors blocking develop build (CI #33417130814) - #6214
Merged
makr-code merged 2 commits intoAug 31, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request.
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
- llama_wrapper.cpp:1770: remove const from draft_token local variable so llama_batch_get_one() can accept a non-const llama_token* pointer. - inference_engine_enhanced.cpp:2263: draft_model_id was used in trySpeculativeGeneration() but never declared there (it only exists in the caller). Derive the id from draft_plugin->getModelInfo() at the call site instead. Fixes CI build run 33417130814 (issue #6095). Co-authored-by: makr-code <150588092+makr-code@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix CI build status for develop branch
fix(llm): resolve two compile errors blocking develop build (CI #33417130814)
Aug 31, 2026
makr-code
marked this pull request as ready for review
August 31, 2026 19:46
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.
Two hard compile errors in the
llmmodule broke thedevelopbuild since1164dfe. Both are in speculative-decoding paths introduced recently.Changes
src/llm/llama_wrapper.cpp:1770—constpointer passed to non-constllama_token*paramllama_batch_get_one(llama_token*, int32_t)requires a mutable pointer; the localdraft_tokenwas incorrectly declaredconstconstfrom the local variablesrc/llm/inference_engine_enhanced.cpp:2263—draft_model_idundeclared intrySpeculativeGenerationprocessRequest, line 1536); was erroneously referenced in the calleedraft_plugin->getModelInfo()with a safe fallbackLinked Issues
Closes #6095
Type of Change
Breaking Change Checklist
VERSIONandCMakeLists.txtdocs/migration/### Removed/### Changedsection updatedTesting
No tests changed — both fixes are in error paths (const-correctness and diagnostic logging) with zero behavioral delta in the happy path.
Security Tiering Impact (Required for Runtime Changes)
Impacted tier(s):
Trust-boundary crossings documented in PR description (example: T3 -> T2, T5 -> T4 brokered call)
Boundary controls validated for affected T3/T4/T5 paths (AuthN/AuthZ, validation, rate limits, audit)
Boundary-focused tests added/updated or explicit N/A rationale provided
If trust level/privilege increased, security maintainer approval is attached
N/A — changes are purely const-correctness and local variable scoping in speculative decode paths; no control flow or data-plane logic altered.
📚 Research & Knowledge (wenn applicable)
/docs/research/angelegt?/docs/research/implementation_influence/eingetragen?Relevante Quellen:
AI-Generated Code (KI-generierter Code)
GetSymbolReferences_CppToolsgeprüft (siehe.github/instructions/cpp-language-service-tools.instructions.md)new/deleteohne explizites Review eingeführtAI Review Workflow (Required for AI-assisted PRs)
.github/prompts/pr-diff-findings-review.prompt.md.github/prompts/security-hardening-review.prompt.md(or N/A documented).github/prompts/api-change-impact-review.prompt.md(or N/A documented).github/copilot/REVIEW_SEVERITY_POLICY.mdN/A — trivial const/scope fix; no API surface, security path, or logic change.
High-Finding Exception Record (only if High is accepted)
High-finding exception claimed in this PR
Finding reference:
Maintainer approver:
Mitigation in current release:
Target fix milestone:
Tracking issue:
Validation evidence:
Release Readiness Gate (Required for release-scoped changes)
.github/prompts/release-readiness-check.prompt.mdfor branch transition scopeBRANCHING_STRATEGY.mdandRELEASE_STRATEGY.mdVERSIONING.mdandCHANGELOG.mdChecklist
[Unreleased]Scanner and IntelliSense Gates
criticalfindings in categoriessecurity,input_validation,query_correctness,distributed_consistency,concurrency,memoryhighfindings in the same categories (or explicitly approved)unknownscanner findings triaged (fixed, re-categorized, or justified)