@@ -14880,8 +14880,10 @@ vect_get_vector_types_for_stmt (vec_info *vinfo, stmt_vec_info stmt_info,
if (gimple_get_lhs (stmt) == NULL_TREE
/* Allow vector conditionals through here. */
&& !is_a <gcond *> (stmt)
- /* MASK_STORE has no lhs, but is ok. */
- && !gimple_call_internal_p (stmt, IFN_MASK_STORE))
+ /* MASK_STORE and friends have no lhs, but are ok. */
+ && !(is_gimple_call (stmt)
+ && gimple_call_internal_p (stmt)
+ && internal_store_fn_p (gimple_call_internal_fn (stmt))))
{
if (is_a <gcall *> (stmt))
{
@@ -14931,8 +14933,6 @@ vect_get_vector_types_for_stmt (vec_info *vinfo, stmt_vec_info stmt_info,
if (data_reference *dr = STMT_VINFO_DATA_REF (stmt_info))
scalar_type = TREE_TYPE (DR_REF (dr));
- else if (gimple_call_internal_p (stmt, IFN_MASK_STORE))
- scalar_type = TREE_TYPE (gimple_call_arg (stmt, 3));
else
scalar_type = TREE_TYPE (gimple_get_lhs (stmt));