diff --git a/hw/amdgpu/lib/libspirv/include/spirv/spirv-builder.hpp b/hw/amdgpu/lib/libspirv/include/spirv/spirv-builder.hpp
index 75cfaf6b5..e1377bfd9 100644
--- a/hw/amdgpu/lib/libspirv/include/spirv/spirv-builder.hpp
+++ b/hw/amdgpu/lib/libspirv/include/spirv/spirv-builder.hpp
@@ -344,11 +344,11 @@ public:
     std::memcpy(mData.data() + offset, other.data(),
                 other.size() * sizeof(std::uint32_t));
 
-    for (auto &[id, def] : mIdDefs) {
+    for (auto &[id, def] : other.mIdDefs) {
       mIdDefs[id] = offset + def;
     }
 
-    for (auto &[id, uses] : mIdUses) {
+    for (auto &[id, uses] : other.mIdUses) {
       auto &idUses = mIdUses[id];
       idUses.reserve(idUses.size() + uses.size());