| Index: runtime/vm/flow_graph_optimizer.cc
|
| diff --git a/runtime/vm/flow_graph_optimizer.cc b/runtime/vm/flow_graph_optimizer.cc
|
| index abdb548796a152f8e58da59f4f3d64e709f9e758..add12f528dce26e54b6e2a71dd3edf45de8fd341 100644
|
| --- a/runtime/vm/flow_graph_optimizer.cc
|
| +++ b/runtime/vm/flow_graph_optimizer.cc
|
| @@ -4109,12 +4109,40 @@ static bool TryExpandTestCidsResult(ZoneGrowableArray<intptr_t>* results,
|
| void FlowGraphOptimizer::ReplaceWithInstanceOf(InstanceCallInstr* call) {
|
| ASSERT(Token::IsTypeTestOperator(call->token_kind()));
|
| Definition* left = call->ArgumentAt(0);
|
| - Definition* instantiator = call->ArgumentAt(1);
|
| - Definition* type_args = call->ArgumentAt(2);
|
| - const AbstractType& type =
|
| - AbstractType::Cast(call->ArgumentAt(3)->AsConstant()->value());
|
| - const bool negate = Bool::Cast(
|
| - call->ArgumentAt(4)->OriginalDefinition()->AsConstant()->value()).value();
|
| + Definition* instantiator = NULL;
|
| + Definition* type_args = NULL;
|
| + AbstractType& type = AbstractType::ZoneHandle(Z);
|
| + bool negate = false;
|
| + if (call->ArgumentCount() == 2) {
|
| + instantiator = flow_graph()->constant_null();
|
| + type_args = flow_graph()->constant_null();
|
| + if (call->function_name().raw() ==
|
| + Library::PrivateCoreLibName(Symbols::_instanceOfNum()).raw()) {
|
| + type = Type::Number();
|
| + } else if (call->function_name().raw() ==
|
| + Library::PrivateCoreLibName(Symbols::_instanceOfInt()).raw()) {
|
| + type = Type::IntType();
|
| + } else if (call->function_name().raw() ==
|
| + Library::PrivateCoreLibName(Symbols::_instanceOfSmi()).raw()) {
|
| + type = Type::SmiType();
|
| + } else if (call->function_name().raw() ==
|
| + Library::PrivateCoreLibName(Symbols::_instanceOfDouble()).raw()) {
|
| + type = Type::Double();
|
| + } else if (call->function_name().raw() ==
|
| + Library::PrivateCoreLibName(Symbols::_instanceOfString()).raw()) {
|
| + type = Type::StringType();
|
| + } else {
|
| + UNIMPLEMENTED();
|
| + }
|
| + negate = Bool::Cast(call->ArgumentAt(1)->OriginalDefinition()
|
| + ->AsConstant()->value()).value();
|
| + } else {
|
| + instantiator = call->ArgumentAt(1);
|
| + type_args = call->ArgumentAt(2);
|
| + type = AbstractType::Cast(call->ArgumentAt(3)->AsConstant()->value()).raw();
|
| + negate = Bool::Cast(call->ArgumentAt(4)->OriginalDefinition()
|
| + ->AsConstant()->value()).value();
|
| + }
|
| const ICData& unary_checks =
|
| ICData::ZoneHandle(Z, call->ic_data()->AsUnaryClassChecks());
|
| if (FLAG_warn_on_javascript_compatibility &&
|
|
|