Added check that the object being stored as a return value in the NativeArguments array is a Dart i…

runtime/vm/native_entry.h

 // 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.
 
 #ifndef VM_NATIVE_ENTRY_H_
 #define VM_NATIVE_ENTRY_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
@@ skipping 10 matching lines @@
 
 // Forward declarations.
 class Class;
 class String;
 
 typedef void (*NativeFunction)(NativeArguments* arguments);
 
 
 #define NATIVE_ENTRY_FUNCTION(name) BootstrapNatives::DN_##name
 
+#ifdef DEBUG
+#define SET_NATIVE_RETVAL(args, value)                                         \
+  RawObject* retval = value;                                                   \
+  ASSERT(retval->IsDartInstance());                                            \
+  arguments->SetReturnUnsafe(retval);
+#else
+#define SET_NATIVE_RETVAL(arguments, value)                                    \
+  arguments->SetReturnUnsafe(value);
+#endif
 
 #define DEFINE_NATIVE_ENTRY(name, argument_count)                              \
   static RawObject* DN_Helper##name(Isolate* isolate,                          \
                                     NativeArguments* arguments);               \
   void NATIVE_ENTRY_FUNCTION(name)(Dart_NativeArguments args) {                \
     CHECK_STACK_ALIGNMENT;                                                     \
     VERIFY_ON_TRANSITION;                                                      \
     NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);     \
     ASSERT(arguments->NativeArgCount() == argument_count);                     \
     if (FLAG_trace_natives) OS::Print("Calling native: %s\n", ""#name);        \
     {                                                                          \
       StackZone zone(arguments->isolate());                                    \
       HANDLESCOPE(arguments->isolate());                                       \
-      arguments->SetReturnUnsafe(                                              \
-          DN_Helper##name(arguments->isolate(), arguments));                   \
+      SET_NATIVE_RETVAL(arguments,                                             \
+                        DN_Helper##name(arguments->isolate(), arguments));     \
       if (FLAG_deoptimize_alot) DeoptimizeAll();                               \
     }                                                                          \
     VERIFY_ON_TRANSITION;                                                      \
   }                                                                            \
   static RawObject* DN_Helper##name(Isolate* isolate,                          \
                                     NativeArguments* arguments)
 
 
 // Natives should throw an exception if an illegal argument or null is passed.
 // type name = value.
@@ skipping 29 matching lines @@
  public:
   // Resolve specified dart native function to the actual native entrypoint.
   static NativeFunction ResolveNative(const Class& cls,
                                       const String& function_name,
                                       int number_of_arguments);
 };
 
 }  // namespace dart
 
 #endif  // VM_NATIVE_ENTRY_H_