summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-03-20 20:16:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-20 20:16:07 +0000
commita5bfefb1042dfd6b1338dba9287e21c7e432a61a (patch)
tree37d90ef5acad977c8fe1c4049be7316375c58af3
parent2a39584820c46c18c3b013e13d758c707e9f363e (diff)
parenta7d38fc6702d2a763e8187b4773d02b63b3229ac (diff)
downloadart-a5bfefb1042dfd6b1338dba9287e21c7e432a61a.tar.gz
art-a5bfefb1042dfd6b1338dba9287e21c7e432a61a.tar.bz2
art-a5bfefb1042dfd6b1338dba9287e21c7e432a61a.zip
Merge "ART: Fix expectations for instruction-set-features string"
-rw-r--r--runtime/arch/instruction_set_features.cc6
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);
}