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 "platform/assert.h" | 5 #include "platform/assert.h" |
6 #include "vm/class_finalizer.h" | 6 #include "vm/class_finalizer.h" |
7 #include "vm/symbols.h" | 7 #include "vm/symbols.h" |
8 #include "vm/unit_test.h" | 8 #include "vm/unit_test.h" |
9 | 9 |
10 namespace dart { | 10 namespace dart { |
(...skipping 23 matching lines...) Expand all Loading... |
34 classes_1.Add(&Class::Handle(CreateTestClass("Porsche"))); | 34 classes_1.Add(&Class::Handle(CreateTestClass("Porsche"))); |
35 pending_classes.Add(*classes_1[1]); | 35 pending_classes.Add(*classes_1[1]); |
36 | 36 |
37 GrowableArray<const Class*> classes_2; | 37 GrowableArray<const Class*> classes_2; |
38 classes_2.Add(&Class::ZoneHandle(CreateTestClass("Ferrari"))); | 38 classes_2.Add(&Class::ZoneHandle(CreateTestClass("Ferrari"))); |
39 pending_classes.Add(*classes_2[0]); | 39 pending_classes.Add(*classes_2[0]); |
40 classes_2.Add(&Class::ZoneHandle(CreateTestClass("Fiat"))); | 40 classes_2.Add(&Class::ZoneHandle(CreateTestClass("Fiat"))); |
41 pending_classes.Add(*classes_2[1]); | 41 pending_classes.Add(*classes_2[1]); |
42 classes_2.Add(&Class::ZoneHandle(CreateTestClass("Alfa"))); | 42 classes_2.Add(&Class::ZoneHandle(CreateTestClass("Alfa"))); |
43 pending_classes.Add(*classes_2[2]); | 43 pending_classes.Add(*classes_2[2]); |
44 EXPECT(ClassFinalizer::FinalizePendingClasses()); | 44 EXPECT(ClassFinalizer::FinalizeAllClasses()); |
45 for (int i = 0; i < classes_1.length(); i++) { | 45 for (int i = 0; i < classes_1.length(); i++) { |
46 EXPECT(classes_1[i]->is_finalized()); | 46 EXPECT(classes_1[i]->is_finalized()); |
47 } | 47 } |
48 for (int i = 0; i < classes_2.length(); i++) { | 48 for (int i = 0; i < classes_2.length(); i++) { |
49 EXPECT(classes_2[i]->is_finalized()); | 49 EXPECT(classes_2[i]->is_finalized()); |
50 } | 50 } |
51 EXPECT(ClassFinalizer::FinalizePendingClasses()); | 51 EXPECT(ClassFinalizer::AllClassesFinalized()); |
| 52 EXPECT(ClassFinalizer::FinalizeAllClasses()); |
52 } | 53 } |
53 | 54 |
54 | 55 |
55 TEST_CASE(ClassFinalize_Cycles) { | 56 TEST_CASE(ClassFinalize_Cycles) { |
56 Isolate* isolate = Isolate::Current(); | 57 Isolate* isolate = Isolate::Current(); |
57 ObjectStore* object_store = isolate->object_store(); | 58 ObjectStore* object_store = isolate->object_store(); |
58 const GrowableObjectArray& pending_classes = | 59 const GrowableObjectArray& pending_classes = |
59 GrowableObjectArray::Handle(isolate, object_store->pending_classes()); | 60 GrowableObjectArray::Handle(isolate, object_store->pending_classes()); |
60 GrowableArray<const Class*> classes; | 61 GrowableArray<const Class*> classes; |
61 classes.Add(&Class::Handle(CreateTestClass("Jungfrau"))); | 62 classes.Add(&Class::Handle(CreateTestClass("Jungfrau"))); |
62 pending_classes.Add(*classes[0]); | 63 pending_classes.Add(*classes[0]); |
63 classes.Add(&Class::Handle(CreateTestClass("Eiger"))); | 64 classes.Add(&Class::Handle(CreateTestClass("Eiger"))); |
64 pending_classes.Add(*classes[1]); | 65 pending_classes.Add(*classes[1]); |
65 // Create a cycle. | 66 // Create a cycle. |
66 classes[0]->set_super_type( | 67 classes[0]->set_super_type( |
67 Type::Handle(Type::NewNonParameterizedType(*classes[1]))); | 68 Type::Handle(Type::NewNonParameterizedType(*classes[1]))); |
68 classes[1]->set_super_type( | 69 classes[1]->set_super_type( |
69 Type::Handle(Type::NewNonParameterizedType(*classes[0]))); | 70 Type::Handle(Type::NewNonParameterizedType(*classes[0]))); |
70 EXPECT(!ClassFinalizer::FinalizePendingClasses()); | 71 EXPECT(!ClassFinalizer::FinalizeAllClasses()); |
71 } | 72 } |
72 | 73 |
73 | 74 |
74 static RawLibrary* NewLib(const char* url_chars) { | 75 static RawLibrary* NewLib(const char* url_chars) { |
75 String& url = String::ZoneHandle(Symbols::New(url_chars)); | 76 String& url = String::ZoneHandle(Symbols::New(url_chars)); |
76 return Library::New(url); | 77 return Library::New(url); |
77 } | 78 } |
78 | 79 |
79 | 80 |
80 TEST_CASE(ClassFinalize_Resolve) { | 81 TEST_CASE(ClassFinalize_Resolve) { |
(...skipping 11 matching lines...) Expand all Loading... |
92 const String& superclass_name = String::Handle(sbb.Name()); | 93 const String& superclass_name = String::Handle(sbb.Name()); |
93 const UnresolvedClass& unresolved = UnresolvedClass::Handle( | 94 const UnresolvedClass& unresolved = UnresolvedClass::Handle( |
94 UnresolvedClass::New(LibraryPrefix::Handle(), | 95 UnresolvedClass::New(LibraryPrefix::Handle(), |
95 superclass_name, | 96 superclass_name, |
96 Scanner::kDummyTokenIndex)); | 97 Scanner::kDummyTokenIndex)); |
97 const TypeArguments& type_arguments = TypeArguments::Handle(); | 98 const TypeArguments& type_arguments = TypeArguments::Handle(); |
98 rhb.set_super_type(Type::Handle( | 99 rhb.set_super_type(Type::Handle( |
99 Type::New(Object::Handle(unresolved.raw()), | 100 Type::New(Object::Handle(unresolved.raw()), |
100 type_arguments, | 101 type_arguments, |
101 Scanner::kDummyTokenIndex))); | 102 Scanner::kDummyTokenIndex))); |
102 EXPECT(ClassFinalizer::FinalizePendingClasses()); | 103 EXPECT(ClassFinalizer::FinalizeAllClasses()); |
103 } | 104 } |
104 | 105 |
105 } // namespace dart | 106 } // namespace dart |
OLD | NEW |