commit 63238d4f2ad3003c6a962b4d8ffb70a32716781b
author Vasyl Teliman <vasniktel@gmail.com> Fri Jul 23 12:09:51 2021 +0300
committer GitHub <noreply@github.com> Fri Jul 23 10:09:51 2021 +0100
tree 4afa7fec44dbfdd9841e5ff0cf7f542e6c84f2d2
parent 183fb9fe4c79f7ada21b61e7cf3505613e44eb4d

Initialize context in `opt::Instruction`'s move constructor (#4397)

Fixes #4396.

source/opt/instruction.cpp

diff --git a/source/opt/instruction.cpp b/source/opt/instruction.cpp
index e07fd62..577c0a6 100644
--- a/source/opt/instruction.cpp
+++ b/source/opt/instruction.cpp
@@ -66,7 +66,8 @@
 
 Instruction::Instruction(IRContext* c, const spv_parsed_instruction_t& inst,
                          std::vector<Instruction>&& dbg_line)
-    : context_(c),
+    : utils::IntrusiveNodeBase<Instruction>(),
+      context_(c),
       opcode_(static_cast<SpvOp>(inst.opcode)),
       has_type_id_(inst.type_id != 0),
       has_result_id_(inst.result_id != 0),
@@ -86,7 +87,8 @@
 
 Instruction::Instruction(IRContext* c, const spv_parsed_instruction_t& inst,
                          const DebugScope& dbg_scope)
-    : context_(c),
+    : utils::IntrusiveNodeBase<Instruction>(),
+      context_(c),
       opcode_(static_cast<SpvOp>(inst.opcode)),
       has_type_id_(inst.type_id != 0),
       has_result_id_(inst.result_id != 0),
@@ -124,6 +126,7 @@
 
 Instruction::Instruction(Instruction&& that)
     : utils::IntrusiveNodeBase<Instruction>(),
+      context_(that.context_),
       opcode_(that.opcode_),
       has_type_id_(that.has_type_id_),
       has_result_id_(that.has_result_id_),
@@ -137,6 +140,7 @@
 }
 
 Instruction& Instruction::operator=(Instruction&& that) {
+  context_ = that.context_;
   opcode_ = that.opcode_;
   has_type_id_ = that.has_type_id_;
   has_result_id_ = that.has_result_id_;