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

Side by Side Diff: src/heap.cc

Issue 7187007: Merge arguments branch to bleeding edge (second try). (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Undelete external-array test. Created 9 years, 6 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/heap-profiler.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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 1831 matching lines...) Expand 10 before | Expand all | Expand 10 after
1842 if (!maybe_obj->ToObject(&obj)) return false; 1842 if (!maybe_obj->ToObject(&obj)) return false;
1843 } 1843 }
1844 set_external_unsigned_int_array_map(Map::cast(obj)); 1844 set_external_unsigned_int_array_map(Map::cast(obj));
1845 1845
1846 { MaybeObject* maybe_obj = AllocateMap(EXTERNAL_FLOAT_ARRAY_TYPE, 1846 { MaybeObject* maybe_obj = AllocateMap(EXTERNAL_FLOAT_ARRAY_TYPE,
1847 ExternalArray::kAlignedSize); 1847 ExternalArray::kAlignedSize);
1848 if (!maybe_obj->ToObject(&obj)) return false; 1848 if (!maybe_obj->ToObject(&obj)) return false;
1849 } 1849 }
1850 set_external_float_array_map(Map::cast(obj)); 1850 set_external_float_array_map(Map::cast(obj));
1851 1851
1852 { MaybeObject* maybe_obj =
1853 AllocateMap(FIXED_ARRAY_TYPE, kVariableSizeSentinel);
1854 if (!maybe_obj->ToObject(&obj)) return false;
1855 }
1856 set_non_strict_arguments_elements_map(Map::cast(obj));
1857
1852 { MaybeObject* maybe_obj = AllocateMap(EXTERNAL_DOUBLE_ARRAY_TYPE, 1858 { MaybeObject* maybe_obj = AllocateMap(EXTERNAL_DOUBLE_ARRAY_TYPE,
1853 ExternalArray::kAlignedSize); 1859 ExternalArray::kAlignedSize);
1854 if (!maybe_obj->ToObject(&obj)) return false; 1860 if (!maybe_obj->ToObject(&obj)) return false;
1855 } 1861 }
1856 set_external_double_array_map(Map::cast(obj)); 1862 set_external_double_array_map(Map::cast(obj));
1857 1863
1858 { MaybeObject* maybe_obj = AllocateMap(CODE_TYPE, kVariableSizeSentinel); 1864 { MaybeObject* maybe_obj = AllocateMap(CODE_TYPE, kVariableSizeSentinel);
1859 if (!maybe_obj->ToObject(&obj)) return false; 1865 if (!maybe_obj->ToObject(&obj)) return false;
1860 } 1866 }
1861 set_code_map(Map::cast(obj)); 1867 set_code_map(Map::cast(obj));
(...skipping 4173 matching lines...) Expand 10 before | Expand all | Expand 10 after
6035 } 6041 }
6036 6042
6037 6043
6038 void ExternalStringTable::TearDown() { 6044 void ExternalStringTable::TearDown() {
6039 new_space_strings_.Free(); 6045 new_space_strings_.Free();
6040 old_space_strings_.Free(); 6046 old_space_strings_.Free();
6041 } 6047 }
6042 6048
6043 6049
6044 } } // namespace v8::internal 6050 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/heap.h ('k') | src/heap-profiler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698