[arch-commits] Commit in chromium/trunk (2 files)

[Evangelos Foutras]

    Date: Sunday, June 6, 2021 @ 19:34:16
  Author: foutrelis
Revision: 417222

upgpkg: chromium 91.0.4472.77-2: re-enable PGO

Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/add-clang-nomerge-attribute-to-CheckError.patch

-------------------------------------------------+
 PKGBUILD                                        |    8 ----
 add-clang-nomerge-attribute-to-CheckError.patch |   44 ----------------------
 2 files changed, 1 insertion(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-06 19:32:02 UTC (rev 417221)
+++ PKGBUILD	2021-06-06 19:34:16 UTC (rev 417222)
@@ -5,7 +5,7 @@
 
 pkgname=chromium
 pkgver=91.0.4472.77
-pkgrel=1
+pkgrel=2
 _launcher_ver=7
 _gcc_patchset=5
 pkgdesc="A web browser built for speed, simplicity, and security"
@@ -27,7 +27,6 @@
         fix-crash-in-ThemeService.patch
         unbundle-use-char16_t-as-UCHAR_TYPE.patch
         extend-enable-accelerated-video-decode-flag.patch
-        add-clang-nomerge-attribute-to-CheckError.patch
         sql-make-VirtualCursor-standard-layout-type.patch
         chromium-glibc-2.33.patch
         use-oauth2-client-switches-as-default.patch)
@@ -37,7 +36,6 @@
             '3cfe46e181cb9d337c454b5b5adbf5297052f29cd617cdee4380eeb1943825d8'
             '59a59a60a08b335fe8647fdf0f9d2288d236ebf2cc9626396d0c4d032fd2b25d'
             '66db9132d6f5e06aa26e5de0924f814224a76a9bdf4b61afce161fb1d7643b22'
-            '50133dd196d288ad538bb536aa51dccd6cb4aacfd9a60160f77e8fb16034b460'
             'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
             '2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
@@ -102,9 +100,6 @@
   patch -Np1 -i ../unbundle-use-char16_t-as-UCHAR_TYPE.patch
   patch -Np1 -i ../extend-enable-accelerated-video-decode-flag.patch
 
-  # Revert addition of [[clang::nomerge]] attribute; not supported by clang 11
-  patch -Rp1 -i ../add-clang-nomerge-attribute-to-CheckError.patch
-
   # https://chromium-review.googlesource.com/c/chromium/src/+/2862724
   patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
 
@@ -151,7 +146,6 @@
     'host_toolchain="//build/toolchain/linux/unbundle:default"'
     'clang_use_chrome_plugins=false'
     'is_official_build=true' # implies is_cfi=true on x86_64
-    'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile
     'treat_warnings_as_errors=false'
     'fieldtrial_testing_like_official_build=true'
     'ffmpeg_branding="Chrome"'

Deleted: add-clang-nomerge-attribute-to-CheckError.patch
===================================================================
--- add-clang-nomerge-attribute-to-CheckError.patch	2021-06-06 19:32:02 UTC (rev 417221)
+++ add-clang-nomerge-attribute-to-CheckError.patch	2021-06-06 19:34:16 UTC (rev 417222)
@@ -1,44 +0,0 @@
-From 9909f146b28d56c9c0411329a056ed959b33f76a Mon Sep 17 00:00:00 2001
-From: Zequan Wu <zequanwu at google.com>
-Date: Wed, 10 Feb 2021 03:26:00 +0000
-Subject: [PATCH] Reland "Add [[clang::nomerge]] attribute to ~CheckError()."
-
-This is a reland of 8860253376c38c090d585bda4b20b801e3aa3ce3
-
-Original change's description:
-> Add [[clang::nomerge]] attribute to ~CheckError().
->
-> To disable merging multiple ~CheckError() destructor for accurate crash logs.
->
-> Bug: 1153188
-> Change-Id: If6d153661667a63f13b645f6d284eb3d5ea3a300
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611331
-> Commit-Queue: Nico Weber <thakis at chromium.org>
-> Auto-Submit: Zequan Wu <zequanwu at google.com>
-> Reviewed-by: Nico Weber <thakis at chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#844989}
-
-Bug: 1153188
-Change-Id: I303c5ff9fb88f7a30663400622b327a910d0b108
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2686331
-Reviewed-by: Nico Weber <thakis at chromium.org>
-Commit-Queue: Nico Weber <thakis at chromium.org>
-Commit-Queue: Zequan Wu <zequanwu at google.com>
-Cr-Commit-Position: refs/heads/master@{#852453}
----
- base/check.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/base/check.h b/base/check.h
-index c94ab68db90..17048e45539 100644
---- a/base/check.h
-+++ b/base/check.h
-@@ -85,7 +85,7 @@ class BASE_EXPORT CheckError {
-   // Stream for adding optional details to the error message.
-   std::ostream& stream();
- 
--  ~CheckError();
-+  NOMERGE ~CheckError();
- 
-   CheckError(const CheckError& other) = delete;
-   CheckError& operator=(const CheckError& other) = delete;