chore: bump chromium to 127.0.6521.0 (main) (#42118)
* chore: bump chromium in DEPS to 126.0.6470.0 * 5492605: Migrate TODOs referencing old crbug IDs to the new issue tracker IDs |5492605* 5513277: Move subresource-filter-ruleset to GCS |5513277* 5512656: Remove CustomizeChromeSupportsChromeRefresh2023 |5512656* 5516009: Accept mouse events in inactive window for Top Chrome WebUIs |5516009* 5376861: Change references to RWHVB in RWHIER and RenderWidgetTargeter to RWHVI. |5376861* 5490530: Use partition_alloc PA_BUILDFLAG(...) outside PA. #cleanup |5490530* 5296870: network: Allow trusted loaders to learn the sent request cookies. |5296870* 5453438: Delegate delegated ink trails to RWHI from RWHIER. |5453438* chore: update patches * chore: bump chromium in DEPS to 126.0.6472.0 * chore: bump chromium in DEPS to 126.0.6474.0 * chore: update patches * chore: bump chromium in DEPS to 126.0.6476.0 * chore: bump chromium in DEPS to 126.0.6478.0 * chore: bump chromium in DEPS to 126.0.6478.3 * chore: bump chromium in DEPS to 126.0.6478.8 * update patches * only disable enterprise_cloud_content_analysis * 5403888: [api] support v8::Data in v8::TracedReference and v8::EmbedderGraph5403888* chore: bump chromium in DEPS to 127.0.6484.0 * chore: bump chromium in DEPS to 127.0.6485.0 * 5539004: Use NOTREACHED_IN_MIGRATION() in remaining chrome/ |5539004* src: cast to v8::Value before using v8::EmbedderGraph::V8Node | https://github.com/nodejs/node/pull/52638/files * chore: update patches * chore: update v8 patches * chore: bump chromium in DEPS to 127.0.6486.0 * chore: bump chromium in DEPS to 127.0.6488.0 * chore: bump chromium in DEPS to 127.0.6490.0 * chore: bump chromium in DEPS to 127.0.6492.0 * chore: update patches For some reason, `feat_expose_raw_response_headers_from_urlloader.patch` got messed up in an earlier commit. * chore: update patches printing.patch was updated due to5535938* 5527572: Move Connectors prefs files to components/enterprise/connectors/5527572* chore: bump chromium in DEPS to 127.0.6494.0 * chore: bump chromium in DEPS to 127.0.6495.0 * chore: bump chromium in DEPS to 127.0.6496.0 * 5465511: [api] Mark v8::ObjectTemplate::SetAccessor(..) for deprecation5465511* chore: revert v8 deprecation See patch message for more details.5526611* chore: update patches * 5538771: Remove srcdoc else-if block in CalculateOrigin()5538771* 5522321: [devtools] Support saving base64 encoded files via host bindings5522321* 5376861: Change references to RWHVB in RWHIER and RenderWidgetTargeter to RWHVI.5376861* 5530163: [media] Use VideoFrame::Plane typed enum instead of nameless enum5530163* 5463431: iwa: Only create IsolatedWebAppURLLoaderFactory for subresources in IWAs5463431* fixup! 5465511: [api] Mark v8::ObjectTemplate::SetAccessor(..) for deprecation5465511* 5512176: Remove OnEnvironmentEstimationComplete()5512176* 5528282: Move Web Speech API .mojom files to //media/mojo/mojom5528282* 5513740: Reland "[Extensions] Restructure extensions::ProcessMap"5513740* 5483406: [PEPC] Make PEPC permission subscription take into account device status5483406* 5526034: [DoH] Remove kDnsOverHttps feature flag5526034The title is a bit misleading. They removed handling for the feature flag and generally intend to remove it but haven't yet. I only changed our code to address the flag that was removed. A quick search on GitHub for `DnsOverHttpsFallback` yielded a few results, but they were all C++ chromium code or patches, 0 app code or discussion results. Since I couldn't find any evidence of this flag being used in developer applications, I've chosen to exclude this change from the breaking changes docs. * chore: revert v8 removal5497515See patch message for more details. * chore: cherry-pick Node.js patch for V8 API removal fix Node.js PR: https://github.com/nodejs/node/pull/52996 V8 API Removal CL:5539888See the patch description for more details. * 5492183: Extensions: CodeHealth: Give enums some class5492183* fixup! 5528282: Move Web Speech API .mojom files to //media/mojo/mojom5528282* 5514687: Reland "Add a secret handshake to the base::Feature constructor"5514687* fixup! 5530163: [media] Use VideoFrame::Plane typed enum instead of nameless enum5530163* 5466238: PDF Viewer: add metrics to record if PDF is opened with a11y5466238* 5502081: Migrate OnDisplayRemoved to OnDisplaysRemoved5502081* 5539888: [api] Remove several APIs deprecated in version 12.65539888This commit essentially only removes the `only_terminate_in_safe_scope` isolate creation parameter. This undoes some work that was originally done in #35766. * 5498236: Make browser_tests force full async initialization for OSCrypt Async5498236* fixup! 5528282: Move Web Speech API .mojom files to //media/mojo/mojom5528282* 5545807: Migrate most remaining NOTREACHED()5545807I took a systematic approach to modifying all of our uses of `NOTREACHED` that were causing errors: * If there was a `return` or `break` (etc.) immediately after `NOTREACHED`, I removed the control flow instruction and left the `NOTREACHED` unmodified * All other instances were migrated to `NOTREACHED_IN_MIGRATION` We should revisit pretty much all usage of `NOTREACHED` as an upgrade follow-up item. * fixup! 5526034: [DoH] Remove kDnsOverHttps feature flag5526034Turns out the feature flags were removed in the `.cc` file, but not the `.h` feature list file. This means that the feature flags are pretty much officially gone. (The leftover symbols in the header are likely an oversight from what I can gather.) We may potentially decide to put this in the breaking changes doc if we decide this feature flag is important enough to highlight. * chore: bump chromium in DEPS to 127.0.6498.3 * chore: bump chromium in DEPS to 127.0.6500.0 * chore: bump chromium in DEPS to 127.0.6502.0 * chore: bump chromium in DEPS to 127.0.6504.0 * chore: bump chromium in DEPS to 127.0.6505.0 * chore: bump chromium in DEPS to 127.0.6508.0 * build: use Sha256Sum in script/sysroots.json Xref:5506275* chore: update chore_add_electron_deps_to_gitignores.patch Xref: no manual changes; patch applied with fuzz 2 * chore: update feat_allow_code_cache_in_custom_schemes.patch Xref: no manual changes; patch applied with fuzz 1 * chore: e patches all * fixup! build: use Sha256Sum in script/sysroots.json `sync` succeeds now * chore: replace absl::optional with std::optional Xref:5253843* chore: update CalculatePreferredSize() to new upstream semantics Xref:5459174Xref:5541220Xref:5514708Xref:5504212Xref: https://chromium-review.googlesource.com/516542 * chore: replace absl::optional with std::optional Xref:5296147* chore: add kPip to enumeration as a no-op5546257* [Autofill] Remove RenderFrame::ElementBoundsInWindow() Xref:5553982* chore: fix feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch need new header to pick up definition of BLINK_PLATFORM_EXPORT macro Xref:5463143* chore: bump chromium in DEPS to 127.0.6510.0 * chore: update patches * chore: fix include path for native_web_keyboard_event.h Xref:5541976* chore: add currently-unused should_include_device_status arg to GetPermissionStatusForCurrentDocument() Xref:5545382* chore: bump chromium in DEPS to 127.0.6512.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch No manual changes; patch applied with fuzz 1 * chore: update feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch No manual changes; patch applied with fuzz 1 * chore: update webview_fullscreen.patch No manual changes; patch applied with fuzz 1 * chore=: remove cherry-pick-22db6918bac9.patch already present upstream * chore: remove nonexistent patchfiles from .patches * chore: remove cherry-pick-3e037e195e50.patch no longer needed; merged upstream * Update namespace for files moved to //components/input Xref:5563251* Require client for InitParams to always specify an ownership mode. Xref:5532482Xref:5578714* chore: e patches all * fixup! Update namespace for files moved to //components/input * chore: remove profile_keyed_service_factory, profile_selections from chromium_src already being linked in via chrome browser for printing * chore: bump chromium in DEPS to 127.0.6515.0 * chore: bump chromium in DEPS to 127.0.6516.0 * chore: update render_widget_host_view_base.patch Xref:5547803patch applied manually due to simple upstream shear * chore: update feat_allow_code_cache_in_custom_schemes.patch No manual changes; patch applied with fuzz 1 * chore: e patches all * Pull RWHIER and RWT to //content/common/input. Xref:5397681* chore: bump chromium in DEPS to 127.0.6517.0 * chore: update patches * fixup: Update namespace for files moved to //components/input * Remove 0-arg (default) constructor for views::Widget::InitParams.5578714* fixup: only disable enterprise_cloud_content_analysis The original commita5480accc2, was due to this CL 5527572: Move Connectors prefs files to components/enterprise/connectors/ |5527572* chore: bump chromium in DEPS to 127.0.6519.0 * chore: update patches * src: do not use deprecated V8 API https://github.com/nodejs/node/pull/53084 * src: remove dependency on wrapper-descriptor-based cpp heap https://github.com/nodejs/node/pull/53086 * 5344413: [DevTools] Add `getHostConfig` UI binding for sending status of `base::Features` to DevTools5344413* 5585788: Extensions: ManifestHandler: Separate Registry like ExtensionRegistry5585788* chore: update filenames.libcxx.gni * 5506857: Reland "Migrate clang-format to gcs first class deps"5506857* fixup: 5539888: [api] Remove several APIs deprecated in version 12.6 * fixup: 5506857: Reland Migrate clang-format to gcs first class deps * chore: bump chromium in DEPS to 127.0.6521.0 * chore: update patches * spec: update navigator.keyboard should lock the keyboard * Block or allow all MIDI using the existing SysEx permission Refs5154368Refs5499157* spec: update test/parallel/test-v8-stats * views: remove CalculatePreferredSize() Refs5504212* chore: update patches after rebase * 5560288: Re-enable ChromeOS XNNPack on Intel only5560288* chore: add nan patches for v8 changes Refs 5539888: [api] Remove several APIs deprecated in version 12.6 |5539888and 5539852: [heap][api] Remove deprecated v8::Isolate::IdleNotificationDeadline |5539852* 5573603: Modularize //chrome/browser/themes5573603* 5539888: [api] Remove several APIs deprecated in version 12.65539888* chore: update patches * test: fixup navigator.keyboard.lock on Windows * chore: remove unneeded profile target --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot]
GitHub
parent
84e15e2d04
commit
c3b4cd987c
202 changed files with 1843 additions and 1127 deletions
|
|
@ -1,6 +1,3 @@
|
|||
chore_allow_customizing_microtask_policy_per_context.patch
|
||||
deps_add_v8_object_setinternalfieldfornodecore.patch
|
||||
revert_heap_add_checks_position_info.patch
|
||||
cherry-pick-f320600cd1f4.patch
|
||||
cherry-pick-b3c01ac1e60a.patch
|
||||
cherry-pick-3e037e195e50.patch
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Shu-yu Guo <syg@chromium.org>
|
||||
Date: Tue, 21 May 2024 10:06:20 -0700
|
||||
Subject: Using FunctionParsingScope for parsing class static blocks
|
||||
|
||||
Class static blocks contain statements, don't inherit the
|
||||
ExpressionScope stack.
|
||||
|
||||
Bug: 341663589
|
||||
Change-Id: Id52a60d77781201a706fcf2290d7d103f39bed83
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5553030
|
||||
Commit-Queue: Shu-yu Guo <syg@chromium.org>
|
||||
Commit-Queue: Adam Klein <adamk@chromium.org>
|
||||
Reviewed-by: Adam Klein <adamk@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#94014}
|
||||
|
||||
diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc
|
||||
index 660fdd2e9ad30b9487eafd351b1e517d2a489204..de4df35c0addc53c5620a19e3e06a8f9eff2a8fb 100644
|
||||
--- a/src/ast/scopes.cc
|
||||
+++ b/src/ast/scopes.cc
|
||||
@@ -2447,7 +2447,7 @@ bool Scope::MustAllocate(Variable* var) {
|
||||
var->set_is_used();
|
||||
if (inner_scope_calls_eval_ && !var->is_this()) var->SetMaybeAssigned();
|
||||
}
|
||||
- DCHECK(!var->has_forced_context_allocation() || var->is_used());
|
||||
+ CHECK(!var->has_forced_context_allocation() || var->is_used());
|
||||
// Global variables do not need to be allocated.
|
||||
return !var->IsGlobalObjectProperty() && var->is_used();
|
||||
}
|
||||
diff --git a/src/parsing/parser-base.h b/src/parsing/parser-base.h
|
||||
index 78bad16404d31505e34d4d69a948ad7a689776cc..7ccf203fadcf256b4dba40f66d8e5b4d3780282c 100644
|
||||
--- a/src/parsing/parser-base.h
|
||||
+++ b/src/parsing/parser-base.h
|
||||
@@ -2661,6 +2661,7 @@ typename ParserBase<Impl>::BlockT ParserBase<Impl>::ParseClassStaticBlock(
|
||||
}
|
||||
|
||||
FunctionState initializer_state(&function_state_, &scope_, initializer_scope);
|
||||
+ FunctionParsingScope body_parsing_scope(impl());
|
||||
AcceptINScope accept_in(this, true);
|
||||
|
||||
// Each static block has its own var and lexical scope, so make a new var
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Shu-yu Guo <syg@chromium.org>
|
||||
Date: Mon, 13 May 2024 11:23:20 -0700
|
||||
Subject: Don't build AccessInfo for storing to module exports
|
||||
|
||||
Bug: 340221135
|
||||
Change-Id: I5af35be6ebf6a69db1c4687107503575b23973c4
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5534518
|
||||
Reviewed-by: Adam Klein <adamk@chromium.org>
|
||||
Commit-Queue: Shu-yu Guo <syg@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#93872}
|
||||
|
||||
diff --git a/src/compiler/access-info.cc b/src/compiler/access-info.cc
|
||||
index 7cff878839c85cd9c6571ee48f1a0fce081f4471..9d022ba402d7bfdd5ca745a4193ee0de0e3d755e 100644
|
||||
--- a/src/compiler/access-info.cc
|
||||
+++ b/src/compiler/access-info.cc
|
||||
@@ -526,6 +526,14 @@ PropertyAccessInfo AccessorAccessInfoHelper(
|
||||
Cell::cast(module_namespace->module()->exports()->Lookup(
|
||||
isolate, name.object(),
|
||||
Smi::ToInt(Object::GetHash(*name.object())))));
|
||||
+ if (IsAnyStore(access_mode)) {
|
||||
+ // ES#sec-module-namespace-exotic-objects-set-p-v-receiver
|
||||
+ // ES#sec-module-namespace-exotic-objects-defineownproperty-p-desc
|
||||
+ //
|
||||
+ // Storing to a module namespace object is always an error or a no-op in
|
||||
+ // JS.
|
||||
+ return PropertyAccessInfo::Invalid(zone);
|
||||
+ }
|
||||
if (IsTheHole(cell->value(kRelaxedLoad), isolate)) {
|
||||
// This module has not been fully initialized yet.
|
||||
return PropertyAccessInfo::Invalid(zone);
|
||||
diff --git a/src/maglev/maglev-graph-builder.cc b/src/maglev/maglev-graph-builder.cc
|
||||
index c5587be1e0b5d944d4b4b6f8d4f48f62c41db183..2a79c2bf27d18ee60b130bd0f8d6ff00493cab1e 100644
|
||||
--- a/src/maglev/maglev-graph-builder.cc
|
||||
+++ b/src/maglev/maglev-graph-builder.cc
|
||||
@@ -4116,19 +4116,28 @@ ReduceResult MaglevGraphBuilder::TryBuildPropertyStore(
|
||||
access_info.holder().value());
|
||||
}
|
||||
|
||||
- if (access_info.IsFastAccessorConstant()) {
|
||||
- return TryBuildPropertySetterCall(access_info, receiver,
|
||||
- GetAccumulatorTagged());
|
||||
- } else {
|
||||
- DCHECK(access_info.IsDataField() || access_info.IsFastDataConstant());
|
||||
- ReduceResult res = TryBuildStoreField(access_info, receiver, access_mode);
|
||||
- if (res.IsDone()) {
|
||||
- RecordKnownProperty(receiver, name,
|
||||
- current_interpreter_frame_.accumulator(),
|
||||
- AccessInfoGuaranteedConst(access_info), access_mode);
|
||||
- return res;
|
||||
+ switch (access_info.kind()) {
|
||||
+ case compiler::PropertyAccessInfo::kFastAccessorConstant:
|
||||
+ return TryBuildPropertySetterCall(access_info, receiver,
|
||||
+ GetAccumulatorTagged());
|
||||
+ case compiler::PropertyAccessInfo::kDataField:
|
||||
+ case compiler::PropertyAccessInfo::kFastDataConstant: {
|
||||
+ ReduceResult res = TryBuildStoreField(access_info, receiver, access_mode);
|
||||
+ if (res.IsDone()) {
|
||||
+ RecordKnownProperty(
|
||||
+ receiver, name, current_interpreter_frame_.accumulator(),
|
||||
+ AccessInfoGuaranteedConst(access_info), access_mode);
|
||||
+ return res;
|
||||
+ }
|
||||
+ return ReduceResult::Fail();
|
||||
}
|
||||
- return ReduceResult::Fail();
|
||||
+ case compiler::PropertyAccessInfo::kInvalid:
|
||||
+ case compiler::PropertyAccessInfo::kNotFound:
|
||||
+ case compiler::PropertyAccessInfo::kDictionaryProtoDataConstant:
|
||||
+ case compiler::PropertyAccessInfo::kDictionaryProtoAccessorConstant:
|
||||
+ case compiler::PropertyAccessInfo::kModuleExport:
|
||||
+ case compiler::PropertyAccessInfo::kStringLength:
|
||||
+ UNREACHABLE();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Shu-yu Guo <syg@chromium.org>
|
||||
Date: Thu, 9 May 2024 12:03:28 -0700
|
||||
Subject: Only normalize JSObject targets in SetOrCopyDataProperties
|
||||
|
||||
Bug: 339458194
|
||||
Change-Id: I4d6eebdd921971fa28d7c474535d978900ba633f
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5527397
|
||||
Reviewed-by: Rezvan Mahdavi Hezaveh <rezvan@chromium.org>
|
||||
Commit-Queue: Shu-yu Guo <syg@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#93811}
|
||||
|
||||
diff --git a/src/objects/js-objects.cc b/src/objects/js-objects.cc
|
||||
index a90f88a638530c565f279e249ff03d3385b01089..9cb671370b9abfd3939e382c33bae8da8491b487 100644
|
||||
--- a/src/objects/js-objects.cc
|
||||
+++ b/src/objects/js-objects.cc
|
||||
@@ -434,9 +434,7 @@ Maybe<bool> JSReceiver::SetOrCopyDataProperties(
|
||||
Nothing<bool>());
|
||||
|
||||
if (!from->HasFastProperties() && target->HasFastProperties() &&
|
||||
- !IsJSGlobalProxy(*target)) {
|
||||
- // JSProxy is always in slow-mode.
|
||||
- DCHECK(!IsJSProxy(*target));
|
||||
+ IsJSObject(*target) && !IsJSGlobalProxy(*target)) {
|
||||
// Convert to slow properties if we're guaranteed to overflow the number of
|
||||
// descriptors.
|
||||
int source_length;
|
||||
|
|
@ -9,7 +9,7 @@ capability to switch the microtask polciy of these per context microtask queue t
|
|||
Node.js integration in the renderer.
|
||||
|
||||
diff --git a/include/v8-microtask-queue.h b/include/v8-microtask-queue.h
|
||||
index bc0f31d4441a3de865b260d1d715f631d3231a12..95cfbde75298354d2d7d0a02feb715512e6db6f5 100644
|
||||
index 135dfb06a3bdd11e5db21c1974a38a086a7ac9cb..f2708774bfac59703e8981d8816a97a8e61b177a 100644
|
||||
--- a/include/v8-microtask-queue.h
|
||||
+++ b/include/v8-microtask-queue.h
|
||||
@@ -97,6 +97,9 @@ class V8_EXPORT MicrotaskQueue {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ This is a non-ABI breaking solution added by Node.js in v20.x for:
|
|||
which are necessary for backporting the vm-related memory fixes in https://github.com/nodejs/node/pull/48510.
|
||||
|
||||
diff --git a/include/v8-object.h b/include/v8-object.h
|
||||
index 49a2b7dcbb05ff8670105ca280d3f6c3f5cee44f..ae2f128549048abd24e856440819db06f65e871a 100644
|
||||
index 30708c44e10a5d965d6e3ad9df607ef62edb3c5d..ee862a1eed0694f87f4348af2f94869adc942ab8 100644
|
||||
--- a/include/v8-object.h
|
||||
+++ b/include/v8-object.h
|
||||
@@ -22,6 +22,8 @@ class Function;
|
||||
|
|
@ -23,7 +23,7 @@ index 49a2b7dcbb05ff8670105ca280d3f6c3f5cee44f..ae2f128549048abd24e856440819db06
|
|||
|
||||
/**
|
||||
* A private symbol
|
||||
@@ -538,6 +540,21 @@ class V8_EXPORT Object : public Value {
|
||||
@@ -543,6 +545,21 @@ class V8_EXPORT Object : public Value {
|
||||
index);
|
||||
}
|
||||
|
||||
|
|
@ -46,10 +46,10 @@ index 49a2b7dcbb05ff8670105ca280d3f6c3f5cee44f..ae2f128549048abd24e856440819db06
|
|||
V8_INLINE static void* GetAlignedPointerFromInternalField(
|
||||
const BasicTracedReference<Object>& object, int index) {
|
||||
diff --git a/src/api/api.cc b/src/api/api.cc
|
||||
index 2fe89e5778efbc309d56c721339e64d75804fea0..f459d5b4e408e16c476e7580ba707606f85c30e0 100644
|
||||
index 732ee34a9776e516b764957525161874d9c27a2b..a544aeddd7310f60b1cbc1496174a8d2ccdf775e 100644
|
||||
--- a/src/api/api.cc
|
||||
+++ b/src/api/api.cc
|
||||
@@ -6252,14 +6252,33 @@ Local<Data> v8::Object::SlowGetInternalField(int index) {
|
||||
@@ -6293,14 +6293,33 @@ Local<Data> v8::Object::SlowGetInternalField(int index) {
|
||||
isolate);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -63,10 +63,10 @@ index 27fbc04bc880f2ea68dc7a126b8091a3b5ab4025..42d9649c5250c06a4d39ba0306cbdea0
|
|||
} // namespace internal
|
||||
} // namespace v8
|
||||
diff --git a/src/objects/objects.cc b/src/objects/objects.cc
|
||||
index 15e428ad2a870cae1c9efcb7fa2426b88d25b3c7..cebe0cff397e8558bdb0e77dde609fe97dc7842f 100644
|
||||
index d83783a5560a355684a866e1aca2cc081835919b..f8622e1311838df9548bc1839cd40d17af02a7d2 100644
|
||||
--- a/src/objects/objects.cc
|
||||
+++ b/src/objects/objects.cc
|
||||
@@ -4357,7 +4357,6 @@ namespace {
|
||||
@@ -4361,7 +4361,6 @@ namespace {
|
||||
template <typename Char>
|
||||
bool GetPositionInfoSlowImpl(base::Vector<Char> source, int position,
|
||||
Script::PositionInfo* info) {
|
||||
|
|
@ -74,7 +74,7 @@ index 15e428ad2a870cae1c9efcb7fa2426b88d25b3c7..cebe0cff397e8558bdb0e77dde609fe9
|
|||
if (position < 0) {
|
||||
position = 0;
|
||||
}
|
||||
@@ -4404,11 +4403,25 @@ int GetLength(const String::LineEndsVector& vector) {
|
||||
@@ -4408,11 +4407,25 @@ int GetLength(const String::LineEndsVector& vector) {
|
||||
}
|
||||
|
||||
int GetLength(const Tagged<FixedArray>& array) { return array->length(); }
|
||||
|
|
@ -103,7 +103,7 @@ index 15e428ad2a870cae1c9efcb7fa2426b88d25b3c7..cebe0cff397e8558bdb0e77dde609fe9
|
|||
const int ends_len = GetLength(ends);
|
||||
if (ends_len == 0) return false;
|
||||
|
||||
@@ -4447,31 +4460,6 @@ bool GetLineEndsContainerPositionInfo(const LineEndsContainer& ends,
|
||||
@@ -4451,31 +4464,6 @@ bool GetLineEndsContainerPositionInfo(const LineEndsContainer& ends,
|
||||
info->column = position - info->line_start;
|
||||
}
|
||||
|
||||
|
|
@ -135,7 +135,7 @@ index 15e428ad2a870cae1c9efcb7fa2426b88d25b3c7..cebe0cff397e8558bdb0e77dde609fe9
|
|||
// Line end is position of the linebreak character.
|
||||
info->line_end = GetLineEnd(ends, info->line);
|
||||
if (info->line_end > 0) {
|
||||
@@ -4540,23 +4528,6 @@ bool Script::GetPositionInfoWithLineEnds(
|
||||
@@ -4544,23 +4532,6 @@ bool Script::GetPositionInfoWithLineEnds(
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -317,10 +317,10 @@ index d04bb9bf73b4b5725c99dade26510f4964ec0d4b..bb59c92a780160c4168349bfc5d523df
|
|||
AddressToTraceMap address_to_trace_;
|
||||
};
|
||||
diff --git a/src/profiler/heap-snapshot-generator.cc b/src/profiler/heap-snapshot-generator.cc
|
||||
index 4f3494d4677312ebc6b7e86ef64e08b434e9f77b..bd79fcbd0867bfe693d6e09753767107c2291391 100644
|
||||
index 1b7170bd84c29d9e6228e92a8e3ad46d50967a15..417a487bd6767b15bb177394f4273af21bd64883 100644
|
||||
--- a/src/profiler/heap-snapshot-generator.cc
|
||||
+++ b/src/profiler/heap-snapshot-generator.cc
|
||||
@@ -2994,6 +2994,7 @@ bool HeapSnapshotGenerator::GenerateSnapshot() {
|
||||
@@ -2999,6 +2999,7 @@ bool HeapSnapshotGenerator::GenerateSnapshot() {
|
||||
IsolateSafepointScope scope(heap_);
|
||||
|
||||
Isolate* isolate = heap_->isolate();
|
||||
|
|
@ -328,7 +328,7 @@ index 4f3494d4677312ebc6b7e86ef64e08b434e9f77b..bd79fcbd0867bfe693d6e09753767107
|
|||
auto temporary_global_object_tags =
|
||||
v8_heap_explorer_.CollectTemporaryGlobalObjectsTags();
|
||||
|
||||
@@ -3005,7 +3006,6 @@ bool HeapSnapshotGenerator::GenerateSnapshot() {
|
||||
@@ -3010,7 +3011,6 @@ bool HeapSnapshotGenerator::GenerateSnapshot() {
|
||||
// DisallowGarbageCollection scope as the HeapObjectIterator used during
|
||||
// snapshot creation enters a safepoint as well. However, in practice we
|
||||
// already enter a safepoint above so that should never trigger a GC.
|
||||
|
|
@ -336,7 +336,7 @@ index 4f3494d4677312ebc6b7e86ef64e08b434e9f77b..bd79fcbd0867bfe693d6e09753767107
|
|||
|
||||
NullContextForSnapshotScope null_context_scope(isolate);
|
||||
|
||||
@@ -3016,7 +3016,6 @@ bool HeapSnapshotGenerator::GenerateSnapshot() {
|
||||
@@ -3021,7 +3021,6 @@ bool HeapSnapshotGenerator::GenerateSnapshot() {
|
||||
|
||||
snapshot_->AddSyntheticRootEntries();
|
||||
|
||||
|
|
@ -344,7 +344,7 @@ index 4f3494d4677312ebc6b7e86ef64e08b434e9f77b..bd79fcbd0867bfe693d6e09753767107
|
|||
if (!FillReferences()) return false;
|
||||
|
||||
snapshot_->FillChildren();
|
||||
@@ -3087,9 +3086,12 @@ bool HeapSnapshotGenerator::FillReferences() {
|
||||
@@ -3092,9 +3091,12 @@ bool HeapSnapshotGenerator::FillReferences() {
|
||||
const int HeapSnapshotJSONSerializer::kNodeFieldsCount = 7;
|
||||
|
||||
void HeapSnapshotJSONSerializer::Serialize(v8::OutputStream* stream) {
|
||||
|
|
@ -358,7 +358,7 @@ index 4f3494d4677312ebc6b7e86ef64e08b434e9f77b..bd79fcbd0867bfe693d6e09753767107
|
|||
DCHECK_NULL(writer_);
|
||||
writer_ = new OutputStreamWriter(stream);
|
||||
SerializeImpl();
|
||||
@@ -3447,17 +3449,10 @@ void HeapSnapshotJSONSerializer::SerializeTraceNodeInfos() {
|
||||
@@ -3452,17 +3454,10 @@ void HeapSnapshotJSONSerializer::SerializeTraceNodeInfos() {
|
||||
// The cast is safe because script id is a non-negative Smi.
|
||||
buffer_pos =
|
||||
utoa(static_cast<unsigned>(info->script_id), buffer, buffer_pos);
|
||||
|
|
@ -379,7 +379,7 @@ index 4f3494d4677312ebc6b7e86ef64e08b434e9f77b..bd79fcbd0867bfe693d6e09753767107
|
|||
buffer[buffer_pos++] = '\0';
|
||||
writer_->AddString(buffer.begin());
|
||||
diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc
|
||||
index 6e85e2c65d5542a2a67fa078d04ed5b82a89f0ff..a9528e3452b9873fb64da6aa9528d51239cb9afa 100644
|
||||
index 4885cab74f95378a9ff884d58a8c089624985a8f..f1e869f28e00c0449e85b00f3f4626e0941e4c43 100644
|
||||
--- a/test/cctest/test-heap-profiler.cc
|
||||
+++ b/test/cctest/test-heap-profiler.cc
|
||||
@@ -2841,6 +2841,8 @@ TEST(ArrayGrowLeftTrim) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue