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

Side by Side Diff: src/builtins.cc

Issue 26166004: Get rid of HEAP_PROFILE macro (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 2 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 | « no previous file | src/heap.cc » ('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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 former_start[new_start_index + 1] = Smi::FromInt(len - to_trim); 266 former_start[new_start_index + 1] = Smi::FromInt(len - to_trim);
267 267
268 // Maintain marking consistency for HeapObjectIterator and 268 // Maintain marking consistency for HeapObjectIterator and
269 // IncrementalMarking. 269 // IncrementalMarking.
270 int size_delta = to_trim * entry_size; 270 int size_delta = to_trim * entry_size;
271 if (heap->marking()->TransferMark(elms->address(), 271 if (heap->marking()->TransferMark(elms->address(),
272 elms->address() + size_delta)) { 272 elms->address() + size_delta)) {
273 MemoryChunk::IncrementLiveBytesFromMutator(elms->address(), -size_delta); 273 MemoryChunk::IncrementLiveBytesFromMutator(elms->address(), -size_delta);
274 } 274 }
275 275
276 HEAP_PROFILE(heap, ObjectMoveEvent(elms->address(), 276 HeapProfiler* profiler = heap->isolate()->heap_profiler();
277 elms->address() + size_delta, 277 if (profiler->is_profiling()) {
278 elms->Size())); 278 profiler->ObjectMoveEvent(elms->address(),
279 elms->address() + size_delta,
280 elms->Size());
281 }
279 return FixedArrayBase::cast(HeapObject::FromAddress( 282 return FixedArrayBase::cast(HeapObject::FromAddress(
280 elms->address() + to_trim * entry_size)); 283 elms->address() + to_trim * entry_size));
281 } 284 }
282 285
283 286
284 static bool ArrayPrototypeHasNoElements(Heap* heap, 287 static bool ArrayPrototypeHasNoElements(Heap* heap,
285 Context* native_context, 288 Context* native_context,
286 JSObject* array_proto) { 289 JSObject* array_proto) {
287 // This method depends on non writability of Object and Array prototype 290 // This method depends on non writability of Object and Array prototype
288 // fields. 291 // fields.
(...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after
1812 } 1815 }
1813 BUILTIN_LIST_C(DEFINE_BUILTIN_ACCESSOR_C) 1816 BUILTIN_LIST_C(DEFINE_BUILTIN_ACCESSOR_C)
1814 BUILTIN_LIST_A(DEFINE_BUILTIN_ACCESSOR_A) 1817 BUILTIN_LIST_A(DEFINE_BUILTIN_ACCESSOR_A)
1815 BUILTIN_LIST_H(DEFINE_BUILTIN_ACCESSOR_H) 1818 BUILTIN_LIST_H(DEFINE_BUILTIN_ACCESSOR_H)
1816 BUILTIN_LIST_DEBUG_A(DEFINE_BUILTIN_ACCESSOR_A) 1819 BUILTIN_LIST_DEBUG_A(DEFINE_BUILTIN_ACCESSOR_A)
1817 #undef DEFINE_BUILTIN_ACCESSOR_C 1820 #undef DEFINE_BUILTIN_ACCESSOR_C
1818 #undef DEFINE_BUILTIN_ACCESSOR_A 1821 #undef DEFINE_BUILTIN_ACCESSOR_A
1819 1822
1820 1823
1821 } } // namespace v8::internal 1824 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/heap.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698