Tom Callaway
5 years ago
commit
ff01f5a752
@ -1,12 +0,0 @@
|
||||
diff -up chromium-71.0.3578.98/third_party/tcmalloc/gperftools-2.0/chromium/src/base/linux_syscall_support.h.gcc9 chromium-71.0.3578.98/third_party/tcmalloc/gperftools-2.0/chromium/src/base/linux_syscall_support.h
|
||||
--- chromium-71.0.3578.98/third_party/tcmalloc/gperftools-2.0/chromium/src/base/linux_syscall_support.h.gcc9 2019-01-08 13:27:25.193614727 -0500
|
||||
+++ chromium-71.0.3578.98/third_party/tcmalloc/gperftools-2.0/chromium/src/base/linux_syscall_support.h 2019-01-08 13:27:35.161392234 -0500
|
||||
@@ -1231,7 +1231,7 @@ typedef unsigned long int ulong;
|
||||
"d"(LSS_SYSCALL_ARG(parent_tidptr)),
|
||||
"r"(LSS_SYSCALL_ARG(newtls)),
|
||||
"r"(LSS_SYSCALL_ARG(child_tidptr))
|
||||
- : "rsp", "memory", "r8", "r10", "r11", "rcx");
|
||||
+ : "memory", "r8", "r10", "r11", "rcx");
|
||||
}
|
||||
LSS_RETURN(int, __res);
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
diff -up chromium-76.0.3809.132/chrome/test/chromedriver/BUILD.gn.fixme chromium-76.0.3809.132/chrome/test/chromedriver/BUILD.gn
|
||||
--- chromium-76.0.3809.132/chrome/test/chromedriver/BUILD.gn.fixme 2019-09-10 15:53:02.871463568 -0400
|
||||
+++ chromium-76.0.3809.132/chrome/test/chromedriver/BUILD.gn 2019-09-10 16:57:32.281112323 -0400
|
||||
@@ -319,6 +319,7 @@ executable("chromedriver") {
|
||||
"//net/server:http_server",
|
||||
"//net/traffic_annotation:test_support",
|
||||
"//services/network/public/mojom",
|
||||
+ "//third_party/zlib",
|
||||
]
|
||||
}
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
diff -up chromium-76.0.3809.132/components/os_crypt/features.gni.rhel8 chromium-76.0.3809.132/components/os_crypt/features.gni
|
||||
--- chromium-76.0.3809.132/components/os_crypt/features.gni.rhel8 2019-09-06 17:08:01.242314126 -0400
|
||||
+++ chromium-76.0.3809.132/components/os_crypt/features.gni 2019-09-06 17:08:10.139134707 -0400
|
||||
@@ -7,5 +7,5 @@ import("//build/config/ui.gni")
|
||||
declare_args() {
|
||||
# Whether to use libgnome-keyring (deprecated by libsecret).
|
||||
# See http://crbug.com/466975 and http://crbug.com/355223.
|
||||
- use_gnome_keyring = is_desktop_linux && use_glib
|
||||
+ use_gnome_keyring = false
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/base/location.h b/base/location.h
|
||||
index c07e747..924db1c 100644
|
||||
--- a/base/location.h
|
||||
+++ b/base/location.h
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
namespace base {
|
||||
|
||||
-#if defined(__has_builtin)
|
||||
+#if defined(__clang__)
|
||||
// Clang allows detection of these builtins.
|
||||
#define SUPPORTS_LOCATION_BUILTINS \
|
||||
(__has_builtin(__builtin_FUNCTION) && __has_builtin(__builtin_FILE) && \
|
||||
@ -0,0 +1,36 @@
|
||||
From 9c3aed099b010a75594a0efd523774c4c9a5e3d2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
|
||||
Date: Tue, 15 Oct 2019 12:10:55 +0000
|
||||
Subject: [PATCH] GCC: Fix zlib symbol visibility macro
|
||||
|
||||
GCC parses the function __attribute__ syntax a bit differently from Clang,
|
||||
associating the attribute with the return type instead of the function if the
|
||||
return type is a pointer. This leads to certain zlib symbols, such as
|
||||
Cr_z_zError, to fail to be properly exported from the shared library. Fix by
|
||||
using ZEXTERN instead of ZEXPORT for the attribute which works the same for both
|
||||
GCC and Clang.
|
||||
|
||||
Bug: 819294
|
||||
Change-Id: I5707d1b0627a503df08df9ac0bb65fda69453989
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1859788
|
||||
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Reviewed-by: Nico Weber <thakis@chromium.org>
|
||||
Commit-Queue: Nico Weber <thakis@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#705917}
|
||||
---
|
||||
third_party/zlib/chromeconf.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/third_party/zlib/chromeconf.h b/third_party/zlib/chromeconf.h
|
||||
index e9aa3867d8512..666093d696a58 100644
|
||||
--- a/third_party/zlib/chromeconf.h
|
||||
+++ b/third_party/zlib/chromeconf.h
|
||||
@@ -13,7 +13,7 @@
|
||||
#define ZEXTERN __declspec(dllimport)
|
||||
#endif
|
||||
#elif defined(ZLIB_IMPLEMENTATION)
|
||||
-#define ZEXPORT __attribute__((visibility("default")))
|
||||
+#define ZEXTERN __attribute__((visibility("default")))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
From e79d9d0e06b825d2e62b38db03248c0e6ceec7e4 Mon Sep 17 00:00:00 2001
|
||||
From: Greg Thompson <grt@chromium.org>
|
||||
Date: Sat, 5 Oct 2019 03:47:05 +0000
|
||||
Subject: [PATCH] Only detect outdated builds on Google Chrome.
|
||||
|
||||
Prior to https://crrev.com/643864, they weren't detected for Chromium on
|
||||
account of the way google_brand worked. That CL changed behavior and
|
||||
accidentally started showing the outdated build bubble for Linux
|
||||
Chromium users.
|
||||
|
||||
BUG=1010592
|
||||
|
||||
Change-Id: I069ac36166e2ae720d58b1b9aa85605792be8684
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841635
|
||||
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Reviewed-by: Lei Zhang <thestig@chromium.org>
|
||||
Commit-Queue: Greg Thompson <grt@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#703131}
|
||||
---
|
||||
.../upgrade_detector/upgrade_detector_impl.cc | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
|
||||
index 432e3789eced0..07850fdf80cd7 100644
|
||||
--- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
|
||||
+++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "base/time/default_tick_clock.h"
|
||||
#include "base/time/tick_clock.h"
|
||||
#include "base/time/time.h"
|
||||
+#include "build/branding_buildflags.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/google/google_brand.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
@@ -73,6 +74,14 @@ constexpr base::TimeDelta kNotifyCycleTimeForTesting =
|
||||
// The number of days after which we identify a build/install as outdated.
|
||||
constexpr base::TimeDelta kOutdatedBuildAge = base::TimeDelta::FromDays(12 * 7);
|
||||
|
||||
+constexpr bool ShouldDetectOutdatedBuilds() {
|
||||
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
+ return true;
|
||||
+#else // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
+ return false;
|
||||
+#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
+}
|
||||
+
|
||||
// Return the string that was passed as a value for the
|
||||
// kCheckForUpdateIntervalSec switch.
|
||||
std::string CmdLineInterval() {
|
||||
@@ -406,6 +415,10 @@ bool UpgradeDetectorImpl::DetectOutdated
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
+
|
||||
+ if (!ShouldDetectOutdatedBuilds())
|
||||
+ return false;
|
||||
+
|
||||
}
|
||||
|
||||
base::Time network_time;
|
||||
@ -0,0 +1,32 @@
|
||||
From d16cda8fc3476cc534a756873cc8aa2692a57054 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
||||
Date: Thu, 22 Aug 2019 13:13:36 +0200
|
||||
Subject: [PATCH] GCC: declare noexcept move constructor/assign operators of V8StackTraceId
|
||||
|
||||
blink::BlinkCloneableMessage declares default implementation of
|
||||
move operator/assign operator that requires v8_inspector::V8StackTraceId
|
||||
to declare its move constructor/assign operator too.
|
||||
|
||||
Bug: chromium:819294
|
||||
Change-Id: Iaf626ee8245efcba372a17cdf2de448e691d41d6
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1796062
|
||||
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
||||
Reviewed-by: Yang Guo <yangguo@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#63799}
|
||||
---
|
||||
|
||||
diff --git a/v8/include/v8-inspector.h b/v8/include/v8-inspector.h
|
||||
index ce5b777..ed4cdec 100644
|
||||
--- a/v8/include/v8-inspector.h
|
||||
+++ b/v8/include/v8-inspector.h
|
||||
@@ -231,7 +231,10 @@ struct V8_EXPORT V8StackTraceId {
|
||||
std::pair<int64_t, int64_t> debugger_id;
|
||||
|
||||
V8StackTraceId();
|
||||
+ V8StackTraceId(const V8StackTraceId&) = default;
|
||||
V8StackTraceId(uintptr_t id, const std::pair<int64_t, int64_t> debugger_id);
|
||||
+ V8StackTraceId& operator=(const V8StackTraceId&) = default;
|
||||
+ V8StackTraceId& operator=(V8StackTraceId&&) noexcept = default;
|
||||
~V8StackTraceId() = default;
|
||||
|
||||
bool IsInvalid() const;
|
||||
@ -0,0 +1,40 @@
|
||||
From bbfe2665923225b4a7c436ba2b6c7e5f695f2e52 Mon Sep 17 00:00:00 2001
|
||||
From: David Landell <landell@vewd.com>
|
||||
Date: Fri, 13 Sep 2019 12:24:13 +0000
|
||||
Subject: [PATCH] Add missing include for unique_ptr
|
||||
|
||||
Change-Id: I614d2f42868d563eb6a92dfb2aae08286e20d687
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1803137
|
||||
Reviewed-by: Henrik Boström <hbos@chromium.org>
|
||||
Commit-Queue: Henrik Boström <hbos@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#696355}
|
||||
---
|
||||
|
||||
diff --git a/third_party/blink/public/platform/web_rtc_rtp_source.h b/third_party/blink/public/platform/web_rtc_rtp_source.h
|
||||
index 959440f..c3fd542 100644
|
||||
--- a/third_party/blink/public/platform/web_rtc_rtp_source.h
|
||||
+++ b/third_party/blink/public/platform/web_rtc_rtp_source.h
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_RTC_RTP_SOURCE_H_
|
||||
#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_RTC_RTP_SOURCE_H_
|
||||
|
||||
+#include <memory>
|
||||
+
|
||||
#include "base/optional.h"
|
||||
#include "third_party/blink/public/platform/web_common.h"
|
||||
|
||||
Missing include due to reverting ProfileManagerObserver
|
||||
---
|
||||
|
||||
diff --git a/chrome/browser/web_applications/extensions/bookmark_app_util.cc b/chrome/browser/web_applications/extensions/bookmark_app_util.cc
|
||||
index ee4b70a..b31e5f5 100644
|
||||
--- a/chrome/browser/web_applications/extensions/bookmark_app_util.cc
|
||||
+++ b/chrome/browser/web_applications/extensions/bookmark_app_util.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "base/strings/string_piece.h"
|
||||
#include "base/values.h"
|
||||
#include "chrome/browser/extensions/extension_service.h"
|
||||
+#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/web_applications/components/app_registrar.h"
|
||||
#include "chrome/browser/web_applications/components/web_app_provider_base.h"
|
||||
#include "chrome/common/chrome_features.h"
|
||||
@ -0,0 +1,43 @@
|
||||
From e73aed9a5ef15102f29ac31b70290faf5c90f9fe Mon Sep 17 00:00:00 2001
|
||||
From: Evan Stade <estade@chromium.org>
|
||||
Date: Wed, 16 Oct 2019 16:01:32 +0000
|
||||
Subject: [PATCH] Fix shutdown crash in ProfileManager.
|
||||
|
||||
OnProfileMarkedForPermanentDeletion should move from
|
||||
ProfileManagerObserver to ProfileObserver, which would also
|
||||
fix this bug. However, changing the order of members is the
|
||||
quickest and most cherry-pick-able way to avoid the crash.
|
||||
|
||||
Bug: 1005244
|
||||
Change-Id: If2db68c846dd418cd02864b57b9b543687fa1e03
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863518
|
||||
Auto-Submit: Evan Stade <estade@chromium.org>
|
||||
Reviewed-by: David Roger <droger@chromium.org>
|
||||
Commit-Queue: Evan Stade <estade@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#706467}
|
||||
---
|
||||
|
||||
diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
|
||||
index b60df76d..7d02af7 100644
|
||||
--- a/chrome/browser/profiles/profile_manager.h
|
||||
+++ b/chrome/browser/profiles/profile_manager.h
|
||||
@@ -409,6 +409,10 @@ class ProfileManager : public content::NotificationObserver,
|
||||
const base::FilePath& profile_dir);
|
||||
#endif // !defined(OS_ANDROID)
|
||||
|
||||
+ // Destroy after |profile_info_cache_| since Profile destruction may trigger
|
||||
+ // some observers to unregister themselves.
|
||||
+ base::ObserverList<ProfileManagerObserver> observers_;
|
||||
+
|
||||
// Object to cache various information about profiles. Contains information
|
||||
// about every profile which has been created for this instance of Chrome,
|
||||
// if it has not been explicitly deleted. It must be destroyed after
|
||||
@@ -450,8 +454,6 @@ class ProfileManager : public content::NotificationObserver,
|
||||
// Controls whether to initialize some services. Only disabled for testing.
|
||||
bool do_final_services_init_ = true;
|
||||
|
||||
- base::ObserverList<ProfileManagerObserver> observers_;
|
||||
-
|
||||
// TODO(chrome/browser/profiles/OWNERS): Usage of this in profile_manager.cc
|
||||
// should likely be turned into DCHECK_CURRENTLY_ON(BrowserThread::UI) for
|
||||
// consistency with surrounding code in the same file but that wasn't trivial
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/third_party/protobuf/src/google/protobuf/repeated_field.h b/third_party/protobuf/src/google/protobuf/repeated_field.h
|
||||
index b5b193c..4434854 100644
|
||||
--- a/third_party/protobuf/src/google/protobuf/repeated_field.h
|
||||
+++ b/third_party/protobuf/src/google/protobuf/repeated_field.h
|
||||
@@ -804,7 +804,7 @@ class StringTypeHandler {
|
||||
// RepeatedPtrField is like RepeatedField, but used for repeated strings or
|
||||
// Messages.
|
||||
template <typename Element>
|
||||
-class RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
|
||||
+class PROTOBUF_EXPORT RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
|
||||
public:
|
||||
RepeatedPtrField();
|
||||
explicit RepeatedPtrField(Arena* arena);
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,68 @@
|
||||
diff -up chromium-77.0.3865.75/base/task/promise/dependent_list.h.base-gcc-no-alignas chromium-77.0.3865.75/base/task/promise/dependent_list.h
|
||||
--- chromium-77.0.3865.75/base/task/promise/dependent_list.h.base-gcc-no-alignas 2019-09-13 21:45:51.873172347 +0200
|
||||
+++ chromium-77.0.3865.75/base/task/promise/dependent_list.h 2019-09-13 21:46:21.661522514 +0200
|
||||
@@ -59,7 +59,7 @@ class BASE_EXPORT DependentList {
|
||||
|
||||
// Align Node on an 8-byte boundary to ensure the first 3 bits are 0 and can
|
||||
// be used to store additional state (see static_asserts below).
|
||||
- class BASE_EXPORT alignas(8) Node {
|
||||
+ class BASE_EXPORT ALIGNAS(8) Node {
|
||||
public:
|
||||
Node();
|
||||
explicit Node(Node&& other) noexcept;
|
||||
--- a/third_party/protobuf/src/google/protobuf/arena.h
|
||||
+++ b/third_party/protobuf/src/google/protobuf/arena.h
|
||||
@@ -245,7 +245,7 @@ struct ArenaOptions {
|
||||
// well as protobuf container types like RepeatedPtrField and Map. The protocol
|
||||
// is internal to protobuf and is not guaranteed to be stable. Non-proto types
|
||||
// should not rely on this protocol.
|
||||
-class PROTOBUF_EXPORT alignas(8) Arena final {
|
||||
+class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final {
|
||||
public:
|
||||
// Arena constructor taking custom options. See ArenaOptions below for
|
||||
// descriptions of the options available.
|
||||
--- a/third_party/protobuf/src/google/protobuf/port_def.inc
|
||||
+++ b/third_party/protobuf/src/google/protobuf/port_def.inc
|
||||
@@ -528,6 +528,35 @@ PROTOBUF_EXPORT_TEMPLATE_TEST(DEFAULT, __declspec(dllimport));
|
||||
#undef IN
|
||||
#endif // _MSC_VER
|
||||
|
||||
+// Specify memory alignment for structs, classes, etc.
|
||||
+// Use like:
|
||||
+// class PROTOBUF_ALIGNAS(16) MyClass { ... }
|
||||
+// PROTOBUF_ALIGNAS(16) int array[4];
|
||||
+//
|
||||
+// In most places you can use the C++11 keyword "alignas", which is preferred.
|
||||
+//
|
||||
+// But compilers have trouble mixing __attribute__((...)) syntax with
|
||||
+// alignas(...) syntax.
|
||||
+//
|
||||
+// Doesn't work in clang or gcc:
|
||||
+// struct alignas(16) __attribute__((packed)) S { char c; };
|
||||
+// Works in clang but not gcc:
|
||||
+// struct __attribute__((packed)) alignas(16) S2 { char c; };
|
||||
+// Works in clang and gcc:
|
||||
+// struct alignas(16) S3 { char c; } __attribute__((packed));
|
||||
+//
|
||||
+// There are also some attributes that must be specified *before* a class
|
||||
+// definition: visibility (used for exporting functions/classes) is one of
|
||||
+// these attributes. This means that it is not possible to use alignas() with a
|
||||
+// class that is marked as exported.
|
||||
+#if defined(_MSC_VER)
|
||||
+#define PROTOBUF_ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
|
||||
+#elif defined(__GNUC__)
|
||||
+#define PROTOBUF_ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
|
||||
+#else
|
||||
+#define PROTOBUF_ALIGNAS(byte_alignment) alignas(byte_alignment)
|
||||
+#endif
|
||||
+
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
// TODO(gerbens) ideally we cleanup the code. But a cursory try shows many
|
||||
--- a/third_party/protobuf/src/google/protobuf/port_undef.inc
|
||||
+++ b/third_party/protobuf/src/google/protobuf/port_undef.inc
|
||||
@@ -80,6 +80,7 @@
|
||||
#undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_foj3FJo5StF0OvIzl7oMxA__declspec
|
||||
#undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_DECLSPEC_dllexport
|
||||
#undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_DECLSPEC_dllimport
|
||||
+#undef PROTOBUF_ALIGNAS
|
||||
@ -0,0 +1,49 @@
|
||||
diff -up chromium-78.0.3904.70/net/dns/dns_util.cc.gcc-DohUpgradeEntry-nonconst chromium-78.0.3904.70/net/dns/dns_util.cc
|
||||
--- chromium-78.0.3904.70/net/dns/dns_util.cc.gcc-DohUpgradeEntry-nonconst 2019-10-21 15:06:38.000000000 -0400
|
||||
+++ chromium-78.0.3904.70/net/dns/dns_util.cc 2019-10-23 12:55:27.886546918 -0400
|
||||
@@ -139,12 +139,12 @@ struct DohUpgradeEntry {
|
||||
const DnsConfig::DnsOverHttpsServerConfig dns_over_https_config;
|
||||
};
|
||||
|
||||
-const std::vector<const DohUpgradeEntry>& GetDohUpgradeList() {
|
||||
+const std::vector<DohUpgradeEntry>& GetDohUpgradeList() {
|
||||
// The provider names in these entries should be kept in sync with the
|
||||
// DohProviderId histogram suffix list in
|
||||
// tools/metrics/histograms/histograms.xml.
|
||||
- static const base::NoDestructor<std::vector<const DohUpgradeEntry>>
|
||||
- upgradable_servers({
|
||||
+ static const base::NoDestructor<std::vector<DohUpgradeEntry>>
|
||||
+ upgradable_servers(std::initializer_list<DohUpgradeEntry>{
|
||||
DohUpgradeEntry(
|
||||
"CleanBrowsingAdult",
|
||||
{"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1",
|
||||
@@ -222,8 +222,7 @@ const std::vector<const DohUpgradeEntry>
|
||||
std::vector<const DohUpgradeEntry*> GetDohUpgradeEntriesFromNameservers(
|
||||
const std::vector<IPEndPoint>& dns_servers,
|
||||
const std::vector<std::string>& excluded_providers) {
|
||||
- const std::vector<const DohUpgradeEntry>& upgradable_servers =
|
||||
- GetDohUpgradeList();
|
||||
+ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList();
|
||||
std::vector<const DohUpgradeEntry*> entries;
|
||||
|
||||
for (const auto& server : dns_servers) {
|
||||
@@ -417,8 +416,7 @@ std::vector<DnsConfig::DnsOverHttpsServe
|
||||
GetDohUpgradeServersFromDotHostname(
|
||||
const std::string& dot_server,
|
||||
const std::vector<std::string>& excluded_providers) {
|
||||
- const std::vector<const DohUpgradeEntry>& upgradable_servers =
|
||||
- GetDohUpgradeList();
|
||||
+ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList();
|
||||
std::vector<DnsConfig::DnsOverHttpsServerConfig> doh_servers;
|
||||
|
||||
if (dot_server.empty())
|
||||
@@ -451,8 +449,7 @@ GetDohUpgradeServersFromNameservers(
|
||||
|
||||
std::string GetDohProviderIdForHistogramFromDohConfig(
|
||||
const DnsConfig::DnsOverHttpsServerConfig& doh_server) {
|
||||
- const std::vector<const DohUpgradeEntry>& upgradable_servers =
|
||||
- GetDohUpgradeList();
|
||||
+ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList();
|
||||
for (const auto& upgrade_entry : upgradable_servers) {
|
||||
if (doh_server.server_template ==
|
||||
upgrade_entry.dns_over_https_config.server_template) {
|
||||
@ -0,0 +1,16 @@
|
||||
diff -up chromium-78.0.3904.70/base/allocator/debugallocation_shim.cc.invalid-pragma chromium-78.0.3904.70/base/allocator/debugallocation_shim.cc
|
||||
--- chromium-78.0.3904.70/base/allocator/debugallocation_shim.cc.invalid-pragma 2019-10-23 10:00:41.361932768 -0400
|
||||
+++ chromium-78.0.3904.70/base/allocator/debugallocation_shim.cc 2019-10-23 10:02:09.778100948 -0400
|
||||
@@ -7,9 +7,10 @@
|
||||
// AFDO can mess with them. Better not to use AFDO there. This is a
|
||||
// temporary hack. We will add a mechanism in the build system to
|
||||
// avoid using -fauto-profile for tcmalloc files.
|
||||
-#if !defined(__clang__) && (defined(OS_CHROMEOS) || __GNUC__ > 5)
|
||||
+#if !defined(__clang__) && \
|
||||
+ (defined(OS_CHROMEOS) || (__GNUC__ > 5 && __GNUC__ < 7))
|
||||
// Note that this option only seems to be available in the chromeos GCC 4.9
|
||||
-// toolchain, and stock GCC 5 and up.
|
||||
+// toolchain, and stock GCC 5 upto 7.
|
||||
#pragma GCC optimize ("no-auto-profile")
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-78.0.3904.70/base/logging.h.constexpr chromium-78.0.3904.70/base/logging.h
|
||||
--- chromium-78.0.3904.70/base/logging.h.constexpr 2019-10-23 10:06:53.434313793 -0400
|
||||
+++ chromium-78.0.3904.70/base/logging.h 2019-10-23 10:07:17.490853038 -0400
|
||||
@@ -530,7 +530,7 @@ BASE_EXPORT extern std::ostream* g_swall
|
||||
class CheckOpResult {
|
||||
public:
|
||||
// |message| must be non-null if and only if the check failed.
|
||||
- CheckOpResult(std::string* message) : message_(message) {}
|
||||
+ constexpr CheckOpResult(std::string* message) : message_(message) {}
|
||||
// Returns true if the check succeeded.
|
||||
operator bool() const { return !message_; }
|
||||
// Returns the message.
|
||||
@ -0,0 +1,20 @@
|
||||
diff -up chromium-78.0.3904.70/base/containers/intrusive_heap.h.gcc-sizet chromium-78.0.3904.70/base/containers/intrusive_heap.h
|
||||
--- chromium-78.0.3904.70/base/containers/intrusive_heap.h.gcc-sizet 2019-10-23 11:02:56.767907986 -0400
|
||||
+++ chromium-78.0.3904.70/base/containers/intrusive_heap.h 2019-10-23 11:04:58.317351636 -0400
|
||||
@@ -131,6 +131,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
+#include <limits>
|
||||
#include <type_traits>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
@@ -149,7 +150,7 @@ namespace base {
|
||||
// in place.
|
||||
class BASE_EXPORT HeapHandle {
|
||||
public:
|
||||
- enum : size_t { kInvalidIndex = -1 };
|
||||
+ enum : size_t { kInvalidIndex = std::numeric_limits<size_t>::max() };
|
||||
|
||||
constexpr HeapHandle() = default;
|
||||
constexpr HeapHandle(const HeapHandle& other) = default;
|
||||
@ -0,0 +1,24 @@
|
||||
diff -up chromium-78.0.3904.70/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.gcc9 chromium-78.0.3904.70/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
|
||||
--- chromium-78.0.3904.70/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.gcc9 2019-10-23 08:58:16.153251961 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2019-10-23 08:58:36.896862347 -0400
|
||||
@@ -1486,7 +1486,7 @@ struct kernel_stat {
|
||||
"d"(LSS_SYSCALL_ARG(parent_tidptr)),
|
||||
"r"(LSS_SYSCALL_ARG(newtls)),
|
||||
"r"(LSS_SYSCALL_ARG(child_tidptr))
|
||||
- : "rsp", "memory", "r8", "r10", "r11", "rcx");
|
||||
+ : "memory", "r8", "r10", "r11", "rcx");
|
||||
}
|
||||
LSS_RETURN(int, __res);
|
||||
}
|
||||
diff -up chromium-78.0.3904.70/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h.gcc9 chromium-78.0.3904.70/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h
|
||||
--- chromium-78.0.3904.70/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h.gcc9 2019-10-23 08:58:59.623435488 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h 2019-10-23 08:59:16.113125772 -0400
|
||||
@@ -1485,7 +1485,7 @@ struct kernel_stat {
|
||||
"d"(LSS_SYSCALL_ARG(parent_tidptr)),
|
||||
"r"(LSS_SYSCALL_ARG(newtls)),
|
||||
"r"(LSS_SYSCALL_ARG(child_tidptr))
|
||||
- : "rsp", "memory", "r8", "r10", "r11", "rcx");
|
||||
+ : "memory", "r8", "r10", "r11", "rcx");
|
||||
}
|
||||
LSS_RETURN(int, __res);
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-78.0.3904.70/third_party/perfetto/gn/BUILD.gn.unbundle-zlib chromium-78.0.3904.70/third_party/perfetto/gn/BUILD.gn
|
||||
--- chromium-78.0.3904.70/third_party/perfetto/gn/BUILD.gn.unbundle-zlib 2019-10-23 09:25:44.419884187 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/perfetto/gn/BUILD.gn 2019-10-23 09:29:53.553442745 -0400
|
||||
@@ -276,7 +276,7 @@ if (enable_perfetto_trace_processor || e
|
||||
"//buildtools:zlib",
|
||||
]
|
||||
} else {
|
||||
- public_configs = [ "//third_party/zlib:zlib_config" ]
|
||||
+ public_configs = [ "//third_party/zlib:system_zlib" ]
|
||||
public_deps = [
|
||||
"//third_party/zlib",
|
||||
]
|
||||
@ -0,0 +1,302 @@
|
||||
diff -up chromium-78.0.3904.70/third_party/blink/renderer/bindings/core/v8/v8_embedder_graph_builder.cc.v8-tracedreference-fix chromium-78.0.3904.70/third_party/blink/renderer/bindings/core/v8/v8_embedder_graph_builder.cc
|
||||
--- chromium-78.0.3904.70/third_party/blink/renderer/bindings/core/v8/v8_embedder_graph_builder.cc.v8-tracedreference-fix 2019-10-21 15:06:42.000000000 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/blink/renderer/bindings/core/v8/v8_embedder_graph_builder.cc 2019-10-23 14:30:25.679541652 -0400
|
||||
@@ -173,8 +173,9 @@ class GC_PLUGIN_IGNORE(
|
||||
uint16_t class_id) override;
|
||||
|
||||
// v8::EmbedderHeapTracer::TracedGlobalHandleVisitor override.
|
||||
- void VisitTracedGlobalHandle(
|
||||
- const v8::TracedGlobal<v8::Value>& value) override;
|
||||
+ void VisitTracedReference(
|
||||
+ const v8::TracedReference<v8::Value>& value) override;
|
||||
+ void VisitTracedGlobalHandle(const v8::TracedGlobal<v8::Value>&) override;
|
||||
|
||||
// Visitor overrides.
|
||||
void VisitRoot(void*, TraceDescriptor, const base::Location&) final;
|
||||
@@ -508,8 +509,8 @@ void V8EmbedderGraphBuilder::VisitPersis
|
||||
}
|
||||
}
|
||||
|
||||
-void V8EmbedderGraphBuilder::VisitTracedGlobalHandle(
|
||||
- const v8::TracedGlobal<v8::Value>& value) {
|
||||
+void V8EmbedderGraphBuilder::VisitTracedReference(
|
||||
+ const v8::TracedReference<v8::Value>& value) {
|
||||
const uint16_t class_id = value.WrapperClassId();
|
||||
if (class_id != WrapperTypeInfo::kNodeClassId &&
|
||||
class_id != WrapperTypeInfo::kObjectClassId)
|
||||
@@ -517,6 +518,11 @@ void V8EmbedderGraphBuilder::VisitTraced
|
||||
VisitPersistentHandleInternal(value.As<v8::Object>().Get(isolate_), class_id);
|
||||
}
|
||||
|
||||
+void V8EmbedderGraphBuilder::VisitTracedGlobalHandle(
|
||||
+ const v8::TracedGlobal<v8::Value>&) {
|
||||
+ CHECK(false) << "Blink does not use v8::TracedGlobal.";
|
||||
+}
|
||||
+
|
||||
void V8EmbedderGraphBuilder::VisitPersistentHandle(
|
||||
v8::Persistent<v8::Value>* value,
|
||||
uint16_t class_id) {
|
||||
diff -up chromium-78.0.3904.70/third_party/blink/renderer/bindings/core/v8/v8_gc_controller.cc.v8-tracedreference-fix chromium-78.0.3904.70/third_party/blink/renderer/bindings/core/v8/v8_gc_controller.cc
|
||||
--- chromium-78.0.3904.70/third_party/blink/renderer/bindings/core/v8/v8_gc_controller.cc.v8-tracedreference-fix 2019-10-21 15:06:42.000000000 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/blink/renderer/bindings/core/v8/v8_gc_controller.cc 2019-10-23 14:30:25.683541568 -0400
|
||||
@@ -260,7 +260,11 @@ class DOMWrapperForwardingVisitor final
|
||||
VisitHandle(value, class_id);
|
||||
}
|
||||
|
||||
- void VisitTracedGlobalHandle(const v8::TracedGlobal<v8::Value>& value) final {
|
||||
+ void VisitTracedGlobalHandle(const v8::TracedGlobal<v8::Value>&) final {
|
||||
+ CHECK(false) << "Blink does not use v8::TracedGlobal.";
|
||||
+ }
|
||||
+
|
||||
+ void VisitTracedReference(const v8::TracedReference<v8::Value>& value) final {
|
||||
VisitHandle(&value, value.WrapperClassId());
|
||||
}
|
||||
|
||||
diff -up chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/dom_data_store.h.v8-tracedreference-fix chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/dom_data_store.h
|
||||
--- chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/dom_data_store.h.v8-tracedreference-fix 2019-10-21 15:06:44.000000000 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/dom_data_store.h 2019-10-23 14:30:25.685541526 -0400
|
||||
@@ -229,6 +229,11 @@ class DOMDataStore {
|
||||
DOMWorldWrapperReference(v8::Isolate* isolate, v8::Local<v8::Object> handle)
|
||||
: TraceWrapperV8Reference(isolate, handle) {}
|
||||
|
||||
+ ~DOMWorldWrapperReference() {
|
||||
+ // Destruction of a reference should clear it immediately.
|
||||
+ Clear();
|
||||
+ }
|
||||
+
|
||||
// Move support without write barrier.
|
||||
DOMWorldWrapperReference(DOMWorldWrapperReference&& other)
|
||||
: TraceWrapperV8Reference() {
|
||||
diff -up chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/script_wrappable.h.v8-tracedreference-fix chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/script_wrappable.h
|
||||
--- chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/script_wrappable.h.v8-tracedreference-fix 2019-10-21 15:06:44.000000000 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/script_wrappable.h 2019-10-23 14:30:25.687541484 -0400
|
||||
@@ -161,6 +161,11 @@ class PLATFORM_EXPORT ScriptWrappable
|
||||
return main_world_wrapper_.NewLocal(isolate);
|
||||
}
|
||||
|
||||
+ static_assert(
|
||||
+ std::is_trivially_destructible<
|
||||
+ TraceWrapperV8Reference<v8::Object>>::value,
|
||||
+ "TraceWrapperV8Reference<v8::Object> should be trivially destructible.");
|
||||
+
|
||||
TraceWrapperV8Reference<v8::Object> main_world_wrapper_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(ScriptWrappable);
|
||||
diff -up chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/trace_wrapper_v8_reference.h.v8-tracedreference-fix chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/trace_wrapper_v8_reference.h
|
||||
--- chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/trace_wrapper_v8_reference.h.v8-tracedreference-fix 2019-10-21 15:06:44.000000000 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/trace_wrapper_v8_reference.h 2019-10-23 14:30:25.688541463 -0400
|
||||
@@ -11,15 +11,6 @@
|
||||
#include "third_party/blink/renderer/platform/heap/unified_heap_marking_visitor.h"
|
||||
#include "v8/include/v8.h"
|
||||
|
||||
-namespace v8 {
|
||||
-
|
||||
-template <typename T>
|
||||
-struct TracedGlobalTrait<v8::TracedGlobal<T>> {
|
||||
- static constexpr bool kRequiresExplicitDestruction = false;
|
||||
-};
|
||||
-
|
||||
-} // namespace v8
|
||||
-
|
||||
namespace blink {
|
||||
|
||||
/**
|
||||
@@ -50,8 +41,8 @@ class TraceWrapperV8Reference {
|
||||
|
||||
bool IsEmpty() const { return handle_.IsEmpty(); }
|
||||
void Clear() { handle_.Reset(); }
|
||||
- ALWAYS_INLINE const v8::TracedGlobal<T>& Get() const { return handle_; }
|
||||
- ALWAYS_INLINE v8::TracedGlobal<T>& Get() { return handle_; }
|
||||
+ ALWAYS_INLINE const v8::TracedReference<T>& Get() const { return handle_; }
|
||||
+ ALWAYS_INLINE v8::TracedReference<T>& Get() { return handle_; }
|
||||
|
||||
template <typename S>
|
||||
const TraceWrapperV8Reference<S>& Cast() const {
|
||||
@@ -124,7 +115,7 @@ class TraceWrapperV8Reference {
|
||||
UnifiedHeapMarkingVisitor::WriteBarrier(UnsafeCast<v8::Value>());
|
||||
}
|
||||
|
||||
- v8::TracedGlobal<T> handle_;
|
||||
+ v8::TracedReference<T> handle_;
|
||||
};
|
||||
|
||||
} // namespace blink
|
||||
diff -up chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/wrapper_type_info.h.v8-tracedreference-fix chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/wrapper_type_info.h
|
||||
--- chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/wrapper_type_info.h.v8-tracedreference-fix 2019-10-21 15:06:44.000000000 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/blink/renderer/platform/bindings/wrapper_type_info.h 2019-10-23 14:30:25.689541442 -0400
|
||||
@@ -122,7 +122,7 @@ struct WrapperTypeInfo {
|
||||
wrapper->SetWrapperClassId(wrapper_class_id);
|
||||
}
|
||||
|
||||
- void ConfigureWrapper(v8::TracedGlobal<v8::Object>* wrapper) const {
|
||||
+ void ConfigureWrapper(v8::TracedReference<v8::Object>* wrapper) const {
|
||||
wrapper->SetWrapperClassId(wrapper_class_id);
|
||||
}
|
||||
|
||||
@@ -177,7 +177,7 @@ inline T* GetInternalField(const v8::Per
|
||||
}
|
||||
|
||||
template <typename T, int offset>
|
||||
-inline T* GetInternalField(const v8::TracedGlobal<v8::Object>& global) {
|
||||
+inline T* GetInternalField(const v8::TracedReference<v8::Object>& global) {
|
||||
DCHECK_LT(offset, v8::Object::InternalFieldCount(global));
|
||||
return reinterpret_cast<T*>(
|
||||
v8::Object::GetAlignedPointerFromInternalField(global, offset));
|
||||
@@ -198,7 +198,7 @@ inline ScriptWrappable* ToScriptWrappabl
|
||||
}
|
||||
|
||||
inline ScriptWrappable* ToScriptWrappable(
|
||||
- const v8::TracedGlobal<v8::Object>& wrapper) {
|
||||
+ const v8::TracedReference<v8::Object>& wrapper) {
|
||||
return GetInternalField<ScriptWrappable, kV8DOMWrapperObjectIndex>(wrapper);
|
||||
}
|
||||
|
||||
@@ -219,7 +219,8 @@ inline void* ToUntypedWrappable(const v8
|
||||
return GetInternalField<void, kV8DOMWrapperObjectIndex>(wrapper);
|
||||
}
|
||||
|
||||
-inline void* ToUntypedWrappable(const v8::TracedGlobal<v8::Object>& wrapper) {
|
||||
+inline void* ToUntypedWrappable(
|
||||
+ const v8::TracedReference<v8::Object>& wrapper) {
|
||||
return GetInternalField<void, kV8DOMWrapperObjectIndex>(wrapper);
|
||||
}
|
||||
|
||||
@@ -233,7 +234,7 @@ inline const WrapperTypeInfo* ToWrapperT
|
||||
}
|
||||
|
||||
inline const WrapperTypeInfo* ToWrapperTypeInfo(
|
||||
- const v8::TracedGlobal<v8::Object>& wrapper) {
|
||||
+ const v8::TracedReference<v8::Object>& wrapper) {
|
||||
return GetInternalField<WrapperTypeInfo, kV8DOMWrapperTypeIndex>(wrapper);
|
||||
}
|
||||
|
||||
diff -up chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/thread_state.cc.v8-tracedreference-fix chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/thread_state.cc
|
||||
--- chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/thread_state.cc.v8-tracedreference-fix 2019-10-21 15:06:45.000000000 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/thread_state.cc 2019-10-23 14:30:25.693541359 -0400
|
||||
@@ -1451,11 +1451,15 @@ class ClearReferencesInDeadObjectsVisito
|
||||
value->Reset();
|
||||
}
|
||||
|
||||
- void VisitTracedGlobalHandle(const v8::TracedGlobal<v8::Value>& value) final {
|
||||
+ void VisitTracedGlobalHandle(const v8::TracedGlobal<v8::Value>&) final {
|
||||
+ CHECK(false) << "Blink does not use v8::TracedGlobal.";
|
||||
+ }
|
||||
+
|
||||
+ void VisitTracedReference(const v8::TracedReference<v8::Value>& value) final {
|
||||
// TODO(mlippautz): Avoid const_cast after changing the API to allow
|
||||
- // modificaton of the TracedGlobal handle.
|
||||
- if (InDeadObject(&const_cast<v8::TracedGlobal<v8::Value>&>(value)))
|
||||
- const_cast<v8::TracedGlobal<v8::Value>&>(value).Reset();
|
||||
+ // modificaton of the handle.
|
||||
+ if (InDeadObject(&const_cast<v8::TracedReference<v8::Value>&>(value)))
|
||||
+ const_cast<v8::TracedReference<v8::Value>&>(value).Reset();
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -1584,11 +1588,15 @@ class UnpoisonHandlesVisitor final
|
||||
VisitSlot(value, sizeof(v8::Persistent<v8::Value>));
|
||||
}
|
||||
|
||||
- void VisitTracedGlobalHandle(const v8::TracedGlobal<v8::Value>& value) final {
|
||||
+ void VisitTracedGlobalHandle(const v8::TracedGlobal<v8::Value>&) final {
|
||||
+ CHECK(false) << "Blink does not use v8::TracedGlobal.";
|
||||
+ }
|
||||
+
|
||||
+ void VisitTracedReference(const v8::TracedReference<v8::Value>& value) final {
|
||||
// TODO(mlippautz): Avoid const_cast after changing the API to allow
|
||||
- // modificaton of the TracedGlobal handle.
|
||||
- VisitSlot(&const_cast<v8::TracedGlobal<v8::Value>&>(value),
|
||||
- sizeof(v8::TracedGlobal<v8::Value>));
|
||||
+ // modificaton of the handle.
|
||||
+ VisitSlot(&const_cast<v8::TracedReference<v8::Value>&>(value),
|
||||
+ sizeof(v8::TracedReference<v8::Value>));
|
||||
}
|
||||
|
||||
private:
|
||||
diff -up chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/unified_heap_controller.cc.v8-tracedreference-fix chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/unified_heap_controller.cc
|
||||
--- chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/unified_heap_controller.cc.v8-tracedreference-fix 2019-10-21 15:06:45.000000000 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/unified_heap_controller.cc 2019-10-23 14:32:34.722840885 -0400
|
||||
@@ -147,16 +147,19 @@ bool UnifiedHeapController::IsTracingDon
|
||||
return is_tracing_done_;
|
||||
}
|
||||
|
||||
-bool UnifiedHeapController::IsRootForNonTracingGCInternal(
|
||||
- const v8::TracedGlobal<v8::Value>& handle) {
|
||||
+namespace {
|
||||
+
|
||||
+bool IsRootForNonTracingGCInternal(
|
||||
+ const v8::TracedReference<v8::Value>& handle) {
|
||||
const uint16_t class_id = handle.WrapperClassId();
|
||||
- // Stand-alone TracedGlobal reference or kCustomWrappableId. Keep as root as
|
||||
+ // Stand-alone reference or kCustomWrappableId. Keep as root as
|
||||
// we don't know better.
|
||||
if (class_id != WrapperTypeInfo::kNodeClassId &&
|
||||
class_id != WrapperTypeInfo::kObjectClassId)
|
||||
return true;
|
||||
|
||||
- const v8::TracedGlobal<v8::Object>& traced = handle.As<v8::Object>();
|
||||
+ const v8::TracedReference<v8::Object>& traced =
|
||||
+ handle.template As<v8::Object>();
|
||||
if (ToWrapperTypeInfo(traced)->IsActiveScriptWrappable() &&
|
||||
ToScriptWrappable(traced)->HasPendingActivity()) {
|
||||
return true;
|
||||
@@ -169,8 +172,10 @@ bool UnifiedHeapController::IsRootForNon
|
||||
return false;
|
||||
}
|
||||
|
||||
+} // namespace
|
||||
+
|
||||
void UnifiedHeapController::ResetHandleInNonTracingGC(
|
||||
- const v8::TracedGlobal<v8::Value>& handle) {
|
||||
+ const v8::TracedReference<v8::Value>& handle) {
|
||||
const uint16_t class_id = handle.WrapperClassId();
|
||||
// Only consider handles that have not been treated as roots, see
|
||||
// IsRootForNonTracingGCInternal.
|
||||
@@ -178,15 +183,21 @@ void UnifiedHeapController::ResetHandleI
|
||||
class_id != WrapperTypeInfo::kObjectClassId)
|
||||
return;
|
||||
|
||||
- const v8::TracedGlobal<v8::Object>& traced = handle.As<v8::Object>();
|
||||
+ const v8::TracedReference<v8::Object>& traced = handle.As<v8::Object>();
|
||||
ToScriptWrappable(traced)->UnsetWrapperIfAny();
|
||||
}
|
||||
|
||||
bool UnifiedHeapController::IsRootForNonTracingGC(
|
||||
- const v8::TracedGlobal<v8::Value>& handle) {
|
||||
+ const v8::TracedReference<v8::Value>& handle) {
|
||||
return IsRootForNonTracingGCInternal(handle);
|
||||
}
|
||||
|
||||
+bool UnifiedHeapController::IsRootForNonTracingGC(
|
||||
+ const v8::TracedGlobal<v8::Value>& handle) {
|
||||
+ CHECK(false) << "Blink does not use v8::TracedGlobal.";
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
void UnifiedHeapController::ReportBufferedAllocatedSizeIfPossible() {
|
||||
DCHECK(base::FeatureList::IsEnabled(
|
||||
blink::features::kBlinkHeapUnifiedGCScheduling));
|
||||
diff -up chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/unified_heap_controller.h.v8-tracedreference-fix chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/unified_heap_controller.h
|
||||
--- chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/unified_heap_controller.h.v8-tracedreference-fix 2019-10-21 15:06:45.000000000 -0400
|
||||
+++ chromium-78.0.3904.70/third_party/blink/renderer/platform/heap/unified_heap_controller.h 2019-10-23 14:30:25.695541317 -0400
|
||||
@@ -45,8 +45,9 @@ class PLATFORM_EXPORT UnifiedHeapControl
|
||||
void RegisterV8References(const std::vector<std::pair<void*, void*>>&) final;
|
||||
bool AdvanceTracing(double) final;
|
||||
bool IsTracingDone() final;
|
||||
+ bool IsRootForNonTracingGC(const v8::TracedReference<v8::Value>&) final;
|
||||
bool IsRootForNonTracingGC(const v8::TracedGlobal<v8::Value>&) final;
|
||||
- void ResetHandleInNonTracingGC(const v8::TracedGlobal<v8::Value>&) final;
|
||||
+ void ResetHandleInNonTracingGC(const v8::TracedReference<v8::Value>&) final;
|
||||
|
||||
ThreadState* thread_state() const { return thread_state_; }
|
||||
|
||||
@@ -59,9 +60,6 @@ class PLATFORM_EXPORT UnifiedHeapControl
|
||||
void DecreaseAllocatedSpace(size_t) final {}
|
||||
|
||||
private:
|
||||
- static bool IsRootForNonTracingGCInternal(
|
||||
- const v8::TracedGlobal<v8::Value>& handle);
|
||||
-
|
||||
void ReportBufferedAllocatedSizeIfPossible();
|
||||
|
||||
ThreadState* const thread_state_;
|
||||
@ -0,0 +1,11 @@
|
||||
diff -up chromium-78.0.3904.70/net/quic/platform/impl/quic_default_proof_providers_impl.cc.vtable-symbol-undefined chromium-78.0.3904.70/net/quic/platform/impl/quic_default_proof_providers_impl.cc
|
||||
--- chromium-78.0.3904.70/net/quic/platform/impl/quic_default_proof_providers_impl.cc.vtable-symbol-undefined 2019-10-23 09:12:08.754351798 -0400
|
||||
+++ chromium-78.0.3904.70/net/quic/platform/impl/quic_default_proof_providers_impl.cc 2019-10-23 09:19:28.278431430 -0400
|
||||
@@ -18,6 +18,7 @@
|
||||
#include "net/quic/crypto/proof_verifier_chromium.h"
|
||||
#include "net/third_party/quiche/src/quic/platform/api/quic_flags.h"
|
||||
#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h"
|
||||
+#include "net/quic/platform/impl/quic_flags_impl.cc"
|
||||
|
||||
DEFINE_QUIC_COMMAND_LINE_FLAG(
|
||||
bool,
|
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,2 @@
|
||||
[koji]
|
||||
targets = epel8 epel8-playground
|
||||
@ -0,0 +1,796 @@
|
||||
diff -up chromium-78.0.3904.70/v8/include/v8.h.implement-tracedreference chromium-78.0.3904.70/v8/include/v8.h
|
||||
--- chromium-78.0.3904.70/v8/include/v8.h.implement-tracedreference 2019-10-24 08:58:26.185640117 -0400
|
||||
+++ chromium-78.0.3904.70/v8/include/v8.h 2019-10-24 09:18:33.719546481 -0400
|
||||
@@ -96,6 +96,10 @@ template <class T>
|
||||
class Global;
|
||||
template <class T>
|
||||
class TracedGlobal;
|
||||
+template <class T>
|
||||
+class TracedReference;
|
||||
+template <class T>
|
||||
+class TracedReferenceBase;
|
||||
template<class K, class V, class T> class PersistentValueMap;
|
||||
template <class K, class V, class T>
|
||||
class PersistentValueMapBase;
|
||||
@@ -281,7 +285,8 @@ class Local {
|
||||
V8_INLINE static Local<T> New(Isolate* isolate, Local<T> that);
|
||||
V8_INLINE static Local<T> New(Isolate* isolate,
|
||||
const PersistentBase<T>& that);
|
||||
- V8_INLINE static Local<T> New(Isolate* isolate, const TracedGlobal<T>& that);
|
||||
+ V8_INLINE static Local<T> New(Isolate* isolate,
|
||||
+ const TracedReferenceBase<T>& that);
|
||||
|
||||
private:
|
||||
friend class Utils;
|
||||
@@ -311,7 +316,13 @@ class Local {
|
||||
template <class F>
|
||||
friend class ReturnValue;
|
||||
template <class F>
|
||||
+ friend class Traced;
|
||||
+ template <class F>
|
||||
friend class TracedGlobal;
|
||||
+ template <class F>
|
||||
+ friend class TracedReferenceBase;
|
||||
+ template <class F>
|
||||
+ friend class TracedReference;
|
||||
|
||||
explicit V8_INLINE Local(T* that) : val_(that) {}
|
||||
V8_INLINE static Local<T> New(Isolate* isolate, T* that);
|
||||
@@ -792,22 +803,10 @@ template <class T>
|
||||
using UniquePersistent = Global<T>;
|
||||
|
||||
/**
|
||||
- * Trait specifying behavior of |TracedGlobal<T>|.
|
||||
+ * Deprecated. Use |TracedReference<T>| instead.
|
||||
*/
|
||||
template <typename T>
|
||||
-struct TracedGlobalTrait {
|
||||
- /**
|
||||
- * Specifies whether |TracedGlobal<T>| should clear its handle on destruction.
|
||||
- *
|
||||
- * V8 will *not* clear the embedder-side memory of the handle. The embedder is
|
||||
- * expected to report all |TracedGlobal<T>| handles through
|
||||
- * |EmbedderHeapTracer| upon garabge collection.
|
||||
- *
|
||||
- * See |EmbedderHeapTracer::IsRootForNonTracingGC| for handling with
|
||||
- * non-tracing GCs in V8.
|
||||
- */
|
||||
- static constexpr bool kRequiresExplicitDestruction = true;
|
||||
-};
|
||||
+struct TracedGlobalTrait {};
|
||||
|
||||
/**
|
||||
* A traced handle with copy and move semantics. The handle is to be used
|
||||
@@ -820,15 +819,131 @@ struct TracedGlobalTrait {
|
||||
* |v8::EmbedderHeapTracer::IsRootForNonTracingGC()| whether the handle should
|
||||
* be treated as root or not.
|
||||
*
|
||||
- * For destruction semantics see |TracedGlobalTrait<T>|.
|
||||
+ * Note that the base class cannot be instantiated itself. Choose from
|
||||
+ * - TracedGlobal
|
||||
+ * - TracedReference
|
||||
*/
|
||||
template <typename T>
|
||||
-class TracedGlobal {
|
||||
+class TracedReferenceBase {
|
||||
public:
|
||||
/**
|
||||
+ * Returns true if this TracedReferenceBase is empty, i.e., has not been
|
||||
+ * assigned an object.
|
||||
+ */
|
||||
+ bool IsEmpty() const { return val_ == nullptr; }
|
||||
+
|
||||
+ /**
|
||||
+ * If non-empty, destroy the underlying storage cell. |IsEmpty| will return
|
||||
+ * true after this call.
|
||||
+ */
|
||||
+ V8_INLINE void Reset();
|
||||
+
|
||||
+ /**
|
||||
+ * Construct a Local<T> from this handle.
|
||||
+ */
|
||||
+ Local<T> Get(Isolate* isolate) const { return Local<T>::New(isolate, *this); }
|
||||
+
|
||||
+ template <class S>
|
||||
+ V8_INLINE bool operator==(const TracedReferenceBase<S>& that) const {
|
||||
+ internal::Address* a = reinterpret_cast<internal::Address*>(val_);
|
||||
+ internal::Address* b = reinterpret_cast<internal::Address*>(that.val_);
|
||||
+ if (a == nullptr) return b == nullptr;
|
||||
+ if (b == nullptr) return false;
|
||||
+ return *a == *b;
|
||||
+ }
|
||||
+
|
||||
+ template <class S>
|
||||
+ V8_INLINE bool operator==(const Local<S>& that) const {
|
||||
+ internal::Address* a = reinterpret_cast<internal::Address*>(val_);
|
||||
+ internal::Address* b = reinterpret_cast<internal::Address*>(that.val_);
|
||||
+ if (a == nullptr) return b == nullptr;
|
||||
+ if (b == nullptr) return false;
|
||||
+ return *a == *b;
|
||||
+ }
|
||||
+
|
||||
+ template <class S>
|
||||
+ V8_INLINE bool operator!=(const TracedReferenceBase<S>& that) const {
|
||||
+ return !operator==(that);
|
||||
+ }
|
||||
+
|
||||
+ template <class S>
|
||||
+ V8_INLINE bool operator!=(const Local<S>& that) const {
|
||||
+ return !operator==(that);
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Assigns a wrapper class ID to the handle.
|
||||
+ */
|
||||
+ V8_INLINE void SetWrapperClassId(uint16_t class_id);
|
||||
+
|
||||
+ /**
|
||||
+ * Returns the class ID previously assigned to this handle or 0 if no class ID
|
||||
+ * was previously assigned.
|
||||
+ */
|
||||
+ V8_INLINE uint16_t WrapperClassId() const;
|
||||
+
|
||||
+ /**
|
||||
+ * Adds a finalization callback to the handle. The type of this callback is
|
||||
+ * similar to WeakCallbackType::kInternalFields, i.e., it will pass the
|
||||
+ * parameter and the first two internal fields of the object.
|
||||
+ *
|
||||
+ * The callback is then supposed to reset the handle in the callback. No
|
||||
+ * further V8 API may be called in this callback. In case additional work
|
||||
+ * involving V8 needs to be done, a second callback can be scheduled using
|
||||
+ * WeakCallbackInfo<void>::SetSecondPassCallback.
|
||||
+ */
|
||||
+ V8_INLINE void SetFinalizationCallback(
|
||||
+ void* parameter, WeakCallbackInfo<void>::Callback callback);
|
||||
+
|
||||
+ template <class S>
|
||||
+ V8_INLINE TracedReferenceBase<S>& As() const {
|
||||
+ return reinterpret_cast<TracedReferenceBase<S>&>(
|
||||
+ const_cast<TracedReferenceBase<T>&>(*this));
|
||||
+ }
|
||||
+
|
||||
+ private:
|
||||
+ enum DestructionMode { kWithDestructor, kWithoutDestructor };
|
||||
+
|
||||
+ /**
|
||||
+ * An empty TracedReferenceBase without storage cell.
|
||||
+ */
|
||||
+ TracedReferenceBase() = default;
|
||||
+
|
||||
+ V8_INLINE static T* New(Isolate* isolate, T* that, void* slot,
|
||||
+ DestructionMode destruction_mode);
|
||||
+
|
||||
+ T* val_ = nullptr;
|
||||
+
|
||||
+ friend class EmbedderHeapTracer;
|
||||
+ template <typename F>
|
||||
+ friend class Local;
|
||||
+ friend class Object;
|
||||
+ template <typename F>
|
||||
+ friend class TracedGlobal;
|
||||
+ template <typename F>
|
||||
+ friend class TracedReference;
|
||||
+ template <typename F>
|
||||
+ friend class ReturnValue;
|
||||
+};
|
||||
+
|
||||
+/**
|
||||
+ * A traced handle with destructor that clears the handle. For more details see
|
||||
+ * TracedReferenceBase.
|
||||
+ */
|
||||
+template <typename T>
|
||||
+class TracedGlobal : public TracedReferenceBase<T> {
|
||||
+ public:
|
||||
+ using TracedReferenceBase<T>::Reset;
|
||||
+
|
||||
+ /**
|
||||
+ * Destructor resetting the handle.
|
||||
+ */
|
||||
+ ~TracedGlobal() { this->Reset(); }
|
||||
+
|
||||
+ /**
|
||||
* An empty TracedGlobal without storage cell.
|
||||
*/
|
||||
- TracedGlobal() = default;
|
||||
+ TracedGlobal() : TracedReferenceBase<T>() {}
|
||||
|
||||
/**
|
||||
* Construct a TracedGlobal from a Local.
|
||||
@@ -837,8 +952,9 @@ class TracedGlobal {
|
||||
* pointing to the same object.
|
||||
*/
|
||||
template <class S>
|
||||
- TracedGlobal(Isolate* isolate, Local<S> that)
|
||||
- : val_(New(isolate, *that, &val_)) {
|
||||
+ TracedGlobal(Isolate* isolate, Local<S> that) : TracedReferenceBase<T>() {
|
||||
+ this->val_ = this->New(isolate, that.val_, &this->val_,
|
||||
+ TracedReferenceBase<T>::kWithDestructor);
|
||||
TYPE_CHECK(T, S);
|
||||
}
|
||||
|
||||
@@ -905,121 +1021,126 @@ class TracedGlobal {
|
||||
V8_INLINE TracedGlobal& operator=(const TracedGlobal<S>& rhs);
|
||||
|
||||
/**
|
||||
- * Returns true if this TracedGlobal is empty, i.e., has not been assigned an
|
||||
- * object.
|
||||
- */
|
||||
- bool IsEmpty() const { return val_ == nullptr; }
|
||||
-
|
||||
- /**
|
||||
- * If non-empty, destroy the underlying storage cell. |IsEmpty| will return
|
||||
- * true after this call.
|
||||
- */
|
||||
- V8_INLINE void Reset();
|
||||
-
|
||||
- /**
|
||||
* If non-empty, destroy the underlying storage cell and create a new one with
|
||||
* the contents of other if other is non empty
|
||||
*/
|
||||
template <class S>
|
||||
V8_INLINE void Reset(Isolate* isolate, const Local<S>& other);
|
||||
|
||||
- /**
|
||||
- * Construct a Local<T> from this handle.
|
||||
- */
|
||||
- Local<T> Get(Isolate* isolate) const { return Local<T>::New(isolate, *this); }
|
||||
-
|
||||
template <class S>
|
||||
V8_INLINE TracedGlobal<S>& As() const {
|
||||
return reinterpret_cast<TracedGlobal<S>&>(
|
||||
const_cast<TracedGlobal<T>&>(*this));
|
||||
}
|
||||
+};
|
||||
|
||||
- template <class S>
|
||||
- V8_INLINE bool operator==(const TracedGlobal<S>& that) const {
|
||||
- internal::Address* a = reinterpret_cast<internal::Address*>(**this);
|
||||
- internal::Address* b = reinterpret_cast<internal::Address*>(*that);
|
||||
- if (a == nullptr) return b == nullptr;
|
||||
- if (b == nullptr) return false;
|
||||
- return *a == *b;
|
||||
- }
|
||||
+/**
|
||||
+ * A traced handle without destructor that clears the handle. The embedder needs
|
||||
+ * to ensure that the handle is not accessed once the V8 object has been
|
||||
+ * reclaimed. This can happen when the handle is not passed through the
|
||||
+ * EmbedderHeapTracer. For more details see TracedReferenceBase.
|
||||
+ */
|
||||
+template <typename T>
|
||||
+class TracedReference : public TracedReferenceBase<T> {
|
||||
+ public:
|
||||
+ using TracedReferenceBase<T>::Reset;
|
||||
+
|
||||
+ /**
|
||||
+ * An empty TracedReference without storage cell.
|
||||
+ */
|
||||
+ TracedReference() : TracedReferenceBase<T>() {}
|
||||
|
||||
+ /**
|
||||
+ * Construct a TracedReference from a Local.
|
||||
+ *
|
||||
+ * When the Local is non-empty, a new storage cell is created
|
||||
+ * pointing to the same object.
|
||||
+ */
|
||||
template <class S>
|
||||
- V8_INLINE bool operator==(const Local<S>& that) const {
|
||||
- internal::Address* a = reinterpret_cast<internal::Address*>(**this);
|
||||
- internal::Address* b = reinterpret_cast<internal::Address*>(*that);
|
||||
- if (a == nullptr) return b == nullptr;
|
||||
- if (b == nullptr) return false;
|
||||
- return *a == *b;
|
||||
+ TracedReference(Isolate* isolate, Local<S> that) : TracedReferenceBase<T>() {
|
||||
+ this->val_ = this->New(isolate, that.val_, &this->val_,
|
||||
+ TracedReferenceBase<T>::kWithoutDestructor);
|
||||
+ TYPE_CHECK(T, S);
|
||||
}
|
||||
|
||||
- template <class S>
|
||||
- V8_INLINE bool operator!=(const TracedGlobal<S>& that) const {
|
||||
- return !operator==(that);
|
||||
+ /**
|
||||
+ * Move constructor initializing TracedReference from an
|
||||
+ * existing one.
|
||||
+ */
|
||||
+ V8_INLINE TracedReference(TracedReference&& other) {
|
||||
+ // Forward to operator=.
|
||||
+ *this = std::move(other);
|
||||
}
|
||||
|
||||
- template <class S>
|
||||
- V8_INLINE bool operator!=(const Local<S>& that) const {
|
||||
- return !operator==(that);
|
||||
+ /**
|
||||
+ * Move constructor initializing TracedReference from an
|
||||
+ * existing one.
|
||||
+ */
|
||||
+ template <typename S>
|
||||
+ V8_INLINE TracedReference(TracedReference<S>&& other) {
|
||||
+ // Forward to operator=.
|
||||
+ *this = std::move(other);
|
||||
}
|
||||
|
||||
/**
|
||||
- * Assigns a wrapper class ID to the handle.
|
||||
+ * Copy constructor initializing TracedReference from an
|
||||
+ * existing one.
|
||||
*/
|
||||
- V8_INLINE void SetWrapperClassId(uint16_t class_id);
|
||||
+ V8_INLINE TracedReference(const TracedReference& other) {
|
||||
+ // Forward to operator=;
|
||||
+ *this = other;
|
||||
+ }
|
||||
|
||||
/**
|
||||
- * Returns the class ID previously assigned to this handle or 0 if no class ID
|
||||
- * was previously assigned.
|
||||
+ * Copy constructor initializing TracedReference from an
|
||||
+ * existing one.
|
||||
*/
|
||||
- V8_INLINE uint16_t WrapperClassId() const;
|
||||
+ template <typename S>
|
||||
+ V8_INLINE TracedReference(const TracedReference<S>& other) {
|
||||
+ // Forward to operator=;
|
||||
+ *this = other;
|
||||
+ }
|
||||
|
||||
/**
|
||||
- * Adds a finalization callback to the handle. The type of this callback is
|
||||
- * similar to WeakCallbackType::kInternalFields, i.e., it will pass the
|
||||
- * parameter and the first two internal fields of the object.
|
||||
- *
|
||||
- * The callback is then supposed to reset the handle in the callback. No
|
||||
- * further V8 API may be called in this callback. In case additional work
|
||||
- * involving V8 needs to be done, a second callback can be scheduled using
|
||||
- * WeakCallbackInfo<void>::SetSecondPassCallback.
|
||||
+ * Move assignment operator initializing TracedGlobal from an existing one.
|
||||
*/
|
||||
- V8_INLINE void SetFinalizationCallback(
|
||||
- void* parameter, WeakCallbackInfo<void>::Callback callback);
|
||||
+ V8_INLINE TracedReference& operator=(TracedReference&& rhs);
|
||||
|
||||
- private:
|
||||
- // Wrapping type used when clearing on destruction is required.
|
||||
- struct WrappedForDestruction {
|
||||
- T* value;
|
||||
-
|
||||
- explicit WrappedForDestruction(T* val) : value(val) {}
|
||||
- ~WrappedForDestruction();
|
||||
- operator T*() const { return value; }
|
||||
- T* operator*() const { return value; }
|
||||
- T* operator->() const { return value; }
|
||||
- WrappedForDestruction& operator=(const WrappedForDestruction& other) {
|
||||
- value = other.value;
|
||||
- return *this;
|
||||
- }
|
||||
- WrappedForDestruction& operator=(T* val) {
|
||||
- value = val;
|
||||
- return *this;
|
||||
- }
|
||||
- };
|
||||
+ /**
|
||||
+ * Move assignment operator initializing TracedGlobal from an existing one.
|
||||
+ */
|
||||
+ template <class S>
|
||||
+ V8_INLINE TracedReference& operator=(TracedReference<S>&& rhs);
|
||||
|
||||
- V8_INLINE static T* New(Isolate* isolate, T* that, void* slot);
|
||||
+ /**
|
||||
+ * Copy assignment operator initializing TracedGlobal from an existing one.
|
||||
+ *
|
||||
+ * Note: Prohibited when |other| has a finalization callback set through
|
||||
+ * |SetFinalizationCallback|.
|
||||
+ */
|
||||
+ V8_INLINE TracedReference& operator=(const TracedReference& rhs);
|
||||
|
||||
- T* operator*() const { return this->val_; }
|
||||
+ /**
|
||||
+ * Copy assignment operator initializing TracedGlobal from an existing one.
|
||||
+ *
|
||||
+ * Note: Prohibited when |other| has a finalization callback set through
|
||||
+ * |SetFinalizationCallback|.
|
||||
+ */
|
||||
+ template <class S>
|
||||
+ V8_INLINE TracedReference& operator=(const TracedReference<S>& rhs);
|
||||
|
||||
- typename std::conditional<
|
||||
- TracedGlobalTrait<TracedGlobal<T>>::kRequiresExplicitDestruction,
|
||||
- WrappedForDestruction, T*>::type val_{nullptr};
|
||||
+ /**
|
||||
+ * If non-empty, destroy the underlying storage cell and create a new one with
|
||||
+ * the contents of other if other is non empty
|
||||
+ */
|
||||
+ template <class S>
|
||||
+ V8_INLINE void Reset(Isolate* isolate, const Local<S>& other);
|
||||
|
||||
- friend class EmbedderHeapTracer;
|
||||
- template <typename F>
|
||||
- friend class Local;
|
||||
- friend class Object;
|
||||
- template <typename F>
|
||||
- friend class ReturnValue;
|
||||
+ template <class S>
|
||||
+ V8_INLINE TracedReference<S>& As() const {
|
||||
+ return reinterpret_cast<TracedReference<S>&>(
|
||||
+ const_cast<TracedReference<T>&>(*this));
|
||||
+ }
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -3640,8 +3761,9 @@ class V8_EXPORT Object : public Value {
|
||||
return object.val_->InternalFieldCount();
|
||||
}
|
||||
|
||||
- /** Same as above, but works for TracedGlobal. */
|
||||
- V8_INLINE static int InternalFieldCount(const TracedGlobal<Object>& object) {
|
||||
+ /** Same as above, but works for TracedReferenceBase. */
|
||||
+ V8_INLINE static int InternalFieldCount(
|
||||
+ const TracedReferenceBase<Object>& object) {
|
||||
return object.val_->InternalFieldCount();
|
||||
}
|
||||
|
||||
@@ -3666,7 +3788,7 @@ class V8_EXPORT Object : public Value {
|
||||
|
||||
/** Same as above, but works for TracedGlobal. */
|
||||
V8_INLINE static void* GetAlignedPointerFromInternalField(
|
||||
- const TracedGlobal<Object>& object, int index) {
|
||||
+ const TracedReferenceBase<Object>& object, int index) {
|
||||
return object.val_->GetAlignedPointerFromInternalField(index);
|
||||
}
|
||||
|
||||
@@ -3956,7 +4078,7 @@ class ReturnValue {
|
||||
template <typename S>
|
||||
V8_INLINE void Set(const Global<S>& handle);
|
||||
template <typename S>
|
||||
- V8_INLINE void Set(const TracedGlobal<S>& handle);
|
||||
+ V8_INLINE void Set(const TracedReferenceBase<S>& handle);
|
||||
template <typename S>
|
||||
V8_INLINE void Set(const Local<S> handle);
|
||||
// Fast primitive setters
|
||||
@@ -7376,7 +7498,8 @@ class V8_EXPORT EmbedderHeapTracer {
|
||||
class V8_EXPORT TracedGlobalHandleVisitor {
|
||||
public:
|
||||
virtual ~TracedGlobalHandleVisitor() = default;
|
||||
- virtual void VisitTracedGlobalHandle(const TracedGlobal<Value>& value) = 0;
|
||||
+ virtual void VisitTracedGlobalHandle(const TracedGlobal<Value>& handle) {}
|
||||
+ virtual void VisitTracedReference(const TracedReference<Value>& handle) {}
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -7414,7 +7537,7 @@ class V8_EXPORT EmbedderHeapTracer {
|
||||
virtual void RegisterV8References(
|
||||
const std::vector<std::pair<void*, void*> >& embedder_fields) = 0;
|
||||
|
||||
- void RegisterEmbedderReference(const TracedGlobal<v8::Value>& ref);
|
||||
+ void RegisterEmbedderReference(const TracedReferenceBase<v8::Value>& ref);
|
||||
|
||||
/**
|
||||
* Called at the beginning of a GC cycle.
|
||||
@@ -7475,32 +7598,35 @@ class V8_EXPORT EmbedderHeapTracer {
|
||||
*
|
||||
* If this returns false, then V8 may decide that the object referred to by
|
||||
* such a handle is reclaimed. In that case:
|
||||
- * - No action is required if handles are used with destructors.
|
||||
- * - When run without destructors (by specializing
|
||||
- * |TracedGlobalTrait::kRequiresExplicitDestruction|) V8 calls
|
||||
- * |ResetHandleInNonTracingGC|.
|
||||
- *
|
||||
- * Note that the |handle| is different from the |TracedGlobal<T>| handle that
|
||||
- * the embedder holds for retaining the object. The embedder may use
|
||||
- * |TracedGlobal<T>::WrapperClassId()| to distinguish cases where it wants
|
||||
- * handles to be treated as roots from not being treated as roots.
|
||||
+ * - No action is required if handles are used with destructors, i.e., by just
|
||||
+ * using |TracedGlobal|.
|
||||
+ * - When run without destructors, i.e., by using
|
||||
+ * |TracedReference|, V8 calls |ResetHandleInNonTracingGC|.
|
||||
+ *
|
||||
+ * Note that the |handle| is different from the handle that the embedder holds
|
||||
+ * for retaining the object. The embedder may use |WrapperClassId()| to
|
||||
+ * distinguish cases where it wants handles to be treated as roots from not
|
||||
+ * being treated as roots.
|
||||
*/
|
||||
virtual bool IsRootForNonTracingGC(
|
||||
- const v8::TracedGlobal<v8::Value>& handle) {
|
||||
- return true;
|
||||
- }
|
||||
+ const v8::TracedReference<v8::Value>& handle);
|
||||
+ virtual bool IsRootForNonTracingGC(const v8::TracedGlobal<v8::Value>& handle);
|
||||
|
||||
/**
|
||||
* Used in combination with |IsRootForNonTracingGC|. Called by V8 when an
|
||||
* object that is backed by a handle is reclaimed by a non-tracing garbage
|
||||
* collection. It is up to the embedder to reset the original handle.
|
||||
*
|
||||
- * Note that the |handle| is different from the |TracedGlobal<T>| handle that
|
||||
- * the embedder holds for retaining the object. It is up to the embedder to
|
||||
- * find the orignal |TracedGlobal<T>| handle via the object or class id.
|
||||
+ * Note that the |handle| is different from the handle that the embedder holds
|
||||
+ * for retaining the object. It is up to the embedder to find the original
|
||||
+ * handle via the object or class id.
|
||||
*/
|
||||
virtual void ResetHandleInNonTracingGC(
|
||||
- const v8::TracedGlobal<v8::Value>& handle) {}
|
||||
+ const v8::TracedReference<v8::Value>& handle);
|
||||
+ V8_DEPRECATE_SOON(
|
||||
+ "Use TracedReference version when not requiring destructors.",
|
||||
+ virtual void ResetHandleInNonTracingGC(
|
||||
+ const v8::TracedGlobal<v8::Value>& handle));
|
||||
|
||||
/*
|
||||
* Called by the embedder to immediately perform a full garbage collection.
|
||||
@@ -9103,8 +9229,12 @@ class V8_EXPORT V8 {
|
||||
template <class T>
|
||||
friend class Maybe;
|
||||
template <class T>
|
||||
+ friend class TracedReferenceBase;
|
||||
+ template <class T>
|
||||
friend class TracedGlobal;
|
||||
template <class T>
|
||||
+ friend class TracedReference;
|
||||
+ template <class T>
|
||||
friend class WeakCallbackInfo;
|
||||
template <class T> friend class Eternal;
|
||||
template <class T> friend class PersistentBase;
|
||||
@@ -9975,7 +10105,7 @@ Local<T> Local<T>::New(Isolate* isolate,
|
||||
}
|
||||
|
||||
template <class T>
|
||||
-Local<T> Local<T>::New(Isolate* isolate, const TracedGlobal<T>& that) {
|
||||
+Local<T> Local<T>::New(Isolate* isolate, const TracedReferenceBase<T>& that) {
|
||||
return New(isolate, that.val_);
|
||||
}
|
||||
|
||||
@@ -10156,26 +10286,20 @@ Global<T>& Global<T>::operator=(Global<S
|
||||
}
|
||||
|
||||
template <class T>
|
||||
-TracedGlobal<T>::WrappedForDestruction::~WrappedForDestruction() {
|
||||
- if (value == nullptr) return;
|
||||
- V8::DisposeTracedGlobal(reinterpret_cast<internal::Address*>(value));
|
||||
- value = nullptr;
|
||||
-}
|
||||
-
|
||||
-template <class T>
|
||||
-T* TracedGlobal<T>::New(Isolate* isolate, T* that, void* slot) {
|
||||
+T* TracedReferenceBase<T>::New(Isolate* isolate, T* that, void* slot,
|
||||
+ DestructionMode destruction_mode) {
|
||||
if (that == nullptr) return nullptr;
|
||||
internal::Address* p = reinterpret_cast<internal::Address*>(that);
|
||||
return reinterpret_cast<T*>(V8::GlobalizeTracedReference(
|
||||
reinterpret_cast<internal::Isolate*>(isolate), p,
|
||||
reinterpret_cast<internal::Address*>(slot),
|
||||
- TracedGlobalTrait<TracedGlobal<T>>::kRequiresExplicitDestruction));
|
||||
+ destruction_mode == kWithDestructor));
|
||||
}
|
||||
|
||||
template <class T>
|
||||
-void TracedGlobal<T>::Reset() {
|
||||
+void TracedReferenceBase<T>::Reset() {
|
||||
if (IsEmpty()) return;
|
||||
- V8::DisposeTracedGlobal(reinterpret_cast<internal::Address*>(**this));
|
||||
+ V8::DisposeTracedGlobal(reinterpret_cast<internal::Address*>(val_));
|
||||
val_ = nullptr;
|
||||
}
|
||||
|
||||
@@ -10185,7 +10309,8 @@ void TracedGlobal<T>::Reset(Isolate* iso
|
||||
TYPE_CHECK(T, S);
|
||||
Reset();
|
||||
if (other.IsEmpty()) return;
|
||||
- this->val_ = New(isolate, other.val_, &val_);
|
||||
+ this->val_ = this->New(isolate, other.val_, &this->val_,
|
||||
+ TracedReferenceBase<T>::kWithDestructor);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
@@ -10233,28 +10358,83 @@ TracedGlobal<T>& TracedGlobal<T>::operat
|
||||
}
|
||||
|
||||
template <class T>
|
||||
-void TracedGlobal<T>::SetWrapperClassId(uint16_t class_id) {
|
||||
+template <class S>
|
||||
+void TracedReference<T>::Reset(Isolate* isolate, const Local<S>& other) {
|
||||
+ TYPE_CHECK(T, S);
|
||||
+ Reset();
|
||||
+ if (other.IsEmpty()) return;
|
||||
+ this->val_ = this->New(isolate, other.val_, &this->val_,
|
||||
+ TracedReferenceBase<T>::kWithoutDestructor);
|
||||
+}
|
||||
+
|
||||
+template <class T>
|
||||
+template <class S>
|
||||
+TracedReference<T>& TracedReference<T>::operator=(TracedReference<S>&& rhs) {
|
||||
+ TYPE_CHECK(T, S);
|
||||
+ *this = std::move(rhs.template As<T>());
|
||||
+ return *this;
|
||||
+}
|
||||
+
|
||||
+template <class T>
|
||||
+template <class S>
|
||||
+TracedReference<T>& TracedReference<T>::operator=(
|
||||
+ const TracedReference<S>& rhs) {
|
||||
+ TYPE_CHECK(T, S);
|
||||
+ *this = rhs.template As<T>();
|
||||
+ return *this;
|
||||
+}
|
||||
+
|
||||
+template <class T>
|
||||
+TracedReference<T>& TracedReference<T>::operator=(TracedReference&& rhs) {
|
||||
+ if (this != &rhs) {
|
||||
+ this->Reset();
|
||||
+ if (rhs.val_ != nullptr) {
|
||||
+ this->val_ = rhs.val_;
|
||||
+ V8::MoveTracedGlobalReference(
|
||||
+ reinterpret_cast<internal::Address**>(&rhs.val_),
|
||||
+ reinterpret_cast<internal::Address**>(&this->val_));
|
||||
+ rhs.val_ = nullptr;
|
||||
+ }
|
||||
+ }
|
||||
+ return *this;
|
||||
+}
|
||||
+
|
||||
+template <class T>
|
||||
+TracedReference<T>& TracedReference<T>::operator=(const TracedReference& rhs) {
|
||||
+ if (this != &rhs) {
|
||||
+ this->Reset();
|
||||
+ if (rhs.val_ != nullptr) {
|
||||
+ V8::CopyTracedGlobalReference(
|
||||
+ reinterpret_cast<const internal::Address* const*>(&rhs.val_),
|
||||
+ reinterpret_cast<internal::Address**>(&this->val_));
|
||||
+ }
|
||||
+ }
|
||||
+ return *this;
|
||||
+}
|
||||
+
|
||||
+template <class T>
|
||||
+void TracedReferenceBase<T>::SetWrapperClassId(uint16_t class_id) {
|
||||
typedef internal::Internals I;
|
||||
if (IsEmpty()) return;
|
||||
- internal::Address* obj = reinterpret_cast<internal::Address*>(**this);
|
||||
+ internal::Address* obj = reinterpret_cast<internal::Address*>(val_);
|
||||
uint8_t* addr = reinterpret_cast<uint8_t*>(obj) + I::kNodeClassIdOffset;
|
||||
*reinterpret_cast<uint16_t*>(addr) = class_id;
|
||||
}
|
||||
|
||||
template <class T>
|
||||
-uint16_t TracedGlobal<T>::WrapperClassId() const {
|
||||
+uint16_t TracedReferenceBase<T>::WrapperClassId() const {
|
||||
typedef internal::Internals I;
|
||||
if (IsEmpty()) return 0;
|
||||
- internal::Address* obj = reinterpret_cast<internal::Address*>(**this);
|
||||
+ internal::Address* obj = reinterpret_cast<internal::Address*>(val_);
|
||||
uint8_t* addr = reinterpret_cast<uint8_t*>(obj) + I::kNodeClassIdOffset;
|
||||
return *reinterpret_cast<uint16_t*>(addr);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
-void TracedGlobal<T>::SetFinalizationCallback(
|
||||
+void TracedReferenceBase<T>::SetFinalizationCallback(
|
||||
void* parameter, typename WeakCallbackInfo<void>::Callback callback) {
|
||||
- V8::SetFinalizationCallbackTraced(
|
||||
- reinterpret_cast<internal::Address*>(**this), parameter, callback);
|
||||
+ V8::SetFinalizationCallbackTraced(reinterpret_cast<internal::Address*>(val_),
|
||||
+ parameter, callback);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
@@ -10273,12 +10453,12 @@ void ReturnValue<T>::Set(const Global<S>
|
||||
|
||||
template <typename T>
|
||||
template <typename S>
|
||||
-void ReturnValue<T>::Set(const TracedGlobal<S>& handle) {
|
||||
+void ReturnValue<T>::Set(const TracedReferenceBase<S>& handle) {
|
||||
TYPE_CHECK(T, S);
|
||||
if (V8_UNLIKELY(handle.IsEmpty())) {
|
||||
*value_ = GetDefaultValue();
|
||||
} else {
|
||||
- *value_ = *reinterpret_cast<internal::Address*>(*handle);
|
||||
+ *value_ = *reinterpret_cast<internal::Address*>(handle.val_);
|
||||
}
|
||||
}
|
||||
|
||||
diff -up chromium-78.0.3904.70/v8/src/api/api.cc.implement-tracedreference chromium-78.0.3904.70/v8/src/api/api.cc
|
||||
--- chromium-78.0.3904.70/v8/src/api/api.cc.implement-tracedreference 2019-10-24 09:18:56.712105100 -0400
|
||||
+++ chromium-78.0.3904.70/v8/src/api/api.cc 2019-10-24 09:20:17.428555637 -0400
|
||||
@@ -10346,11 +10346,12 @@ void EmbedderHeapTracer::DecreaseAllocat
|
||||
}
|
||||
|
||||
void EmbedderHeapTracer::RegisterEmbedderReference(
|
||||
- const TracedGlobal<v8::Value>& ref) {
|
||||
+ const TracedReferenceBase<v8::Value>& ref) {
|
||||
if (ref.IsEmpty()) return;
|
||||
|
||||
i::Heap* const heap = reinterpret_cast<i::Isolate*>(isolate_)->heap();
|
||||
- heap->RegisterExternallyReferencedObject(reinterpret_cast<i::Address*>(*ref));
|
||||
+ heap->RegisterExternallyReferencedObject(
|
||||
+ reinterpret_cast<i::Address*>(ref.val_));
|
||||
}
|
||||
|
||||
void EmbedderHeapTracer::IterateTracedGlobalHandles(
|
||||
@@ -10360,6 +10361,26 @@ void EmbedderHeapTracer::IterateTracedGl
|
||||
isolate->global_handles()->IterateTracedNodes(visitor);
|
||||
}
|
||||
|
||||
+bool EmbedderHeapTracer::IsRootForNonTracingGC(
|
||||
+ const v8::TracedReference<v8::Value>& handle) {
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+bool EmbedderHeapTracer::IsRootForNonTracingGC(
|
||||
+ const v8::TracedGlobal<v8::Value>& handle) {
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+void EmbedderHeapTracer::ResetHandleInNonTracingGC(
|
||||
+ const v8::TracedReference<v8::Value>& handle) {
|
||||
+ UNREACHABLE();
|
||||
+}
|
||||
+
|
||||
+void EmbedderHeapTracer::ResetHandleInNonTracingGC(
|
||||
+ const v8::TracedGlobal<v8::Value>& handle) {
|
||||
+ UNREACHABLE();
|
||||
+}
|
||||
+
|
||||
namespace internal {
|
||||
|
||||
const size_t HandleScopeImplementer::kEnteredContextsOffset =
|
||||
diff -up chromium-78.0.3904.70/v8/src/handles/global-handles.cc.implement-tracedreference chromium-78.0.3904.70/v8/src/handles/global-handles.cc
|
||||
--- chromium-78.0.3904.70/v8/src/handles/global-handles.cc.implement-tracedreference 2019-10-24 09:20:39.954123225 -0400
|
||||
+++ chromium-78.0.3904.70/v8/src/handles/global-handles.cc 2019-10-24 09:21:45.911857072 -0400
|
||||
@@ -901,8 +901,13 @@ void GlobalHandles::IdentifyWeakUnmodifi
|
||||
DCHECK(node->is_root());
|
||||
if (is_unmodified(node->location())) {
|
||||
v8::Value* value = ToApi<v8::Value>(node->handle());
|
||||
- node->set_root(tracer->IsRootForNonTracingGC(
|
||||
- *reinterpret_cast<v8::TracedGlobal<v8::Value>*>(&value)));
|
||||
+ if (node->has_destructor()) {
|
||||
+ node->set_root(tracer->IsRootForNonTracingGC(
|
||||
+ *reinterpret_cast<v8::TracedGlobal<v8::Value>*>(&value)));
|
||||
+ } else {
|
||||
+ node->set_root(tracer->IsRootForNonTracingGC(
|
||||
+ *reinterpret_cast<v8::TracedReference<v8::Value>*>(&value)));
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -990,7 +995,7 @@ void GlobalHandles::IterateYoungWeakUnmo
|
||||
} else {
|
||||
v8::Value* value = ToApi<v8::Value>(node->handle());
|
||||
tracer->ResetHandleInNonTracingGC(
|
||||
- *reinterpret_cast<v8::TracedGlobal<v8::Value>*>(&value));
|
||||
+ *reinterpret_cast<v8::TracedReference<v8::Value>*>(&value));
|
||||
DCHECK(!node->IsInUse());
|
||||
}
|
||||
|
||||
@@ -1271,8 +1276,13 @@ void GlobalHandles::IterateTracedNodes(
|
||||
for (TracedNode* node : *traced_nodes_) {
|
||||
if (node->IsInUse()) {
|
||||
v8::Value* value = ToApi<v8::Value>(node->handle());
|
||||
- visitor->VisitTracedGlobalHandle(
|
||||
- *reinterpret_cast<v8::TracedGlobal<v8::Value>*>(&value));
|
||||
+ if (node->has_destructor()) {
|
||||
+ visitor->VisitTracedGlobalHandle(
|
||||
+ *reinterpret_cast<v8::TracedGlobal<v8::Value>*>(&value));
|
||||
+ } else {
|
||||
+ visitor->VisitTracedReference(
|
||||
+ *reinterpret_cast<v8::TracedReference<v8::Value>*>(&value));
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
diff -up chromium-78.0.3904.70/v8/src/heap/embedder-tracing.h.implement-tracedreference chromium-78.0.3904.70/v8/src/heap/embedder-tracing.h
|
||||
--- chromium-78.0.3904.70/v8/src/heap/embedder-tracing.h.implement-tracedreference 2019-10-24 09:22:03.664519559 -0400
|
||||
+++ chromium-78.0.3904.70/v8/src/heap/embedder-tracing.h 2019-10-24 09:22:45.197729964 -0400
|
||||
@@ -57,7 +57,12 @@ class V8_EXPORT_PRIVATE LocalEmbedderHea
|
||||
bool IsRootForNonTracingGC(const v8::TracedGlobal<v8::Value>& handle) {
|
||||
return !InUse() || remote_tracer_->IsRootForNonTracingGC(handle);
|
||||
}
|
||||
- void ResetHandleInNonTracingGC(const v8::TracedGlobal<v8::Value>& handle) {
|
||||
+
|
||||
+ bool IsRootForNonTracingGC(const v8::TracedReference<v8::Value>& handle) {
|
||||
+ return !InUse() || remote_tracer_->IsRootForNonTracingGC(handle);
|
||||
+ }
|
||||
+
|
||||
+ void ResetHandleInNonTracingGC(const v8::TracedReference<v8::Value>& handle) {
|
||||
// Resetting is only called when IsRootForNonTracingGC returns false which
|
||||
// can only happen the EmbedderHeapTracer is set on API level.
|
||||
DCHECK(InUse());
|
||||
Loading…
Reference in new issue