Skip to content

Commit

Permalink
Merge pull request #275 from teeminus/update
Browse files Browse the repository at this point in the history
  • Loading branch information
teeminus authored Oct 14, 2023
2 parents 5893f31 + 50b1003 commit 2be1e96
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 63 deletions.
2 changes: 1 addition & 1 deletion downloads.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# `http://prereleases.llvm.org/win-snapshots/LLVM-9.8.7-r123456-win64.exe`
# (link derived from [LLVM Snapshot Builds](http://llvm.org/builds/))
[llvm]
version = 16.0.2
version = 17.0.2
#Uncomment when pre-release version is used.
#url = https://prereleases.llvm.org/win-snapshots/LLVM-%(version)s-win64.exe
#Uncomment the below instead when a new enough stable version of LLVM comes around
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

--- a/chrome/installer/mini_installer/BUILD.gn
+++ b/chrome/installer/mini_installer/BUILD.gn
@@ -170,7 +170,6 @@ action("mini_installer_archive") {
@@ -168,7 +168,6 @@ action("mini_installer_archive") {
"//chrome",
"//chrome:chrome_dll",
"//chrome/browser/extensions/default_extensions",
Expand All @@ -13,7 +13,7 @@
"//third_party/icu:icudata",
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -182,12 +182,14 @@ def GenerateDiffPatch(options, orig_file
@@ -186,12 +186,14 @@ def GenerateDiffPatch(options, orig_file
RunSystemCommand(cmd, options.verbose)

def GetLZMAExec(build_dir):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1510,7 +1510,7 @@ config("compiler_deterministic") {
@@ -1514,7 +1514,7 @@ config("compiler_deterministic") {
}

config("clang_revision") {
Expand All @@ -11,12 +11,12 @@
"--verify-version=$clang_version",
--- a/build/toolchain/toolchain.gni
+++ b/build/toolchain/toolchain.gni
@@ -38,7 +38,7 @@ if (generate_linker_map) {
}
@@ -39,7 +39,7 @@ if (generate_linker_map) {

declare_args() {
- clang_version = "18"
+ clang_version = "16"
}

# Extension for shared library files (including leading dot).
if (llvm_force_head_revision) {
- clang_version = "18"
+ clang_version = "17"
} else {
# TODO(crbug.com/1467585): Remove in the next clang roll
clang_version = "17"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Windows does not support weak symbols
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1105,7 +1105,7 @@ component("base") {
@@ -1104,7 +1104,7 @@ component("base") {
public_deps += [ "//build/rust:cxx_cppdeps" ]
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
if (base::FeatureList::IsEnabled(features::kAppBoundEncryptionMetrics) &&
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1605,8 +1605,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1501,8 +1501,6 @@ void RegisterLocalState(PrefRegistrySimp
true);
registry->RegisterBooleanPref(
policy::policy_prefs::kNativeWindowOcclusionEnabled, true);
Expand All @@ -68,7 +68,7 @@
MediaFoundationServiceMonitor::RegisterPrefs(registry);
os_crypt::RegisterLocalStatePrefs(registry);
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -1948,12 +1946,8 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -1847,12 +1845,8 @@ void RegisterProfilePrefs(user_prefs::Pr

#if BUILDFLAG(IS_WIN)
CdmPrefServiceHelper::RegisterProfilePrefs(registry);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
+ shutil.copy('../../third_party/llvm-build/Release+Asserts/bin/clang-format.exe', '../../buildtools/win')
+
dispatch_table = {
'async_iterator': bind_gen.generate_async_iterators,
'callback_function': bind_gen.generate_callback_functions,
'callback_interface': bind_gen.generate_callback_interfaces,
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/tools/licenses/licenses.py
+++ b/tools/licenses/licenses.py
@@ -752,7 +752,7 @@ def _GnBinary():
@@ -754,7 +754,7 @@ def _GnBinary():
elif sys.platform == 'darwin':
subdir = 'mac'
elif sys.platform == 'win32':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -717,7 +717,6 @@ config("compiler") {
@@ -726,7 +726,6 @@ config("compiler") {
"/lldltocache:" +
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
"/lldltocachepolicy:$cache_policy",
- "-mllvm:-disable-auto-upgrade-debug-info",
]
} else {
ldflags += [ "-flto=thin" ]
@@ -764,7 +763,7 @@ config("compiler") {
@@ -773,7 +772,7 @@ config("compiler") {
# toolchain has this flag.
# We only use one version of LLVM within a build so there's no need to
# upgrade debug info, which can be expensive since it runs the verifier.
Expand All @@ -17,47 +17,3 @@
}
}

--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -8509,7 +8509,7 @@ void RenderFrameHostImpl::SendFencedFram
for (const blink::FencedFrame::ReportingDestination& destination :
destinations) {
SendFencedFrameReportingBeaconInternal(
- DestinationEnumEvent(event_type, event_data), destination,
+ DestinationEnumEvent({event_type, event_data}), destination,
/*from_renderer=*/true, attribution_reporting_runtime_features,
GetFrameTreeNodeId());
}
@@ -8545,7 +8545,7 @@ void RenderFrameHostImpl::SendFencedFram
}

SendFencedFrameReportingBeaconInternal(
- DestinationURLEvent(destination_url),
+ DestinationURLEvent({destination_url}),
blink::FencedFrame::ReportingDestination::kBuyer,
/*from_renderer=*/true, attribution_reporting_runtime_features,
GetFrameTreeNodeId());
@@ -8617,8 +8617,8 @@ void RenderFrameHostImpl::MaybeSendFence
for (blink::FencedFrame::ReportingDestination destination :
info->destinations) {
initiator_rfh->SendFencedFrameReportingBeaconInternal(
- DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType,
- info->data),
+ DestinationEnumEvent({blink::kFencedFrameTopNavigationBeaconType,
+ info->data}),
destination,
/*from_renderer=*/false, info->attribution_reporting_runtime_features,
GetFrameTreeNodeId(), navigation_request.GetNavigationId());
--- a/net/dns/host_resolver_cache.cc
+++ b/net/dns/host_resolver_cache.cc
@@ -161,8 +161,8 @@ void HostResolverCache::Set(

std::string domain_name = result->domain_name();
entries_.emplace(
- Key(std::move(domain_name), network_anonymization_key),
- Entry(std::move(result), source, secure, staleness_generation_));
+ Key({std::move(domain_name), network_anonymization_key}),
+ Entry({std::move(result), source, secure, staleness_generation_}));

if (entries_.size() > max_entries_) {
EvictEntries();
2 changes: 1 addition & 1 deletion ungoogled-chromium

0 comments on commit 2be1e96

Please sign in to comment.