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

Unified Diff: runtime/vm/object.cc

Issue 474033002: Ensure that hash for a symbol is not set to 0 when it is made external. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 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
« no previous file with comments | « runtime/vm/object.h ('k') | runtime/vm/symbols.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
===================================================================
--- runtime/vm/object.cc (revision 39255)
+++ runtime/vm/object.cc (working copy)
@@ -17065,10 +17065,12 @@
tags = RawObject::ClassIdTag::update(class_id, tags);
raw_ptr()->tags_ = tags;
result = this->raw();
+ const uint8_t* ext_array = reinterpret_cast<const uint8_t*>(array);
ExternalStringData<uint8_t>* ext_data = new ExternalStringData<uint8_t>(
- reinterpret_cast<const uint8_t*>(array), peer, cback);
- result.SetLength(str_length);
- result.SetHash(0);
+ ext_array, peer, cback);
+ ASSERT(result.Length() == str_length);
+ ASSERT(!result.HasHash() ||
+ (result.Hash() == String::Hash(ext_array, str_length)));
ExternalOneByteString::SetExternalData(result, ext_data);
external_data = ext_data;
finalizer = ExternalOneByteString::Finalize;
@@ -17091,10 +17093,12 @@
tags = RawObject::ClassIdTag::update(class_id, tags);
raw_ptr()->tags_ = tags;
result = this->raw();
+ const uint16_t* ext_array = reinterpret_cast<const uint16_t*>(array);
ExternalStringData<uint16_t>* ext_data = new ExternalStringData<uint16_t>(
- reinterpret_cast<const uint16_t*>(array), peer, cback);
- result.SetLength(str_length);
- result.SetHash(0);
+ ext_array, peer, cback);
+ ASSERT(result.Length() == str_length);
+ ASSERT(!result.HasHash() ||
+ (result.Hash() == String::Hash(ext_array, str_length)));
ExternalTwoByteString::SetExternalData(result, ext_data);
external_data = ext_data;
finalizer = ExternalTwoByteString::Finalize;
« no previous file with comments | « runtime/vm/object.h ('k') | runtime/vm/symbols.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698