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

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

Issue 1406943006: Pass type argument to Field construction, thus freezing that field, denoting it cannot be changed l… (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: f Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | runtime/vm/object.h » ('j') | 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) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, 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/code_generator.h" 7 #include "vm/code_generator.h"
8 #include "vm/flags.h" 8 #include "vm/flags.h"
9 #include "vm/heap.h" 9 #include "vm/heap.h"
10 #include "vm/isolate.h" 10 #include "vm/isolate.h"
(...skipping 1296 matching lines...) Expand 10 before | Expand all | Expand 10 after
1307 AbstractType& type = AbstractType::Handle(Z); 1307 AbstractType& type = AbstractType::Handle(Z);
1308 String& name = String::Handle(Z); 1308 String& name = String::Handle(Z);
1309 String& getter_name = String::Handle(Z); 1309 String& getter_name = String::Handle(Z);
1310 String& setter_name = String::Handle(Z); 1310 String& setter_name = String::Handle(Z);
1311 Class& super_class = Class::Handle(Z); 1311 Class& super_class = Class::Handle(Z);
1312 const intptr_t num_fields = array.Length(); 1312 const intptr_t num_fields = array.Length();
1313 for (intptr_t i = 0; i < num_fields; i++) { 1313 for (intptr_t i = 0; i < num_fields; i++) {
1314 field ^= array.At(i); 1314 field ^= array.At(i);
1315 type = field.type(); 1315 type = field.type();
1316 type = FinalizeType(cls, type, kCanonicalize); 1316 type = FinalizeType(cls, type, kCanonicalize);
1317 field.set_type(type); 1317 field.SetFieldType(type);
1318 name = field.name(); 1318 name = field.name();
1319 if (field.is_static()) { 1319 if (field.is_static()) {
1320 getter_name = Field::GetterSymbol(name); 1320 getter_name = Field::GetterSymbol(name);
1321 super_class = FindSuperOwnerOfInstanceMember(cls, name, getter_name); 1321 super_class = FindSuperOwnerOfInstanceMember(cls, name, getter_name);
1322 if (!super_class.IsNull()) { 1322 if (!super_class.IsNull()) {
1323 const String& class_name = String::Handle(Z, cls.Name()); 1323 const String& class_name = String::Handle(Z, cls.Name());
1324 const String& super_class_name = String::Handle(Z, super_class.Name()); 1324 const String& super_class_name = String::Handle(Z, super_class.Name());
1325 ReportError(cls, field.token_pos(), 1325 ReportError(cls, field.token_pos(),
1326 "static field '%s' of class '%s' conflicts with " 1326 "static field '%s' of class '%s' conflicts with "
1327 "instance member '%s' of super class '%s'", 1327 "instance member '%s' of super class '%s'",
(...skipping 1875 matching lines...) Expand 10 before | Expand all | Expand 10 after
3203 ASSERT(fields_array.Length() == ByteBuffer::NumberOfFields()); 3203 ASSERT(fields_array.Length() == ByteBuffer::NumberOfFields());
3204 field ^= fields_array.At(0); 3204 field ^= fields_array.At(0);
3205 ASSERT(field.Offset() == ByteBuffer::data_offset()); 3205 ASSERT(field.Offset() == ByteBuffer::data_offset());
3206 name ^= field.name(); 3206 name ^= field.name();
3207 expected_name ^= String::New("_data"); 3207 expected_name ^= String::New("_data");
3208 ASSERT(String::EqualsIgnoringPrivateKey(name, expected_name)); 3208 ASSERT(String::EqualsIgnoringPrivateKey(name, expected_name));
3209 #endif 3209 #endif
3210 } 3210 }
3211 3211
3212 } // namespace dart 3212 } // namespace dart
OLDNEW
« 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