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

Side by Side Diff: src/zone-inl.h

Issue 272433002: Merge counters and v8-counters (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 7 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
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef V8_ZONE_INL_H_ 5 #ifndef V8_ZONE_INL_H_
6 #define V8_ZONE_INL_H_ 6 #define V8_ZONE_INL_H_
7 7
8 #include "zone.h" 8 #include "zone.h"
9 9
10 #ifdef V8_USE_ADDRESS_SANITIZER 10 #ifdef V8_USE_ADDRESS_SANITIZER
11 #include <sanitizer/asan_interface.h> 11 #include <sanitizer/asan_interface.h>
12 #else 12 #else
13 #define ASAN_UNPOISON_MEMORY_REGION(start, size) ((void) 0) 13 #define ASAN_UNPOISON_MEMORY_REGION(start, size) ((void) 0)
14 #endif 14 #endif
15 15
16 #include "counters.h" 16 #include "counters.h"
17 #include "isolate.h" 17 #include "isolate.h"
18 #include "utils.h" 18 #include "utils.h"
19 #include "v8-counters.h"
20 19
21 namespace v8 { 20 namespace v8 {
22 namespace internal { 21 namespace internal {
23 22
24 23
25 static const int kASanRedzoneBytes = 24; // Must be a multiple of 8. 24 static const int kASanRedzoneBytes = 24; // Must be a multiple of 8.
26 25
27 26
28 inline void* Zone::New(int size) { 27 inline void* Zone::New(int size) {
29 // Round up the requested size to fit the alignment. 28 // Round up the requested size to fit the alignment.
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 110
112 template <typename T> 111 template <typename T>
113 void* ZoneSplayTree<T>::operator new(size_t size, Zone* zone) { 112 void* ZoneSplayTree<T>::operator new(size_t size, Zone* zone) {
114 return zone->New(static_cast<int>(size)); 113 return zone->New(static_cast<int>(size));
115 } 114 }
116 115
117 116
118 } } // namespace v8::internal 117 } } // namespace v8::internal
119 118
120 #endif // V8_ZONE_INL_H_ 119 #endif // V8_ZONE_INL_H_
OLDNEW
« src/store-buffer.cc ('K') | « src/v8-counters.cc ('k') | tools/gyp/v8.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698