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

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, 3 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
« no previous file with comments | « runtime/vm/object.h ('k') | runtime/vm/raw_object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 814031edf9966f616551eaad2ffacd0d56e65795..75344267c879c7d240ffbb89ff97b948dd2aee03 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -5362,7 +5362,12 @@ 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);
+ // Presently, we only attempt to remember the list length for final fields.
+ 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();
}
@@ -5390,6 +5395,16 @@ RawString* Field::UserVisibleName() const {
}
+intptr_t Field::guarded_list_length() const {
+ return Smi::Value(raw_ptr()->guarded_list_length_);
+}
+
+
+void Field::set_guarded_list_length(intptr_t list_length) const {
+ raw_ptr()->guarded_list_length_ = Smi::New(list_length);
+}
+
+
const char* Field::ToCString() const {
if (IsNull()) {
return "Field::null";
@@ -5582,7 +5597,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();
« no previous file with comments | « runtime/vm/object.h ('k') | runtime/vm/raw_object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698