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

Unified Diff: runtime/vm/class_finalizer.cc

Issue 693693003: Resubmit fix for Function::Clone() and Field::Clone() to adjust the class owner (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | runtime/vm/object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/class_finalizer.cc
===================================================================
--- runtime/vm/class_finalizer.cc (revision 41473)
+++ runtime/vm/class_finalizer.cc (working copy)
@@ -2135,7 +2135,10 @@
}
continue; // Skip the implicit constructor.
}
- if (!func.is_static()) {
+ if (!func.is_static() &&
+ !func.IsMethodExtractor() &&
+ !func.IsNoSuchMethodDispatcher() &&
+ !func.IsInvokeFieldDispatcher()) {
func = func.Clone(cls);
cloned_funcs.Add(func);
}
@@ -2153,6 +2156,8 @@
const intptr_t num_fields = fields.Length();
for (intptr_t i = 0; i < num_fields; i++) {
field ^= fields.At(i);
+ // Static fields are shared between the mixin class and the mixin
+ // application class.
if (!field.is_static()) {
field = field.Clone(cls);
cloned_fields.Add(field);
« no previous file with comments | « no previous file | runtime/vm/object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698