| Index: runtime/vm/flow_graph_compiler_ia32.cc
|
| ===================================================================
|
| --- runtime/vm/flow_graph_compiler_ia32.cc (revision 30381)
|
| +++ runtime/vm/flow_graph_compiler_ia32.cc (working copy)
|
| @@ -572,7 +572,7 @@
|
| const AbstractType& type,
|
| bool negate_result,
|
| LocationSummary* locs) {
|
| - ASSERT(type.IsFinalized() && !type.IsMalformed() && !type.IsMalbounded());
|
| + ASSERT(type.IsFinalized() && !type.IsMalformedOrMalbounded());
|
|
|
| const Immediate& raw_null =
|
| Immediate(reinterpret_cast<intptr_t>(Object::null()));
|
| @@ -663,7 +663,7 @@
|
| ASSERT(!dst_type.IsNull());
|
| ASSERT(dst_type.IsFinalized());
|
| // Assignable check is skipped in FlowGraphBuilder, not here.
|
| - ASSERT(dst_type.IsMalformed() || dst_type.IsMalbounded() ||
|
| + ASSERT(dst_type.IsMalformedOrMalbounded() ||
|
| (!dst_type.IsDynamicType() && !dst_type.IsObjectType()));
|
| __ pushl(ECX); // Store instantiator.
|
| __ pushl(EDX); // Store instantiator type arguments.
|
| @@ -685,7 +685,7 @@
|
| }
|
|
|
| // Generate throw new TypeError() if the type is malformed or malbounded.
|
| - if (dst_type.IsMalformed() || dst_type.IsMalbounded()) {
|
| + if (dst_type.IsMalformedOrMalbounded()) {
|
| __ PushObject(Object::ZoneHandle()); // Make room for the result.
|
| __ pushl(EAX); // Push the source object.
|
| __ PushObject(dst_name); // Push the name of the destination.
|
|
|