Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / v8 / src / zone-allocator.h

diff --git a/src/v8/src/zone-allocator.h b/src/v8/src/zone-allocator.h
index 7ed1713..ab0ae9c 100644 (file)
--- a/src/v8/src/zone-allocator.h
+++ b/src/v8/src/zone-allocator.h
@@ -1,34 +1,13 @@
 // Copyright 2014 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #ifndef V8_ZONE_ALLOCATOR_H_
 #define V8_ZONE_ALLOCATOR_H_
 
-#include "zone.h"
+#include <limits>
+
+#include "src/zone.h"
 
 namespace v8 {
 namespace internal {
@@ -57,16 +36,14 @@ class zone_allocator {
   pointer address(reference x) const {return &x;}
   const_pointer address(const_reference x) const {return &x;}
 
-  pointer allocate(size_type count, const void* hint = 0) {
-    size_t size = count * sizeof(value_type);
-    size = RoundUp(size, kPointerSize);
-    return static_cast<pointer>(zone_->New(size));
+  pointer allocate(size_type n, const void* hint = 0) {
+    return static_cast<pointer>(zone_->NewArray<value_type>(
+            static_cast<int>(n)));
   }
   void deallocate(pointer p, size_type) { /* noop for Zones */ }
 
   size_type max_size() const throw() {
-    size_type max = static_cast<size_type>(-1) / sizeof(T);
-    return (max > 0 ? max : 1);
+    return std::numeric_limits<int>::max() / sizeof(value_type);
   }
   void construct(pointer p, const T& val) {
     new(static_cast<void*>(p)) T(val);
@@ -85,6 +62,8 @@ class zone_allocator {
   Zone* zone_;
 };
 
+typedef zone_allocator<bool> ZoneBoolAllocator;
+typedef zone_allocator<int> ZoneIntAllocator;
 } }  // namespace v8::internal
 
 #endif  // V8_ZONE_ALLOCATOR_H_