Fix stack overflow check in InvokeClosure.

runtime/vm/dart_entry.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/dart_entry.h"
 
 #include "vm/class_finalizer.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/debugger.h"
@@ skipping 149 matching lines @@
   if (instance.IsClosure()) {
     // Special case: closures are implemented with a call getter instead of a
     // call method. If the arguments didn't match, go to noSuchMethod instead
     // of infinitely recursing on the getter.
   } else {
     const String& getter_name = String::Handle(Symbols::New("get:call"));
     Class& cls = Class::Handle(instance.clazz());
     while (!cls.IsNull()) {
       function ^= cls.LookupDynamicFunction(getter_name);
       if (!function.IsNull()) {
-        // Getters don't have a stack overflow check, so do one in C++.
+        Isolate* isolate = Isolate::Current();
+        uword c_stack_pos = Isolate::GetCurrentStackPointer();
+        uword c_stack_limit = OSThread::Current()->stack_base() -
+                              OSThread::GetSpecifiedStackSize();
+#if !defined(USING_SIMULATOR)
+        ASSERT(c_stack_limit == isolate->saved_stack_limit());
+#endif
 
-        Isolate* isolate = Isolate::Current();
-#if defined(USING_SIMULATOR)
-        uword stack_pos = Simulator::Current()->get_register(SPREG);
-#else
-        uword stack_pos = Isolate::GetCurrentStackPointer();
-#endif
-        if (stack_pos < isolate->saved_stack_limit()) {
+        if (c_stack_pos < c_stack_limit) {
           const Instance& exception =
             Instance::Handle(isolate->object_store()->stack_overflow());
           return UnhandledException::New(exception, Stacktrace::Handle());
         }
 
         const Array& getter_arguments = Array::Handle(Array::New(1));
         getter_arguments.SetAt(0, instance);
         const Object& getter_result =
               Object::Handle(DartEntry::InvokeFunction(function,
                                                        getter_arguments));
@@ skipping 403 matching lines @@
   const Array& args = Array::Handle(Array::New(kNumArguments));
   args.SetAt(0, map);
   args.SetAt(1, key);
   args.SetAt(2, value);
   const Object& result = Object::Handle(DartEntry::InvokeFunction(function,
                                                                   args));
   return result.raw();
 }
 
 }  // namespace dart