kv-cache : fix use-after-move of defrag info (#14189)

ggerganov · web-flow · commit 5fce5f948df8 · 2025-06-15T10:52:11.000+03:00
ggml-ci
diff --git a/src/llama-kv-cache-unified.cpp b/src/llama-kv-cache-unified.cpp
@@ -1739,7 +1739,7 @@ llama_kv_cache_unified_state::llama_kv_cache_unified_state(
         llama_context * lctx,
         bool do_shift,
         defrag_info dinfo) : status(LLAMA_MEMORY_STATUS_SUCCESS), kv(kv), lctx(lctx), do_shift(do_shift), dinfo(std::move(dinfo)) {
-    if (!do_shift && dinfo.empty()) {
+    if (!do_shift && this->dinfo.empty()) {
         status = LLAMA_MEMORY_STATUS_NO_UPDATE;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1739,7 +1739,7 @@ llama_kv_cache_unified_state::llama_kv_cache_unified_state(`
`1739`	`1739`	`llama_context * lctx,`
`1740`	`1740`	`bool do_shift,`
`1741`	`1741`	`defrag_info dinfo) : status(LLAMA_MEMORY_STATUS_SUCCESS), kv(kv), lctx(lctx), do_shift(do_shift), dinfo(std::move(dinfo)) {`
`1742`		`- if (!do_shift && dinfo.empty()) {`
	`1742`	`+ if (!do_shift && this->dinfo.empty()) {`
`1743`	`1743`	`status = LLAMA_MEMORY_STATUS_NO_UPDATE;`
`1744`	`1744`	`}`
`1745`	`1745`	`}`