| Index: runtime/vm/flow_graph_builder.cc
|
| diff --git a/runtime/vm/flow_graph_builder.cc b/runtime/vm/flow_graph_builder.cc
|
| index 70babe667efe369f130dcb8b3452834c4ccace07..2a627e323bc9a04796b41befccd59d7ffd6b121e 100644
|
| --- a/runtime/vm/flow_graph_builder.cc
|
| +++ b/runtime/vm/flow_graph_builder.cc
|
| @@ -952,8 +952,7 @@ BlockEntryInstr* TestGraphVisitor::CreateFalseSuccessor() const {
|
|
|
| void TestGraphVisitor::ReturnValue(Value* value) {
|
| Isolate* isolate = Isolate::Current();
|
| - if (isolate->flags().type_checks() ||
|
| - isolate->flags().asserts()) {
|
| + if (isolate->flags().type_checks() || isolate->flags().asserts()) {
|
| value = Bind(new(Z) AssertBooleanInstr(condition_token_pos(), value));
|
| }
|
| Value* constant_true = Bind(new(Z) ConstantInstr(Bool::True()));
|
| @@ -1313,8 +1312,7 @@ void EffectGraphVisitor::VisitBinaryOpNode(BinaryOpNode* node) {
|
| node->left()->Visit(&for_left);
|
| EffectGraphVisitor empty(owner());
|
| Isolate* isolate = Isolate::Current();
|
| - if (isolate->flags().type_checks() ||
|
| - isolate->flags().asserts()) {
|
| + if (isolate->flags().type_checks() || isolate->flags().asserts()) {
|
| ValueGraphVisitor for_right(owner());
|
| node->right()->Visit(&for_right);
|
| Value* right_value = for_right.value();
|
| @@ -1410,8 +1408,7 @@ void ValueGraphVisitor::VisitBinaryOpNode(BinaryOpNode* node) {
|
| node->right()->Visit(&for_right);
|
| Value* right_value = for_right.value();
|
| Isolate* isolate = Isolate::Current();
|
| - if (isolate->flags().type_checks() ||
|
| - isolate->flags().asserts()) {
|
| + if (isolate->flags().type_checks() || isolate->flags().asserts()) {
|
| right_value =
|
| for_right.Bind(new(Z) AssertBooleanInstr(node->right()->token_pos(),
|
| right_value));
|
| @@ -1876,8 +1873,7 @@ void EffectGraphVisitor::VisitComparisonNode(ComparisonNode* node) {
|
| owner()->ic_data_array());
|
| if (node->kind() == Token::kNE) {
|
| Isolate* isolate = Isolate::Current();
|
| - if (isolate->flags().type_checks() ||
|
| - isolate->flags().asserts()) {
|
| + if (isolate->flags().type_checks() || isolate->flags().asserts()) {
|
| Value* value = Bind(result);
|
| result = new(Z) AssertBooleanInstr(node->token_pos(), value);
|
| }
|
| @@ -1924,8 +1920,7 @@ void EffectGraphVisitor::VisitUnaryOpNode(UnaryOpNode* node) {
|
| Append(for_value);
|
| Value* value = for_value.value();
|
| Isolate* isolate = Isolate::Current();
|
| - if (isolate->flags().type_checks() ||
|
| - isolate->flags().asserts()) {
|
| + if (isolate->flags().type_checks() || isolate->flags().asserts()) {
|
| value =
|
| Bind(new(Z) AssertBooleanInstr(node->operand()->token_pos(), value));
|
| }
|
|
|