Fix FuzzerPassCopyObjects

KhronosGroup · Sep 24, 2020 · f672169 · f672169
1 parent d93cfdd
commit f672169
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/source/fuzz/fuzzer_pass_copy_objects.cpp b/source/fuzz/fuzzer_pass_copy_objects.cpp
@@ -41,6 +41,12 @@ void FuzzerPassCopyObjects::Apply() {
                "The opcode of the instruction we might insert before must be "
                "the same as the opcode in the descriptor for the instruction");
 
+        if (GetTransformationContext()->GetFactManager()->BlockIsDead(
+                block->id())) {
+          // Don't create synonyms in dead blocks.
+          return;
+        }
+
         // Check whether it is legitimate to insert a copy before this
         // instruction.
         if (!fuzzerutil::CanInsertOpcodeBeforeInstruction(SpvOpCopyObject,
@@ -56,16 +62,10 @@ void FuzzerPassCopyObjects::Apply() {
 
         const auto relevant_instructions = FindAvailableInstructions(
             function, block, inst_it,
-            [this, block](opt::IRContext* ir_context, opt::Instruction* inst) {
+            [this](opt::IRContext* ir_context, opt::Instruction* inst) {
               return TransformationAddSynonym::IsInstructionValid(
-                         ir_context, *GetTransformationContext(), inst,
-                         protobufs::TransformationAddSynonym::COPY_OBJECT) &&
-                     (!GetTransformationContext()
-                           ->GetFactManager()
-                           ->BlockIsDead(block->id()) ||
-                      ir_context->get_type_mgr()
-                          ->GetType(inst->type_id())
-                          ->AsPointer());
+                  ir_context, *GetTransformationContext(), inst,
+                  protobufs::TransformationAddSynonym::COPY_OBJECT);
             });
 
         // At this point, |relevant_instructions| contains all the instructions