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

Side by Side Diff: runtime/vm/object.cc

Issue 113163008: Add missing ResolveType call (fix issue 15738). (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/vm/class_finalizer.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/object.h" 5 #include "vm/object.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "platform/assert.h" 8 #include "platform/assert.h"
9 #include "vm/assembler.h" 9 #include "vm/assembler.h"
10 #include "vm/cpu.h" 10 #include "vm/cpu.h"
(...skipping 1967 matching lines...) Expand 10 before | Expand all | Expand 10 after
1978 } 1978 }
1979 // Calling NumOwnTypeArguments() on a mixin application class will setup the 1979 // Calling NumOwnTypeArguments() on a mixin application class will setup the
1980 // type parameters if not already done. 1980 // type parameters if not already done.
1981 num_type_args += cls.NumOwnTypeArguments(); 1981 num_type_args += cls.NumOwnTypeArguments();
1982 // Super type of Object class is null. 1982 // Super type of Object class is null.
1983 if ((cls.super_type() == AbstractType::null()) || 1983 if ((cls.super_type() == AbstractType::null()) ||
1984 (cls.super_type() == isolate->object_store()->object_type())) { 1984 (cls.super_type() == isolate->object_store()->object_type())) {
1985 break; 1985 break;
1986 } 1986 }
1987 sup_type = cls.super_type(); 1987 sup_type = cls.super_type();
1988 ClassFinalizer::ResolveType(cls, sup_type);
1988 cls = sup_type.type_class(); 1989 cls = sup_type.type_class();
1989 } while (true); 1990 } while (true);
1990 set_num_type_arguments(num_type_args); 1991 set_num_type_arguments(num_type_args);
1991 return num_type_args; 1992 return num_type_args;
1992 } 1993 }
1993 1994
1994 1995
1995 RawClass* Class::SuperClass() const { 1996 RawClass* Class::SuperClass() const {
1996 if (super_type() == AbstractType::null()) { 1997 if (super_type() == AbstractType::null()) {
1997 return Class::null(); 1998 return Class::null();
(...skipping 14528 matching lines...) Expand 10 before | Expand all | Expand 10 after
16526 return "_MirrorReference"; 16527 return "_MirrorReference";
16527 } 16528 }
16528 16529
16529 16530
16530 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const { 16531 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
16531 Instance::PrintToJSONStream(stream, ref); 16532 Instance::PrintToJSONStream(stream, ref);
16532 } 16533 }
16533 16534
16534 16535
16535 } // namespace dart 16536 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/class_finalizer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698