1 files changed, 14 insertions, 5 deletions

diff --git a/compiler/optimizing/loop_optimization.cc b/compiler/optimizing/loop_optimization.cc
index 14e6683cf8..9372e116bb 100644
--- a/compiler/optimizing/loop_optimization.cc
+++ b/compiler/optimizing/loop_optimization.cc
@@ -1283,6 +1283,8 @@ void HLoopOptimization::VectorizePredicated(LoopNode* node,
                                             HBasicBlock* exit) {
   DCHECK(IsInPredicatedVectorizationMode());
 
+  vector_external_set_->clear();
+
   HBasicBlock* header = node->loop_info->GetHeader();
   HBasicBlock* preheader = node->loop_info->GetPreHeader();
 
@@ -1369,6 +1371,8 @@ void HLoopOptimization::VectorizeTraditional(LoopNode* node,
                                              int64_t trip_count) {
   DCHECK(!IsInPredicatedVectorizationMode());
 
+  vector_external_set_->clear();
+
   HBasicBlock* header = node->loop_info->GetHeader();
   HBasicBlock* preheader = node->loop_info->GetPreHeader();
 
@@ -1566,7 +1570,6 @@ HPhi* HLoopOptimization::InitializeForNewLoop(HBasicBlock* new_preheader, HInstr
   vector_header_->AddPhi(phi);
   vector_index_ = phi;
   vector_permanent_map_->clear();
-  vector_external_set_->clear();
   predicate_info_map_->clear();
 
   return phi;
@@ -2208,7 +2211,7 @@ void HLoopOptimization::GenerateVecInv(HInstruction* org, DataType::Type type) {
       vector = new (global_allocator_)
           HVecReplicateScalar(global_allocator_, input, type, vector_length_, kNoDexPc);
       vector_permanent_map_->Put(org, Insert(vector_preheader_, vector));
-      vector_external_set_->insert(vector);
+      MaybeInsertInVectorExternalSet(vector);
     }
     vector_map_->Put(org, vector);
   }
@@ -2337,7 +2340,7 @@ void HLoopOptimization::GenerateVecReductionPhiInputs(HPhi* phi, HInstruction* r
                                                                     vector_length,
                                                                     kNoDexPc));
     }
-    vector_external_set_->insert(new_init);
+    MaybeInsertInVectorExternalSet(new_init);
   } else {
     new_init = ReduceAndExtractIfNeeded(new_init);
   }
@@ -2366,12 +2369,12 @@ HInstruction* HLoopOptimization::ReduceAndExtractIfNeeded(HInstruction* instruct
       HVecReduce* reduce = new (global_allocator_) HVecReduce(
           global_allocator_, instruction, type, vector_length, kind, kNoDexPc);
       exit->InsertInstructionBefore(reduce, exit->GetFirstInstruction());
-      vector_external_set_->insert(reduce);
+      MaybeInsertInVectorExternalSet(reduce);
       instruction = new (global_allocator_) HVecExtractScalar(
           global_allocator_, reduce, type, vector_length, 0, kNoDexPc);
       exit->InsertInstructionAfter(instruction, reduce);
 
-      vector_external_set_->insert(instruction);
+      MaybeInsertInVectorExternalSet(instruction);
     }
   }
   return instruction;
@@ -3167,6 +3170,12 @@ void HLoopOptimization::InitPredicateInfoMap(LoopNode* node,
   back_edge_info->SetControlPredicate(header_info->GetTruePredicate());
 }
 
+void HLoopOptimization::MaybeInsertInVectorExternalSet(HInstruction* instruction) {
+  if (IsInPredicatedVectorizationMode()) {
+    vector_external_set_->insert(instruction);
+  }
+}
+
 std::ostream& operator<<(std::ostream& os, const HLoopOptimization::VectorMode& mode) {
   switch (mode) {
     case HLoopOptimization::VectorMode::kSequential: