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

Side by Side Diff: src/heap.cc

Issue 12257005: Improve JSON stringifier's escape check. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: reduce impact on the scanner. Created 7 years, 10 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 | « src/heap.h ('k') | src/json-stringifier.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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 2380 matching lines...) Expand 10 before | Expand all | Expand 10 after
2391 set_foreign_map(Map::cast(obj)); 2391 set_foreign_map(Map::cast(obj));
2392 2392
2393 for (unsigned i = 0; i < ARRAY_SIZE(string_type_table); i++) { 2393 for (unsigned i = 0; i < ARRAY_SIZE(string_type_table); i++) {
2394 const StringTypeTable& entry = string_type_table[i]; 2394 const StringTypeTable& entry = string_type_table[i];
2395 { MaybeObject* maybe_obj = AllocateMap(entry.type, entry.size); 2395 { MaybeObject* maybe_obj = AllocateMap(entry.type, entry.size);
2396 if (!maybe_obj->ToObject(&obj)) return false; 2396 if (!maybe_obj->ToObject(&obj)) return false;
2397 } 2397 }
2398 roots_[entry.index] = Map::cast(obj); 2398 roots_[entry.index] = Map::cast(obj);
2399 } 2399 }
2400 2400
2401 { MaybeObject* maybe_obj = AllocateMap(ASCII_SYMBOL_TYPE,
2402 kVariableSizeSentinel);
2403 if (!maybe_obj->ToObject(&obj)) return false;
2404 }
2405 set_printable_ascii_symbol_map(Map::cast(obj));
2406
2401 { MaybeObject* maybe_obj = AllocateMap(STRING_TYPE, kVariableSizeSentinel); 2407 { MaybeObject* maybe_obj = AllocateMap(STRING_TYPE, kVariableSizeSentinel);
2402 if (!maybe_obj->ToObject(&obj)) return false; 2408 if (!maybe_obj->ToObject(&obj)) return false;
2403 } 2409 }
2404 set_undetectable_string_map(Map::cast(obj)); 2410 set_undetectable_string_map(Map::cast(obj));
2405 Map::cast(obj)->set_is_undetectable(); 2411 Map::cast(obj)->set_is_undetectable();
2406 2412
2407 { MaybeObject* maybe_obj = 2413 { MaybeObject* maybe_obj =
2408 AllocateMap(ASCII_STRING_TYPE, kVariableSizeSentinel); 2414 AllocateMap(ASCII_STRING_TYPE, kVariableSizeSentinel);
2409 if (!maybe_obj->ToObject(&obj)) return false; 2415 if (!maybe_obj->ToObject(&obj)) return false;
2410 } 2416 }
(...skipping 5126 matching lines...) Expand 10 before | Expand all | Expand 10 after
7537 static_cast<int>(object_sizes_last_time_[index])); 7543 static_cast<int>(object_sizes_last_time_[index]));
7538 FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(ADJUST_LAST_TIME_OBJECT_COUNT) 7544 FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(ADJUST_LAST_TIME_OBJECT_COUNT)
7539 #undef ADJUST_LAST_TIME_OBJECT_COUNT 7545 #undef ADJUST_LAST_TIME_OBJECT_COUNT
7540 7546
7541 memcpy(object_counts_last_time_, object_counts_, sizeof(object_counts_)); 7547 memcpy(object_counts_last_time_, object_counts_, sizeof(object_counts_));
7542 memcpy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_)); 7548 memcpy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_));
7543 ClearObjectStats(); 7549 ClearObjectStats();
7544 } 7550 }
7545 7551
7546 } } // namespace v8::internal 7552 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/heap.h ('k') | src/json-stringifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698