Upgrade to 3.29
Update V8 to 3.29.88.17 and update makefiles to support building on
all the relevant platforms.
Bug: 17370214
Change-Id: Ia3407c157fd8d72a93e23d8318ccaf6ecf77fa4e
diff --git a/src/allocation.cc b/src/allocation.cc
index 6c7a08c..cae1c10 100644
--- a/src/allocation.cc
+++ b/src/allocation.cc
@@ -1,36 +1,18 @@
// Copyright 2012 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.
-#include "allocation.h"
+#include "src/allocation.h"
#include <stdlib.h> // For free, malloc.
-#include <string.h> // For memcpy.
-#include "checks.h"
-#include "utils.h"
+#include "src/base/bits.h"
+#include "src/base/logging.h"
+#include "src/base/platform/platform.h"
+#include "src/utils.h"
+
+#if V8_LIBC_BIONIC
+#include <malloc.h> // NOLINT
+#endif
namespace v8 {
namespace internal {
@@ -85,7 +67,7 @@
char* StrDup(const char* str) {
int length = StrLength(str);
char* result = NewArray<char>(length + 1);
- memcpy(result, str, length);
+ MemCopy(result, str, length);
result[length] = '\0';
return result;
}
@@ -95,29 +77,39 @@
int length = StrLength(str);
if (n < length) length = n;
char* result = NewArray<char>(length + 1);
- memcpy(result, str, length);
+ MemCopy(result, str, length);
result[length] = '\0';
return result;
}
-void PreallocatedStorage::LinkTo(PreallocatedStorage* other) {
- next_ = other->next_;
- other->next_->previous_ = this;
- previous_ = other;
- other->next_ = this;
+void* AlignedAlloc(size_t size, size_t alignment) {
+ DCHECK_LE(V8_ALIGNOF(void*), alignment);
+ DCHECK(base::bits::IsPowerOfTwo32(alignment));
+ void* ptr;
+#if V8_OS_WIN
+ ptr = _aligned_malloc(size, alignment);
+#elif V8_LIBC_BIONIC
+ // posix_memalign is not exposed in some Android versions, so we fall back to
+ // memalign. See http://code.google.com/p/android/issues/detail?id=35391.
+ ptr = memalign(alignment, size);
+#else
+ if (posix_memalign(&ptr, alignment, size)) ptr = NULL;
+#endif
+ if (ptr == NULL) FatalProcessOutOfMemory("AlignedAlloc");
+ return ptr;
}
-void PreallocatedStorage::Unlink() {
- next_->previous_ = previous_;
- previous_->next_ = next_;
-}
-
-
-PreallocatedStorage::PreallocatedStorage(size_t size)
- : size_(size) {
- previous_ = next_ = this;
+void AlignedFree(void *ptr) {
+#if V8_OS_WIN
+ _aligned_free(ptr);
+#elif V8_LIBC_BIONIC
+ // Using free is not correct in general, but for V8_LIBC_BIONIC it is.
+ free(ptr);
+#else
+ free(ptr);
+#endif
}
} } // namespace v8::internal