Index: runtime/vm/flow_graph_compiler_arm.cc |
diff --git a/runtime/vm/flow_graph_compiler_arm.cc b/runtime/vm/flow_graph_compiler_arm.cc |
index 4e613061b79c18a8b2bd186f0460abe07fe75737..3a565eade300e7c7a28a38b1b0467ee3c76fbcc9 100644 |
--- a/runtime/vm/flow_graph_compiler_arm.cc |
+++ b/runtime/vm/flow_graph_compiler_arm.cc |
@@ -550,7 +550,7 @@ RawSubtypeTestCache* FlowGraphCompiler::GenerateInlineInstanceof( |
// If instanceof type test cannot be performed successfully at compile time and |
// therefore eliminated, optimize it by adding inlined tests for: |
-// - NULL -> return false. |
+// - NULL -> return type == Null (type is not Object or dynamic). |
// - Smi -> compile time subtype check (only if dst class is not parameterized). |
// - Class equality (only if class is not parameterized). |
// Inputs: |
@@ -564,6 +564,7 @@ void FlowGraphCompiler::GenerateInstanceOf(TokenPosition token_pos, |
bool negate_result, |
LocationSummary* locs) { |
ASSERT(type.IsFinalized() && !type.IsMalformed() && !type.IsMalbounded()); |
+ ASSERT(!type.IsObjectType() && !type.IsDynamicType()); |
// Preserve instantiator type arguments (R1). |
__ Push(R1); |
@@ -572,13 +573,13 @@ void FlowGraphCompiler::GenerateInstanceOf(TokenPosition token_pos, |
// If type is instantiated and non-parameterized, we can inline code |
// checking whether the tested instance is a Smi. |
if (type.IsInstantiated()) { |
- // A null object is only an instance of Object and dynamic, which has |
- // already been checked above (if the type is instantiated). So we can |
- // return false here if the instance is null (and if the type is |
- // instantiated). |
+ // A null object is only an instance of Null, Object, and dynamic. |
+ // Object and dynamic have already been checked above (if the type is |
+ // instantiated). So we can return false here if the instance is null, |
+ // unless the type is Null (and if the type is instantiated). |
// We can only inline this null check if the type is instantiated at compile |
- // time, since an uninstantiated type at compile time could be Object or |
- // dynamic at run time. |
+ // time, since an uninstantiated type at compile time could be Null, Object, |
+ // or dynamic at run time. |
__ CompareObject(R0, Object::null_object()); |
__ b(type.IsNullType() ? &is_instance : &is_not_instance, EQ); |
} |