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