f0940a6390
This is a reland of 40d66d8bf8
The fix disambiguates duplicate symbols in the generated embedded
builtins file.
Original change's description:
> [build] Make separate snapshot for trusted variant
>
> This enables side-by-side snapshots with and without untrusted-code
> mitigations. It'll be the default in all V8 stand-alone builds
> with external startup data. Internal snapshots are not supported.
>
> The files snapshot_blob.bin and snapshot_blob_trusted.bin will be
> bundled with V8 on swarming and the correct file is loaded dependent
> on the --untrusted-code-mitigations runtime flag.
>
> Likewise we embed two snapshots for builtins.
>
> Side-by-side snapshots won't be supported in Chromium.
>
> Bug: v8:7441
> Change-Id: I2949ddfd5773649946b1c8e74751d48ad1d9c524
> Reviewed-on: https://chromium-review.googlesource.com/960004
> Commit-Queue: Michael Achenbach <machenbach@chromium.org>
> Reviewed-by: Jakob Gruber <jgruber@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#52028}
Bug: v8:7441
Change-Id: I626171d4e07389f0453b4d0a698e2772fd37e8c5
Reviewed-on: https://chromium-review.googlesource.com/968623
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52055}
114 lines
2.7 KiB
C++
114 lines
2.7 KiB
C++
// Copyright 2015 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 "src/startup-data-util.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "src/base/file-utils.h"
|
|
#include "src/base/logging.h"
|
|
#include "src/base/platform/platform.h"
|
|
#include "src/flags.h"
|
|
#include "src/utils.h"
|
|
|
|
|
|
namespace v8 {
|
|
namespace internal {
|
|
|
|
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
|
|
|
|
namespace {
|
|
|
|
v8::StartupData g_natives;
|
|
v8::StartupData g_snapshot;
|
|
|
|
|
|
void ClearStartupData(v8::StartupData* data) {
|
|
data->data = nullptr;
|
|
data->raw_size = 0;
|
|
}
|
|
|
|
|
|
void DeleteStartupData(v8::StartupData* data) {
|
|
delete[] data->data;
|
|
ClearStartupData(data);
|
|
}
|
|
|
|
|
|
void FreeStartupData() {
|
|
DeleteStartupData(&g_natives);
|
|
DeleteStartupData(&g_snapshot);
|
|
}
|
|
|
|
|
|
void Load(const char* blob_file, v8::StartupData* startup_data,
|
|
void (*setter_fn)(v8::StartupData*)) {
|
|
ClearStartupData(startup_data);
|
|
|
|
CHECK(blob_file);
|
|
|
|
FILE* file = fopen(blob_file, "rb");
|
|
if (!file) {
|
|
PrintF(stderr, "Failed to open startup resource '%s'.\n", blob_file);
|
|
return;
|
|
}
|
|
|
|
fseek(file, 0, SEEK_END);
|
|
startup_data->raw_size = static_cast<int>(ftell(file));
|
|
rewind(file);
|
|
|
|
startup_data->data = new char[startup_data->raw_size];
|
|
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 == read_size) {
|
|
(*setter_fn)(startup_data);
|
|
} else {
|
|
PrintF(stderr, "Corrupted startup resource '%s'.\n", blob_file);
|
|
}
|
|
}
|
|
|
|
|
|
void LoadFromFiles(const char* natives_blob, const char* snapshot_blob) {
|
|
Load(natives_blob, &g_natives, v8::V8::SetNativesDataBlob);
|
|
Load(snapshot_blob, &g_snapshot, v8::V8::SetSnapshotDataBlob);
|
|
|
|
atexit(&FreeStartupData);
|
|
}
|
|
|
|
} // namespace
|
|
#endif // V8_USE_EXTERNAL_STARTUP_DATA
|
|
|
|
|
|
void InitializeExternalStartupData(const char* directory_path) {
|
|
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
|
|
char* natives;
|
|
char* snapshot;
|
|
const char* snapshot_name = "snapshot_blob.bin";
|
|
#ifdef V8_MULTI_SNAPSHOTS
|
|
if (!FLAG_untrusted_code_mitigations) {
|
|
snapshot_name = "snapshot_blob_trusted.bin";
|
|
}
|
|
#endif
|
|
LoadFromFiles(
|
|
base::RelativePath(&natives, directory_path, "natives_blob.bin"),
|
|
base::RelativePath(&snapshot, directory_path, snapshot_name));
|
|
free(natives);
|
|
free(snapshot);
|
|
#endif // V8_USE_EXTERNAL_STARTUP_DATA
|
|
}
|
|
|
|
|
|
void InitializeExternalStartupData(const char* natives_blob,
|
|
const char* snapshot_blob) {
|
|
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
|
|
LoadFromFiles(natives_blob, snapshot_blob);
|
|
#endif // V8_USE_EXTERNAL_STARTUP_DATA
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace v8
|