diff options
Diffstat (limited to 'runtime/arch/instruction_set_features.cc')
| -rw-r--r-- | runtime/arch/instruction_set_features.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/arch/instruction_set_features.cc b/runtime/arch/instruction_set_features.cc index 1fd1deadef..db4b0b14ce 100644 --- a/runtime/arch/instruction_set_features.cc +++ b/runtime/arch/instruction_set_features.cc @@ -250,7 +250,11 @@ const InstructionSetFeatures* InstructionSetFeatures::AddFeaturesFromString( } first = true; } - DCHECK_EQ(use_default, features.empty()); + // Expectation: "default" is standalone, no other flags. But an empty features vector after + // processing can also come along if the handled flags (at the moment only smp) are the only + // ones in the list. So logically, we check "default -> features.empty." + DCHECK(!use_default || features.empty()); + return AddFeaturesFromSplitString(smp, features, error_msg); } |