Reviewers: Sven Panne,
Description:
Make Zone::New() and Zone::NewArray() usable w/o v8.h.
[email protected]
Please review this at https://codereview.chromium.org/456663002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+49, -50 lines):
M src/zone.h
M src/zone.cc
M src/zone-inl.h
Index: src/zone-inl.h
diff --git a/src/zone-inl.h b/src/zone-inl.h
index
c36bd980653628b7ff9cff2e4259dc05241aac6f..cf037b59bc3db156147141a19de903179606b804
100644
--- a/src/zone-inl.h
+++ b/src/zone-inl.h
@@ -24,54 +24,6 @@ namespace internal {
static const int kASanRedzoneBytes = 24; // Must be a multiple of 8.
-inline void* Zone::New(int size) {
- // Round up the requested size to fit the alignment.
- size = RoundUp(size, kAlignment);
-
- // If the allocation size is divisible by 8 then we return an 8-byte
aligned
- // address.
- if (kPointerSize == 4 && kAlignment == 4) {
- position_ += ((~size) & 4) & (reinterpret_cast<intptr_t>(position_) &
4);
- } else {
- DCHECK(kAlignment >= kPointerSize);
- }
-
- // Check if the requested size is available without expanding.
- Address result = position_;
-
- int size_with_redzone =
-#ifdef V8_USE_ADDRESS_SANITIZER
- size + kASanRedzoneBytes;
-#else
- size;
-#endif
-
- if (size_with_redzone > limit_ - position_) {
- result = NewExpand(size_with_redzone);
- } else {
- position_ += size_with_redzone;
- }
-
-#ifdef V8_USE_ADDRESS_SANITIZER
- Address redzone_position = result + size;
- DCHECK(redzone_position + kASanRedzoneBytes == position_);
- ASAN_POISON_MEMORY_REGION(redzone_position, kASanRedzoneBytes);
-#endif
-
- // Check that the result has the proper alignment and return it.
- DCHECK(IsAddressAligned(result, kAlignment, 0));
- allocation_size_ += size;
- return reinterpret_cast<void*>(result);
-}
-
-
-template <typename T>
-T* Zone::NewArray(int length) {
- CHECK(std::numeric_limits<int>::max() / static_cast<int>(sizeof(T)) >
length);
- return static_cast<T*>(New(length * sizeof(T)));
-}
-
-
bool Zone::excess_allocation() {
return segment_bytes_allocated_ > kExcessLimit;
}
Index: src/zone.cc
diff --git a/src/zone.cc b/src/zone.cc
index
450e975c9487003365644c31fe46cb0741f81c0f..48d8c7b171d54deaff81a861e48969adf276f786
100644
--- a/src/zone.cc
+++ b/src/zone.cc
@@ -62,6 +62,47 @@ Zone::~Zone() {
}
+void* Zone::New(int size) {
+ // Round up the requested size to fit the alignment.
+ size = RoundUp(size, kAlignment);
+
+ // If the allocation size is divisible by 8 then we return an 8-byte
aligned
+ // address.
+ if (kPointerSize == 4 && kAlignment == 4) {
+ position_ += ((~size) & 4) & (reinterpret_cast<intptr_t>(position_) &
4);
+ } else {
+ DCHECK(kAlignment >= kPointerSize);
+ }
+
+ // Check if the requested size is available without expanding.
+ Address result = position_;
+
+ int size_with_redzone =
+#ifdef V8_USE_ADDRESS_SANITIZER
+ size + kASanRedzoneBytes;
+#else
+ size;
+#endif
+
+ if (size_with_redzone > limit_ - position_) {
+ result = NewExpand(size_with_redzone);
+ } else {
+ position_ += size_with_redzone;
+ }
+
+#ifdef V8_USE_ADDRESS_SANITIZER
+ Address redzone_position = result + size;
+ DCHECK(redzone_position + kASanRedzoneBytes == position_);
+ ASAN_POISON_MEMORY_REGION(redzone_position, kASanRedzoneBytes);
+#endif
+
+ // Check that the result has the proper alignment and return it.
+ DCHECK(IsAddressAligned(result, kAlignment, 0));
+ allocation_size_ += size;
+ return reinterpret_cast<void*>(result);
+}
+
+
void Zone::DeleteAll() {
#ifdef DEBUG
// Constant byte value used for zapping dead memory in debug mode.
Index: src/zone.h
diff --git a/src/zone.h b/src/zone.h
index
a689f1218f0d4e5d085e18a9287e482dace6699d..a690b8d8caf1bb6ec3144908f37b4e8736c982d8
100644
--- a/src/zone.h
+++ b/src/zone.h
@@ -5,6 +5,8 @@
#ifndef V8_ZONE_H_
#define V8_ZONE_H_
+#include <limits>
+
#include "src/allocation.h"
#include "src/base/logging.h"
#include "src/globals.h"
@@ -38,10 +40,14 @@ class Zone {
~Zone();
// Allocate 'size' bytes of memory in the Zone; expands the Zone by
// allocating new segments of memory on demand using malloc().
- inline void* New(int size);
+ void* New(int size);
template <typename T>
- inline T* NewArray(int length);
+ T* NewArray(int length) {
+ CHECK(std::numeric_limits<int>::max() / static_cast<int>(sizeof(T)) >
+ length);
+ return static_cast<T*>(New(length * sizeof(T)));
+ }
// Deletes all objects and free all memory allocated in the Zone. Keeps
one
// small (size <= kMaximumKeptSegmentSize) segment around if it finds
one.
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
