Skip to content

Commit 366c530

Browse files
LeszekSwirskiCommit Bot
authored andcommitted
[offthread] Remove Isolate param from SanityCheck
The Isolate* parameter in the deserializer SanityCheck is unused, and is blocking the use of the deserializer off-thread. Bug: chromium:1075999 Change-Id: I0f2acae3c1aff62aafeb2680a2eecb44b1608803 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2184290 Commit-Queue: Leszek Swirski <leszeks@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Cr-Commit-Position: refs/heads/master@{#67594}
1 parent 467c206 commit 366c530

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

src/snapshot/code-serializer.cc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,7 @@ MaybeHandle<SharedFunctionInfo> CodeSerializer::Deserialize(
270270
SerializedCodeData::SanityCheckResult sanity_check_result =
271271
SerializedCodeData::CHECK_SUCCESS;
272272
const SerializedCodeData scd = SerializedCodeData::FromCachedData(
273-
isolate, cached_data,
274-
SerializedCodeData::SourceHash(source, origin_options),
273+
cached_data, SerializedCodeData::SourceHash(source, origin_options),
275274
&sanity_check_result);
276275
if (sanity_check_result != SerializedCodeData::CHECK_SUCCESS) {
277276
if (FLAG_profile_deserialization) PrintF("[Cached code failed check]\n");
@@ -405,7 +404,7 @@ SerializedCodeData::SerializedCodeData(const std::vector<byte>* payload,
405404
}
406405

407406
SerializedCodeData::SanityCheckResult SerializedCodeData::SanityCheck(
408-
Isolate* isolate, uint32_t expected_source_hash) const {
407+
uint32_t expected_source_hash) const {
409408
if (this->size_ < kHeaderSize) return INVALID_HEADER;
410409
uint32_t magic_number = GetMagicNumber();
411410
if (magic_number != kMagicNumber) return MAGIC_NUMBER_MISMATCH;
@@ -471,11 +470,11 @@ SerializedCodeData::SerializedCodeData(ScriptData* data)
471470
: SerializedData(const_cast<byte*>(data->data()), data->length()) {}
472471

473472
SerializedCodeData SerializedCodeData::FromCachedData(
474-
Isolate* isolate, ScriptData* cached_data, uint32_t expected_source_hash,
473+
ScriptData* cached_data, uint32_t expected_source_hash,
475474
SanityCheckResult* rejection_result) {
476475
DisallowHeapAllocation no_gc;
477476
SerializedCodeData scd(cached_data);
478-
*rejection_result = scd.SanityCheck(isolate, expected_source_hash);
477+
*rejection_result = scd.SanityCheck(expected_source_hash);
479478
if (*rejection_result != CHECK_SUCCESS) {
480479
cached_data->Reject();
481480
return SerializedCodeData(nullptr, 0);

src/snapshot/code-serializer.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ class SerializedCodeData : public SerializedData {
109109
static const uint32_t kHeaderSize = POINTER_SIZE_ALIGN(kUnalignedHeaderSize);
110110

111111
// Used when consuming.
112-
static SerializedCodeData FromCachedData(Isolate* isolate,
113-
ScriptData* cached_data,
112+
static SerializedCodeData FromCachedData(ScriptData* cached_data,
114113
uint32_t expected_source_hash,
115114
SanityCheckResult* rejection_result);
116115

@@ -136,8 +135,7 @@ class SerializedCodeData : public SerializedData {
136135
return Vector<const byte>(data_ + kHeaderSize, size_ - kHeaderSize);
137136
}
138137

139-
SanityCheckResult SanityCheck(Isolate* isolate,
140-
uint32_t expected_source_hash) const;
138+
SanityCheckResult SanityCheck(uint32_t expected_source_hash) const;
141139
};
142140

143141
} // namespace internal

0 commit comments

Comments
 (0)