commit 3462e9a8094c16ae91aafab87ac651c42bd270f9
author asiva@google.com <asiva@google.com> Fri Feb 28 03:22:16 2014 +0000
committer asiva@google.com <asiva@google.com> Fri Feb 28 03:22:16 2014 +0000
tree f1616094e563646abee224ddd407d40630210008
parent 0a27306b5c461eb220c9b9b834ce558bd99d7cdf

Fix dartium crasher, use DARTSCOPE when getting/setting native fields as it creates a Handle.

Review URL: https://codereview.chromium.org//180153009

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@33148 260f80e4-7a28-3924-810f-c04153c831b5

runtime/vm/dart_api_impl.cc

diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc
index 4b510a0..3665f6b 100644
--- a/runtime/vm/dart_api_impl.cc
+++ b/runtime/vm/dart_api_impl.cc
@@ -546,7 +546,7 @@
 
 DART_EXPORT bool Dart_IdentityEquals(Dart_Handle obj1, Dart_Handle obj2) {
   Isolate* isolate = Isolate::Current();
-  CHECK_ISOLATE(isolate);
+  DARTSCOPE(isolate);
   {
     NoGCScope ngc;
     if (Api::UnwrapHandle(obj1) == Api::UnwrapHandle(obj2)) {
@@ -3788,8 +3788,7 @@
   if (instance.IsNull()) {
     RETURN_TYPE_ERROR(isolate, obj, Instance);
   }
-  const Class& cls = Class::Handle(isolate, instance.clazz());
-  *count = cls.num_native_fields();
+  *count = instance.NumNativeFields();
   return Api::Success();
 }
 
@@ -3798,7 +3797,7 @@
                                                     int index,
                                                     intptr_t* value) {
   Isolate* isolate = Isolate::Current();
-  CHECK_ISOLATE(isolate);
+  DARTSCOPE(isolate);
   ReusableObjectHandleScope reused_obj_handle(isolate);
   const Instance& instance = Api::UnwrapInstanceHandle(reused_obj_handle, obj);
   if (instance.IsNull()) {
@@ -3818,7 +3817,7 @@
                                                     int index,
                                                     intptr_t value) {
   Isolate* isolate = Isolate::Current();
-  CHECK_ISOLATE(isolate);
+  DARTSCOPE(isolate);
   ReusableObjectHandleScope reused_obj_handle(isolate);
   const Instance& instance = Api::UnwrapInstanceHandle(reused_obj_handle, obj);
   if (instance.IsNull()) {