Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(666)

Unified Diff: runtime/vm/dart_entry.cc

Issue 1195573006: Handle field-invocation and method-extraction in the runtime when --lazy_dispatchers=false. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/dart_entry.cc
diff --git a/runtime/vm/dart_entry.cc b/runtime/vm/dart_entry.cc
index 9a1ea76cde1e9b59be5b0b1699cae06e24070d08..6104ddcddac57b6c7a878e8f82e0ecc97b50b88c 100644
--- a/runtime/vm/dart_entry.cc
+++ b/runtime/vm/dart_entry.cc
@@ -151,7 +151,50 @@ RawObject* DartEntry::InvokeClosure(const Array& arguments,
return InvokeFunction(function, arguments, arguments_descriptor);
}
}
- // There is no compatible 'call' method, so invoke noSuchMethod.
+
+ // There is no compatible 'call' method, see if there's a getter.
+ 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 {
Florian Schneider 2015/06/29 10:37:53 When is InvokeClosure used with a non-closure obje
rmacnak 2015/06/29 21:54:19 From the runtime stub, e.g. class FakeFunction {
+ 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();
+#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()) {
+ 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));
+ if (getter_result.IsError()) {
+ return getter_result.raw();
+ }
+ ASSERT(getter_result.IsNull() || getter_result.IsInstance());
+
+ arguments.SetAt(0, getter_result); // Safe to reuse this?
Florian Schneider 2015/06/30 10:28:35 Why shouldn't it be safe?
rmacnak 2015/06/30 22:13:49 I didn't initially notice a new one was allocated
+ return InvokeClosure(arguments, arguments_descriptor);
+ }
+ cls = cls.SuperClass();
+ }
+ }
+
+ // No compataible method or getter so invoke noSuchMethod.
Florian Schneider 2015/06/30 10:28:35 s/compataible/compatible/
rmacnak 2015/06/30 22:13:49 Done.
return InvokeNoSuchMethod(instance,
Symbols::Call(),
arguments,

Powered by Google App Engine
This is Rietveld 408576698