| Index: runtime/vm/flow_graph_compiler_arm64.cc
|
| diff --git a/runtime/vm/flow_graph_compiler_arm64.cc b/runtime/vm/flow_graph_compiler_arm64.cc
|
| index 970e2b9772d288d10b9b31b4ab92ea951d0fe80b..e51c0ab389f0abedfc5f830e1f08a6e69ea408f2 100644
|
| --- a/runtime/vm/flow_graph_compiler_arm64.cc
|
| +++ b/runtime/vm/flow_graph_compiler_arm64.cc
|
| @@ -524,6 +524,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
|
| @@ -566,7 +571,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());
|
| const Register kInstantiatorTypeArgumentsReg = R1;
|
| const Register kFunctionTypeArgumentsReg = R2;
|
| __ PushPair(kFunctionTypeArgumentsReg, kInstantiatorTypeArgumentsReg);
|
| @@ -645,8 +650,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()));
|
| const Register kInstantiatorTypeArgumentsReg = R1;
|
| const Register kFunctionTypeArgumentsReg = R2;
|
| __ PushPair(kFunctionTypeArgumentsReg, kInstantiatorTypeArgumentsReg);
|
|
|