OLD | NEW |
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "vm/class_finalizer.h" | 5 #include "vm/class_finalizer.h" |
6 | 6 |
7 #include "vm/flags.h" | 7 #include "vm/flags.h" |
8 #include "vm/heap.h" | 8 #include "vm/heap.h" |
9 #include "vm/isolate.h" | 9 #include "vm/isolate.h" |
10 #include "vm/longjump.h" | 10 #include "vm/longjump.h" |
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
908 | 908 |
909 | 909 |
910 // Check if an instance method of same name exists in any super class. | 910 // Check if an instance method of same name exists in any super class. |
911 static RawClass* FindSuperOwnerOfFunction(const Class& cls, | 911 static RawClass* FindSuperOwnerOfFunction(const Class& cls, |
912 const String& name) { | 912 const String& name) { |
913 Class& super_class = Class::Handle(); | 913 Class& super_class = Class::Handle(); |
914 Function& function = Function::Handle(); | 914 Function& function = Function::Handle(); |
915 super_class = cls.SuperClass(); | 915 super_class = cls.SuperClass(); |
916 while (!super_class.IsNull()) { | 916 while (!super_class.IsNull()) { |
917 function = super_class.LookupFunction(name); | 917 function = super_class.LookupFunction(name); |
918 if (!function.IsNull() && !function.is_static()) { | 918 if (!function.IsNull() && |
| 919 !function.is_static() && |
| 920 !function.IsMethodExtractor()) { |
919 return super_class.raw(); | 921 return super_class.raw(); |
920 } | 922 } |
921 super_class = super_class.SuperClass(); | 923 super_class = super_class.SuperClass(); |
922 } | 924 } |
923 return Class::null(); | 925 return Class::null(); |
924 } | 926 } |
925 | 927 |
926 | 928 |
927 // Resolve and finalize the upper bounds of the type parameters of class cls. | 929 // Resolve and finalize the upper bounds of the type parameters of class cls. |
928 void ClassFinalizer::ResolveAndFinalizeUpperBounds(const Class& cls) { | 930 void ClassFinalizer::ResolveAndFinalizeUpperBounds(const Class& cls) { |
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1577 void ClassFinalizer::ReportError(const char* format, ...) { | 1579 void ClassFinalizer::ReportError(const char* format, ...) { |
1578 va_list args; | 1580 va_list args; |
1579 va_start(args, format); | 1581 va_start(args, format); |
1580 const Error& error = Error::Handle( | 1582 const Error& error = Error::Handle( |
1581 Parser::FormatError(Script::Handle(), -1, "Error", format, args)); | 1583 Parser::FormatError(Script::Handle(), -1, "Error", format, args)); |
1582 va_end(args); | 1584 va_end(args); |
1583 ReportError(error); | 1585 ReportError(error); |
1584 } | 1586 } |
1585 | 1587 |
1586 } // namespace dart | 1588 } // namespace dart |
OLD | NEW |