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

Unified Diff: runtime/vm/object.cc

Issue 22915008: Tests for GuardField length check along with bug fixes (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 4 months 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 side-by-side diff with in-line comments
Download patch
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index f928bcc9866aa0ae75a2b94ea7210386c9c53fc2..1931b9b5016d3ba3b1a857b67c55d1e395d9c09a 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -5355,7 +5355,11 @@ RawField* Field::New(const String& name,
result.set_has_initializer(false);
result.set_guarded_cid(kIllegalCid);
result.set_is_nullable(false);
- result.set_guarded_list_length(Field::kUnknownFixedLength);
+ if (is_final) {
+ result.set_guarded_list_length(Field::kUnknownFixedLength);
+ } else {
+ result.set_guarded_list_length(Field::kNoFixedLength);
+ }
result.set_dependent_code(Object::null_array());
return result.raw();
}
@@ -5575,7 +5579,6 @@ void Field::UpdateLength(intptr_t list_length) const {
// List length unchanged.
return;
}
-
// Multiple list lengths assigned here, stop tracking length.
set_guarded_list_length(Field::kNoFixedLength);
DeoptimizeDependentCode();

Powered by Google App Engine
This is Rietveld 408576698