Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/test/fuzzer/fuzzer-support.cc b/test/fuzzer/fuzzer-support.cc
new file mode 100644
index 0000000..cf3ee8c
--- /dev/null
+++ b/test/fuzzer/fuzzer-support.cc
@@ -0,0 +1,100 @@
+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "test/fuzzer/fuzzer-support.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "include/libplatform/libplatform.h"
+
+namespace v8_fuzzer {
+
+namespace {
+
+FuzzerSupport* g_fuzzer_support = nullptr;
+
+void DeleteFuzzerSupport() {
+ if (g_fuzzer_support) {
+ delete g_fuzzer_support;
+ g_fuzzer_support = nullptr;
+ }
+}
+
+} // namespace
+
+class FuzzerSupport::ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+ public:
+ virtual void* Allocate(size_t length) {
+ void* data = AllocateUninitialized(length);
+ return data == NULL ? data : memset(data, 0, length);
+ }
+ virtual void* AllocateUninitialized(size_t length) { return malloc(length); }
+ virtual void Free(void* data, size_t) { free(data); }
+};
+
+FuzzerSupport::FuzzerSupport(int* argc, char*** argv) {
+ v8::V8::SetFlagsFromCommandLine(argc, *argv, true);
+ v8::V8::InitializeICU();
+ v8::V8::InitializeExternalStartupData((*argv)[0]);
+ platform_ = v8::platform::CreateDefaultPlatform();
+ v8::V8::InitializePlatform(platform_);
+ v8::V8::Initialize();
+
+ allocator_ = new ArrayBufferAllocator;
+ v8::Isolate::CreateParams create_params;
+ create_params.array_buffer_allocator = allocator_;
+ isolate_ = v8::Isolate::New(create_params);
+
+ {
+ v8::Isolate::Scope isolate_scope(isolate_);
+ v8::HandleScope handle_scope(isolate_);
+ context_.Reset(isolate_, v8::Context::New(isolate_));
+ }
+}
+
+FuzzerSupport::~FuzzerSupport() {
+ {
+ v8::Isolate::Scope isolate_scope(isolate_);
+ while (v8::platform::PumpMessageLoop(platform_, isolate_)) /* empty */
+ ;
+
+ v8::HandleScope handle_scope(isolate_);
+ context_.Reset();
+ }
+
+ isolate_->Dispose();
+ isolate_ = nullptr;
+
+ delete allocator_;
+ allocator_ = nullptr;
+
+ v8::V8::Dispose();
+ v8::V8::ShutdownPlatform();
+
+ delete platform_;
+ platform_ = nullptr;
+}
+
+// static
+FuzzerSupport* FuzzerSupport::Get() { return g_fuzzer_support; }
+
+v8::Isolate* FuzzerSupport::GetIsolate() { return isolate_; }
+
+v8::Local<v8::Context> FuzzerSupport::GetContext() {
+ v8::Isolate::Scope isolate_scope(isolate_);
+ v8::EscapableHandleScope handle_scope(isolate_);
+ v8::Local<v8::Context> context =
+ v8::Local<v8::Context>::New(isolate_, context_);
+ return handle_scope.Escape(context);
+}
+
+} // namespace v8_fuzzer
+
+extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) {
+ v8_fuzzer::g_fuzzer_support = new v8_fuzzer::FuzzerSupport(argc, argv);
+ atexit(&v8_fuzzer::DeleteFuzzerSupport);
+ return 0;
+}