Change Dart_GetNativeBooleanArgument to use class Ids and direct

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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 "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
@@ skipping 275 matching lines @@
     RawExternalTwoByteString* raw_string =
         reinterpret_cast<RawExternalTwoByteString*>(raw_obj)->ptr();
     ExternalStringData<uint16_t>* data = raw_string->external_data_;
     *peer = data->peer();
     return true;
   }
   return false;
 }
 
 
+bool Api::GetNativeBooleanArgument(Dart_NativeArguments args,
+                                   int arg_index,
+                                   bool* value) {
+  NoGCScope no_gc_scope;
+  NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
+  RawObject* raw_obj = arguments->NativeArgAt(arg_index);
+  if (raw_obj->IsHeapObject()) {
+      intptr_t cid = raw_obj->GetClassId();
+      if (cid == kBoolCid) {
+        *value = (raw_obj == Object::bool_true().raw());
+        return true;
+      }
+      if (cid == kNullCid) {
+        *value = false;
+        return true;
+      }
+  }
+  return false;
+}
+
+
 void Api::SetWeakHandleReturnValue(NativeArguments* args,
                                    Dart_WeakPersistentHandle retval) {
   args->SetReturnUnsafe(Api::UnwrapAsWeakPersistentHandle(retval)->raw());
 }
 
 
 // --- Handles ---
 
 DART_EXPORT bool Dart_IsError(Dart_Handle handle) {
   TRACE_API_CALL(CURRENT_FUNC);
@@ skipping 3544 matching lines @@
 DART_EXPORT Dart_Handle Dart_GetNativeBooleanArgument(Dart_NativeArguments args,
                                                       int index,
                                                       bool* value) {
   TRACE_API_CALL(CURRENT_FUNC);
   NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
   if ((index < 0) || (index >= arguments->NativeArgCount())) {
     return Api::NewError(
         "%s: argument 'index' out of range. Expected 0..%d but saw %d.",
         CURRENT_FUNC, arguments->NativeArgCount() - 1, index);
   }
-  Isolate* isolate = arguments->isolate();
-  ReusableObjectHandleScope reused_obj_handle(isolate);
-  Object& obj = reused_obj_handle.Handle();
-  obj = arguments->NativeArgAt(index);
-  intptr_t cid = obj.GetClassId();
-  if (cid == kBoolCid) {
-    *value = Bool::Cast(obj).value();
+  if (Api::GetNativeBooleanArgument(args, index, value)) {
     return Api::Success();
   }
-  if (obj.IsNull()) {

[rmacnak, 2013/12/19 19:36:38]

We've been interpreting null as false?

-    *value = false;
-    return Api::Success();
-  }
-  return Api::NewError(
-      "%s: argument %d is not a Boolean argument.",
+  return Api::NewError("%s: argument %d is not a Boolean argument.",
       CURRENT_FUNC, index);
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetNativeDoubleArgument(Dart_NativeArguments args,
                                                      int index,
                                                      double* value) {
   TRACE_API_CALL(CURRENT_FUNC);
   NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
   if ((index < 0) || (index >= arguments->NativeArgCount())) {
@@ skipping 569 matching lines @@
   }
   {
     NoGCScope no_gc;
     RawObject* raw_obj = obj.raw();
     isolate->heap()->SetPeer(raw_obj, peer);
   }
   return Api::Success();
 }
 
 }  // namespace dart