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

Side by Side Diff: runtime/lib/object_patch.dart

Issue 18051007: - Revert r24564 and r24563 due to unexplained malloc corruption. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/lib/object.cc ('k') | runtime/vm/bootstrap_natives.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) 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 patch class Object { 5 patch class Object {
6 6
7 // Helpers used to implement hashCode. If a hashCode is used, we remember it 7 // Helpers used to implement hashCode. If a hashCode is used we remember it
8 // in a weak table in the VM. A new hashCode value is calculated using a 8 // using an Expando object. A new hashCode value is calculated using a Random
9 // number generator. 9 // number generator.
10 static final _hashCodeRnd = new Random(); 10 static Expando _hashCodeExp = new Expando("Object.hashCode");
11 11 static Random _hashCodeRnd = new Random();
12 static _getHash(obj) native "Object_getHash";
13 static _setHash(obj, hash) native "Object_setHash";
14 12
15 /* patch */ int get hashCode { 13 /* patch */ int get hashCode {
16 if (this == null) { 14 if (this == null) {
17 return 2011; // The year Dart was announced and a prime. 15 return 2011; // The year Dart was announced and a prime.
18 } 16 }
19 var result = _getHash(this); 17 var result = _hashCodeExp[this];
20 if (result == 0) { 18 if (result == null) {
21 // We want the hash to be a Smi value greater than 0. 19 result = _hashCodeRnd.nextInt(0x40000000); // Stay in Smi range.
22 result = _hashCodeRnd.nextInt(0x40000000); 20 _hashCodeExp[this] = result;
23 while (result == 0) {
24 result = _hashCodeRnd.nextInt(0x40000000);
25 }
26 _setHash(this, result);
27 } 21 }
28 return result; 22 return result;
29 } 23 }
30 24
31 /* patch */ String toString() native "Object_toString"; 25 /* patch */ String toString() native "Object_toString";
32 // A statically dispatched version of Object.toString. 26 // A statically dispatched version of Object.toString.
33 static String _toString(obj) native "Object_toString"; 27 static String _toString(obj) native "Object_toString";
34 28
35 _noSuchMethod(bool isMethod, 29 _noSuchMethod(bool isMethod,
36 String memberName, 30 String memberName,
(...skipping 27 matching lines...) Expand all
64 static _symbolMapToStringMap(Map<Symbol, dynamic> map) { 58 static _symbolMapToStringMap(Map<Symbol, dynamic> map) {
65 var result = new Map<String, dynamic>(); 59 var result = new Map<String, dynamic>();
66 map.forEach((Symbol key, value) { 60 map.forEach((Symbol key, value) {
67 result[_collection_dev.Symbol.getName(key)] = value; 61 result[_collection_dev.Symbol.getName(key)] = value;
68 }); 62 });
69 return result; 63 return result;
70 } 64 }
71 65
72 int get _cid native "Object_cid"; 66 int get _cid native "Object_cid";
73 } 67 }
OLDNEW
« no previous file with comments | « runtime/lib/object.cc ('k') | runtime/vm/bootstrap_natives.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698