| Index: runtime/vm/flow_graph_compiler_mips.cc
|
| diff --git a/runtime/vm/flow_graph_compiler_mips.cc b/runtime/vm/flow_graph_compiler_mips.cc
|
| index f9425c623068b6e772b76ecf067276ca38e9a102..5f7a62f6b3aa39891485325c6b24d829de0c701b 100644
|
| --- a/runtime/vm/flow_graph_compiler_mips.cc
|
| +++ b/runtime/vm/flow_graph_compiler_mips.cc
|
| @@ -520,6 +520,11 @@ RawSubtypeTestCache* FlowGraphCompiler::GenerateInlineInstanceof(
|
| Label* is_instance_lbl,
|
| Label* is_not_instance_lbl) {
|
| __ Comment("InlineInstanceof");
|
| + if (type.IsVoidType()) {
|
| + // A non-null value is returned from a void function, which will result in a
|
| + // type error. A null value is handled prior to executing this inline code.
|
| + return SubtypeTestCache::null();
|
| + }
|
| if (type.IsInstantiated()) {
|
| const Class& type_class = Class::ZoneHandle(zone(), type.type_class());
|
| // A class equality check is only applicable with a dst type (not a
|
| @@ -562,7 +567,7 @@ void FlowGraphCompiler::GenerateInstanceOf(TokenPosition token_pos,
|
| const AbstractType& type,
|
| LocationSummary* locs) {
|
| ASSERT(type.IsFinalized() && !type.IsMalformed() && !type.IsMalbounded());
|
| - ASSERT(!type.IsObjectType() && !type.IsDynamicType() && !type.IsVoidType());
|
| + ASSERT(!type.IsObjectType() && !type.IsDynamicType());
|
|
|
| // Preserve instantiator type arguments (A1) and function type arguments (A2).
|
| __ addiu(SP, SP, Immediate(-2 * kWordSize));
|
| @@ -648,8 +653,7 @@ void FlowGraphCompiler::GenerateAssertAssignable(TokenPosition token_pos,
|
| ASSERT(dst_type.IsFinalized());
|
| // Assignable check is skipped in FlowGraphBuilder, not here.
|
| ASSERT(dst_type.IsMalformedOrMalbounded() ||
|
| - (!dst_type.IsDynamicType() && !dst_type.IsObjectType() &&
|
| - !dst_type.IsVoidType()));
|
| + (!dst_type.IsDynamicType() && !dst_type.IsObjectType()));
|
|
|
| // Preserve instantiator type arguments (A1) and function type arguments (A2).
|
| __ addiu(SP, SP, Immediate(-2 * kWordSize));
|
|
|