Update V8 to version 4.1.0.21
This is a cherry-pick of all commits up to and including the
4.1.0.21 cherry-pick in Chromium.
Original commit message:
Version 4.1.0.21 (cherry-pick)
Merged 206e9136bde0f2b5ae8cb77afbb1e7833e5bd412
Unlink pages from the space page list after evacuation.
BUG=430201
LOG=N
R=jkummerow@chromium.org
Review URL: https://codereview.chromium.org/953813002
Cr-Commit-Position: refs/branch-heads/4.1@{#22}
Cr-Branched-From: 2e08d2a7aa9d65d269d8c57aba82eb38a8cb0a18-refs/heads/candidates@{#25353}
---
FPIIM-449
Change-Id: I8c23c7bbb70772b4858fe8a47b64fa97ee0d1f8c
diff --git a/src/d8.cc b/src/d8.cc
index 9db7744..7157cb8 100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -8,10 +8,6 @@
#define V8_SHARED
#endif
-#ifdef COMPRESS_STARTUP_DATA_BZ2
-#include <bzlib.h>
-#endif
-
#include <errno.h>
#include <stdlib.h>
#include <string.h>
@@ -46,6 +42,7 @@
#include "src/base/logging.h"
#include "src/base/platform/platform.h"
#include "src/base/sys-info.h"
+#include "src/basic-block-profiler.h"
#include "src/d8-debug.h"
#include "src/debug.h"
#include "src/natives.h"
@@ -176,33 +173,77 @@
}
+ScriptCompiler::CachedData* CompileForCachedData(
+ Local<String> source, Local<Value> name,
+ ScriptCompiler::CompileOptions compile_options) {
+ int source_length = source->Length();
+ uint16_t* source_buffer = new uint16_t[source_length];
+ source->Write(source_buffer, 0, source_length);
+ int name_length = 0;
+ uint16_t* name_buffer = NULL;
+ if (name->IsString()) {
+ Local<String> name_string = Local<String>::Cast(name);
+ name_length = name_string->Length();
+ name_buffer = new uint16_t[name_length];
+ name_string->Write(name_buffer, 0, name_length);
+ }
+ Isolate* temp_isolate = Isolate::New();
+ ScriptCompiler::CachedData* result = NULL;
+ {
+ Isolate::Scope isolate_scope(temp_isolate);
+ HandleScope handle_scope(temp_isolate);
+ Context::Scope context_scope(Context::New(temp_isolate));
+ Local<String> source_copy = v8::String::NewFromTwoByte(
+ temp_isolate, source_buffer, v8::String::kNormalString, source_length);
+ Local<Value> name_copy;
+ if (name_buffer) {
+ name_copy = v8::String::NewFromTwoByte(
+ temp_isolate, name_buffer, v8::String::kNormalString, name_length);
+ } else {
+ name_copy = v8::Undefined(temp_isolate);
+ }
+ ScriptCompiler::Source script_source(source_copy, ScriptOrigin(name_copy));
+ ScriptCompiler::CompileUnbound(temp_isolate, &script_source,
+ compile_options);
+ if (script_source.GetCachedData()) {
+ int length = script_source.GetCachedData()->length;
+ uint8_t* cache = new uint8_t[length];
+ memcpy(cache, script_source.GetCachedData()->data, length);
+ result = new ScriptCompiler::CachedData(
+ cache, length, ScriptCompiler::CachedData::BufferOwned);
+ }
+ }
+ temp_isolate->Dispose();
+ delete[] source_buffer;
+ delete[] name_buffer;
+ return result;
+}
+
+
// Compile a string within the current v8 context.
Local<UnboundScript> Shell::CompileString(
Isolate* isolate, Local<String> source, Local<Value> name,
- v8::ScriptCompiler::CompileOptions compile_options) {
+ ScriptCompiler::CompileOptions compile_options) {
ScriptOrigin origin(name);
- ScriptCompiler::Source script_source(source, origin);
- Local<UnboundScript> script =
- ScriptCompiler::CompileUnbound(isolate, &script_source, compile_options);
-
- // Was caching requested & successful? Then compile again, now with cache.
- if (script_source.GetCachedData()) {
- if (compile_options == ScriptCompiler::kProduceCodeCache) {
- compile_options = ScriptCompiler::kConsumeCodeCache;
- } else if (compile_options == ScriptCompiler::kProduceParserCache) {
- compile_options = ScriptCompiler::kConsumeParserCache;
- } else {
- DCHECK(false); // A new compile option?
- }
- ScriptCompiler::Source cached_source(
- source, origin, new v8::ScriptCompiler::CachedData(
- script_source.GetCachedData()->data,
- script_source.GetCachedData()->length,
- v8::ScriptCompiler::CachedData::BufferNotOwned));
- script = ScriptCompiler::CompileUnbound(isolate, &cached_source,
- compile_options);
+ if (compile_options == ScriptCompiler::kNoCompileOptions) {
+ ScriptCompiler::Source script_source(source, origin);
+ return ScriptCompiler::CompileUnbound(isolate, &script_source,
+ compile_options);
}
- return script;
+
+ ScriptCompiler::CachedData* data =
+ CompileForCachedData(source, name, compile_options);
+ ScriptCompiler::Source cached_source(source, origin, data);
+ if (compile_options == ScriptCompiler::kProduceCodeCache) {
+ compile_options = ScriptCompiler::kConsumeCodeCache;
+ } else if (compile_options == ScriptCompiler::kProduceParserCache) {
+ compile_options = ScriptCompiler::kConsumeParserCache;
+ } else {
+ DCHECK(false); // A new compile option?
+ }
+ if (data == NULL) compile_options = ScriptCompiler::kNoCompileOptions;
+ return ScriptCompiler::CompileUnbound(isolate, &cached_source,
+ compile_options);
}
@@ -365,7 +406,7 @@
Throw(args.GetIsolate(), "Invalid argument");
return;
}
- int index = data->RealmFind(args[0]->ToObject()->CreationContext());
+ int index = data->RealmFind(args[0]->ToObject(isolate)->CreationContext());
if (index == -1) return;
args.GetReturnValue().Set(index);
}
@@ -435,7 +476,7 @@
Throw(args.GetIsolate(), "Invalid argument");
return;
}
- ScriptCompiler::Source script_source(args[1]->ToString());
+ ScriptCompiler::Source script_source(args[1]->ToString(isolate));
Handle<UnboundScript> script = ScriptCompiler::CompileUnbound(
isolate, &script_source);
if (script.IsEmpty()) return;
@@ -481,7 +522,7 @@
// Explicitly catch potential exceptions in toString().
v8::TryCatch try_catch;
- Handle<String> str_obj = args[i]->ToString();
+ Handle<String> str_obj = args[i]->ToString(args.GetIsolate());
if (try_catch.HasCaught()) {
try_catch.ReThrow();
return;
@@ -572,7 +613,7 @@
void Shell::Quit(const v8::FunctionCallbackInfo<v8::Value>& args) {
int exit_code = args[0]->Int32Value();
- OnExit();
+ OnExit(args.GetIsolate());
exit(exit_code);
}
@@ -810,7 +851,7 @@
// Run the d8 shell utility script in the utility context
int source_index = i::NativesCollection<i::D8>::GetIndex("d8");
i::Vector<const char> shell_source =
- i::NativesCollection<i::D8>::GetRawScriptSource(source_index);
+ i::NativesCollection<i::D8>::GetScriptSource(source_index);
i::Vector<const char> shell_source_name =
i::NativesCollection<i::D8>::GetScriptName(source_index);
Handle<String> source =
@@ -838,34 +879,6 @@
#endif // !V8_SHARED
-#ifdef COMPRESS_STARTUP_DATA_BZ2
-class BZip2Decompressor : public v8::StartupDataDecompressor {
- public:
- virtual ~BZip2Decompressor() { }
-
- protected:
- virtual int DecompressData(char* raw_data,
- int* raw_data_size,
- const char* compressed_data,
- int compressed_data_size) {
- DCHECK_EQ(v8::StartupData::kBZip2,
- v8::V8::GetCompressedStartupDataAlgorithm());
- unsigned int decompressed_size = *raw_data_size;
- int result =
- BZ2_bzBuffToBuffDecompress(raw_data,
- &decompressed_size,
- const_cast<char*>(compressed_data),
- compressed_data_size,
- 0, 1);
- if (result == BZ_OK) {
- *raw_data_size = decompressed_size;
- }
- return result;
- }
-};
-#endif
-
-
Handle<ObjectTemplate> Shell::CreateGlobalTemplate(Isolate* isolate) {
Handle<ObjectTemplate> global_template = ObjectTemplate::New(isolate);
global_template->Set(String::NewFromUtf8(isolate, "print"),
@@ -922,15 +935,6 @@
void Shell::Initialize(Isolate* isolate) {
-#ifdef COMPRESS_STARTUP_DATA_BZ2
- BZip2Decompressor startup_data_decompressor;
- int bz2_result = startup_data_decompressor.Decompress();
- if (bz2_result != BZ_OK) {
- fprintf(stderr, "bzip error code: %d\n", bz2_result);
- Exit(1);
- }
-#endif
-
#ifndef V8_SHARED
Shell::counter_map_ = new CounterMap();
// Set up counters
@@ -1009,10 +1013,11 @@
#endif // !V8_SHARED
-void Shell::OnExit() {
+void Shell::OnExit(v8::Isolate* isolate) {
LineEditor* line_editor = LineEditor::Get();
if (line_editor) line_editor->Close();
#ifndef V8_SHARED
+ reinterpret_cast<i::Isolate*>(isolate)->DumpAndResetCompilationStats();
if (i::FLAG_dump_counters) {
int number_of_counters = 0;
for (CounterMap::Iterator i(counter_map_); i.More(); i.Next()) {
@@ -1534,25 +1539,30 @@
class MockArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
public:
- virtual void* Allocate(size_t) OVERRIDE {
- return malloc(0);
- }
- virtual void* AllocateUninitialized(size_t length) OVERRIDE {
- return malloc(0);
- }
- virtual void Free(void* p, size_t) OVERRIDE {
- free(p);
- }
+ void* Allocate(size_t) OVERRIDE { return malloc(0); }
+ void* AllocateUninitialized(size_t length) OVERRIDE { return malloc(0); }
+ void Free(void* p, size_t) OVERRIDE { free(p); }
};
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
class StartupDataHandler {
public:
- StartupDataHandler(const char* natives_blob,
+ StartupDataHandler(const char* exec_path, const char* natives_blob,
const char* snapshot_blob) {
- Load(natives_blob, &natives_, v8::V8::SetNativesDataBlob);
- Load(snapshot_blob, &snapshot_, v8::V8::SetSnapshotDataBlob);
+ // If we have (at least one) explicitly given blob, use those.
+ // If not, use the default blob locations next to the d8 binary.
+ if (natives_blob || snapshot_blob) {
+ LoadFromFiles(natives_blob, snapshot_blob);
+ } else {
+ char* natives;
+ char* snapshot;
+ LoadFromFiles(RelativePath(&natives, exec_path, "natives_blob.bin"),
+ RelativePath(&snapshot, exec_path, "snapshot_blob.bin"));
+
+ free(natives);
+ free(snapshot);
+ }
}
~StartupDataHandler() {
@@ -1561,11 +1571,32 @@
}
private:
+ static char* RelativePath(char** buffer, const char* exec_path,
+ const char* name) {
+ DCHECK(exec_path);
+ const char* last_slash = strrchr(exec_path, '/');
+ if (last_slash) {
+ int after_slash = last_slash - exec_path + 1;
+ int name_length = static_cast<int>(strlen(name));
+ *buffer =
+ reinterpret_cast<char*>(calloc(after_slash + name_length + 1, 1));
+ strncpy(*buffer, exec_path, after_slash);
+ strncat(*buffer, name, name_length);
+ } else {
+ *buffer = strdup(name);
+ }
+ return *buffer;
+ }
+
+ void LoadFromFiles(const char* natives_blob, const char* snapshot_blob) {
+ Load(natives_blob, &natives_, v8::V8::SetNativesDataBlob);
+ Load(snapshot_blob, &snapshot_, v8::V8::SetSnapshotDataBlob);
+ }
+
void Load(const char* blob_file,
v8::StartupData* startup_data,
void (*setter_fn)(v8::StartupData*)) {
startup_data->data = NULL;
- startup_data->compressed_size = 0;
startup_data->raw_size = 0;
if (!blob_file)
@@ -1580,13 +1611,12 @@
rewind(file);
startup_data->data = new char[startup_data->raw_size];
- startup_data->compressed_size = fread(
- const_cast<char*>(startup_data->data), 1, startup_data->raw_size,
- file);
+ int read_size =
+ static_cast<int>(fread(const_cast<char*>(startup_data->data), 1,
+ startup_data->raw_size, file));
fclose(file);
- if (startup_data->raw_size == startup_data->compressed_size)
- (*setter_fn)(startup_data);
+ if (startup_data->raw_size == read_size) (*setter_fn)(startup_data);
}
v8::StartupData natives_;
@@ -1621,9 +1651,11 @@
v8::V8::InitializePlatform(platform);
v8::V8::Initialize();
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
- StartupDataHandler startup_data(options.natives_blob, options.snapshot_blob);
+ StartupDataHandler startup_data(argv[0], options.natives_blob,
+ options.snapshot_blob);
#endif
SetFlagsFromString("--trace-hydrogen-file=hydrogen.cfg");
+ SetFlagsFromString("--trace-turbo-cfg-file=turbo.cfg");
SetFlagsFromString("--redirect-code-traces-to=code.asm");
ShellArrayBufferAllocator array_buffer_allocator;
MockArrayBufferAllocator mock_arraybuffer_allocator;
@@ -1640,7 +1672,7 @@
}
#endif
#ifdef ENABLE_VTUNE_JIT_INTERFACE
- vTune::InitializeVtuneForV8(create_params);
+ create_params.code_event_handler = vTune::GetVtuneCodeEventHandler();
#endif
#ifndef V8_SHARED
create_params.constraints.ConfigureDefaults(
@@ -1700,13 +1732,20 @@
RunShell(isolate);
}
}
+ OnExit(isolate);
+#ifndef V8_SHARED
+ // Dump basic block profiling data.
+ if (i::BasicBlockProfiler* profiler =
+ reinterpret_cast<i::Isolate*>(isolate)->basic_block_profiler()) {
+ i::OFStream os(stdout);
+ os << *profiler;
+ }
+#endif // !V8_SHARED
isolate->Dispose();
V8::Dispose();
V8::ShutdownPlatform();
delete platform;
- OnExit();
-
return result;
}