Revert "VM: Simplify lowering of is-tests."

runtime/lib/object.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/bootstrap_natives.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/code_patcher.h"
 #include "vm/exceptions.h"
 #include "vm/heap.h"
@@ skipping 151 matching lines @@
   }
 
   const TypeArguments& left_type_arguments =
       TypeArguments::Handle(left.GetTypeArguments());
   const TypeArguments& right_type_arguments =
       TypeArguments::Handle(right.GetTypeArguments());
   return Bool::Get(left_type_arguments.Equals(right_type_arguments)).raw();
 }
 
 
-DEFINE_NATIVE_ENTRY(Object_instanceOf, 3) {
+DEFINE_NATIVE_ENTRY(Object_instanceOf, 4) {
   const Instance& instance =
       Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
   const TypeArguments& instantiator_type_arguments =
       TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(1));
   const AbstractType& type =
       AbstractType::CheckedHandle(zone, arguments->NativeArgAt(2));
+  const Bool& negate = Bool::CheckedHandle(zone, arguments->NativeArgAt(3));
   ASSERT(type.IsFinalized());
   ASSERT(!type.IsMalformed());
   ASSERT(!type.IsMalbounded());
   Error& bound_error = Error::Handle(zone, Error::null());
   const bool is_instance_of =
       instance.IsInstanceOf(type, instantiator_type_arguments, &bound_error);
   if (FLAG_trace_type_checks) {
     const char* result_str = is_instance_of ? "true" : "false";
     OS::Print("Native Object.instanceOf: result %s\n", result_str);
     const AbstractType& instance_type =
@@ skipping 12 matching lines @@
     StackFrame* caller_frame = iterator.NextFrame();
     ASSERT(caller_frame != NULL);
     const TokenPosition location = caller_frame->GetTokenPos();
     String& bound_error_message =
         String::Handle(zone, String::New(bound_error.ToErrorCString()));
     Exceptions::CreateAndThrowTypeError(location, AbstractType::Handle(zone),
                                         AbstractType::Handle(zone),
                                         Symbols::Empty(), bound_error_message);
     UNREACHABLE();
   }
-  return Bool::Get(is_instance_of).raw();
+  return Bool::Get(negate.value() ? !is_instance_of : is_instance_of).raw();
 }
 
 DEFINE_NATIVE_ENTRY(Object_simpleInstanceOf, 2) {
   // This native is only called when the right hand side passes
   // simpleInstanceOfType and it is a non-negative test.
   const Instance& instance =
       Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
   const AbstractType& type =
       AbstractType::CheckedHandle(zone, arguments->NativeArgAt(1));
   const TypeArguments& instantiator_type_arguments =
@@ skipping 13 matching lines @@
     String& bound_error_message =
         String::Handle(zone, String::New(bound_error.ToErrorCString()));
     Exceptions::CreateAndThrowTypeError(location, AbstractType::Handle(zone),
                                         AbstractType::Handle(zone),
                                         Symbols::Empty(), bound_error_message);
     UNREACHABLE();
   }
   return Bool::Get(is_instance_of).raw();
 }
 
+DEFINE_NATIVE_ENTRY(Object_instanceOfNum, 2) {
+  const Instance& instance =
+      Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
+  const Bool& negate = Bool::CheckedHandle(zone, arguments->NativeArgAt(1));
+  bool is_instance_of = instance.IsNumber();
+  if (negate.value()) {
+    is_instance_of = !is_instance_of;
+  }
+  return Bool::Get(is_instance_of).raw();
+}
+
+
+DEFINE_NATIVE_ENTRY(Object_instanceOfInt, 2) {
+  const Instance& instance =
+      Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
+  const Bool& negate = Bool::CheckedHandle(zone, arguments->NativeArgAt(1));
+  bool is_instance_of = instance.IsInteger();
+  if (negate.value()) {
+    is_instance_of = !is_instance_of;
+  }
+  return Bool::Get(is_instance_of).raw();
+}
+
+
+DEFINE_NATIVE_ENTRY(Object_instanceOfSmi, 2) {
+  const Instance& instance =
+      Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
+  const Bool& negate = Bool::CheckedHandle(zone, arguments->NativeArgAt(1));
+  bool is_instance_of = instance.IsSmi();
+  if (negate.value()) {
+    is_instance_of = !is_instance_of;
+  }
+  return Bool::Get(is_instance_of).raw();
+}
+
+
+DEFINE_NATIVE_ENTRY(Object_instanceOfDouble, 2) {
+  const Instance& instance =
+      Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
+  const Bool& negate = Bool::CheckedHandle(zone, arguments->NativeArgAt(1));
+  bool is_instance_of = instance.IsDouble();
+  if (negate.value()) {
+    is_instance_of = !is_instance_of;
+  }
+  return Bool::Get(is_instance_of).raw();
+}
+
+
+DEFINE_NATIVE_ENTRY(Object_instanceOfString, 2) {
+  const Instance& instance =
+      Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
+  const Bool& negate = Bool::CheckedHandle(zone, arguments->NativeArgAt(1));
+  bool is_instance_of = instance.IsString();
+  if (negate.value()) {
+    is_instance_of = !is_instance_of;
+  }
+  return Bool::Get(is_instance_of).raw();
+}
+
 
 DEFINE_NATIVE_ENTRY(Object_as, 3) {
   const Instance& instance =
       Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
   const TypeArguments& instantiator_type_arguments =
       TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(1));
   AbstractType& type =
       AbstractType::CheckedHandle(zone, arguments->NativeArgAt(2));
   ASSERT(type.IsFinalized());
   ASSERT(!type.IsMalformed());
@@ skipping 90 matching lines @@
 
 DEFINE_NATIVE_ENTRY(Internal_inquireIs64Bit, 0) {
 #if defined(ARCH_IS_64_BIT)
   return Bool::True().raw();
 #else
   return Bool::False().raw();
 #endif  // defined(ARCH_IS_64_BIT)
 }
 
 }  // namespace dart