Index: src/crankshaft/hydrogen.cc |
diff --git a/src/crankshaft/hydrogen.cc b/src/crankshaft/hydrogen.cc |
index 7c29c8de33bd91d475b6a0f1a8b7f03dcad451c6..41b6c148c743c64bac72c1914585f08397e3063c 100644 |
--- a/src/crankshaft/hydrogen.cc |
+++ b/src/crankshaft/hydrogen.cc |
@@ -6938,11 +6938,9 @@ void HOptimizedGraphBuilder::HandleGlobalVariableAssignment( |
HStoreNamedGeneric* instr = |
Add<HStoreNamedGeneric>(global_object, var->name(), value, |
function_language_mode(), PREMONOMORPHIC); |
- if (FLAG_vector_stores) { |
- Handle<TypeFeedbackVector> vector = |
- handle(current_feedback_vector(), isolate()); |
- instr->SetVectorAndSlot(vector, slot); |
- } |
+ Handle<TypeFeedbackVector> vector = |
+ handle(current_feedback_vector(), isolate()); |
+ instr->SetVectorAndSlot(vector, slot); |
USE(instr); |
DCHECK(instr->HasObservableSideEffects()); |
Add<HSimulate>(ast_id, REMOVABLE_SIMULATE); |
@@ -7271,9 +7269,8 @@ HInstruction* HOptimizedGraphBuilder::BuildNamedGeneric( |
result->SetVectorAndSlot(vector, slot); |
return result; |
} else { |
- if (FLAG_vector_stores && |
- current_feedback_vector()->GetKind(slot) == |
- FeedbackVectorSlotKind::KEYED_STORE_IC) { |
+ if (current_feedback_vector()->GetKind(slot) == |
+ FeedbackVectorSlotKind::KEYED_STORE_IC) { |
// It's possible that a keyed store of a constant string was converted |
// to a named store. Here, at the last minute, we need to make sure to |
// use a generic Keyed Store if we are using the type vector, because |
@@ -7289,11 +7286,9 @@ HInstruction* HOptimizedGraphBuilder::BuildNamedGeneric( |
HStoreNamedGeneric* result = New<HStoreNamedGeneric>( |
object, name, value, function_language_mode(), PREMONOMORPHIC); |
- if (FLAG_vector_stores) { |
- Handle<TypeFeedbackVector> vector = |
- handle(current_feedback_vector(), isolate()); |
- result->SetVectorAndSlot(vector, slot); |
- } |
+ Handle<TypeFeedbackVector> vector = |
+ handle(current_feedback_vector(), isolate()); |
+ result->SetVectorAndSlot(vector, slot); |
return result; |
} |
} |
@@ -7318,11 +7313,9 @@ HInstruction* HOptimizedGraphBuilder::BuildKeyedGeneric( |
} else { |
HStoreKeyedGeneric* result = New<HStoreKeyedGeneric>( |
object, key, value, function_language_mode(), PREMONOMORPHIC); |
- if (FLAG_vector_stores) { |
- Handle<TypeFeedbackVector> vector = |
- handle(current_feedback_vector(), isolate()); |
- result->SetVectorAndSlot(vector, slot); |
- } |
+ Handle<TypeFeedbackVector> vector = |
+ handle(current_feedback_vector(), isolate()); |
+ result->SetVectorAndSlot(vector, slot); |
return result; |
} |
} |
@@ -7640,7 +7633,7 @@ HValue* HOptimizedGraphBuilder::HandleKeyedElementAccess( |
if (access_type == LOAD) { |
KeyedLoadICNexus nexus(vector, slot); |
name = nexus.FindFirstName(); |
- } else if (FLAG_vector_stores) { |
+ } else { |
KeyedStoreICNexus nexus(vector, slot); |
name = nexus.FindFirstName(); |
} |