@@ -1,9 +1,188 @@

 -------------------------------------------------------------------

+Thu Jul 14 16:38:50 UTC 2022 - Carsten Ziepke <kieltux@gmail.com>

+

+- Rebase chromium 103.0.5060.114 for use as chromium-ffmpeg-extra

+  - Fixes problems with audio and youtube video playback

+

+-------------------------------------------------------------------

+Sat Jul  9 12:52:33 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Chromium 103.0.5060.114 (boo#1201216)

+  * CVE-2022-2294: Heap buffer overflow in WebRTC

+  * CVE-2022-2295: Type Confusion in V8

+  * CVE-2022-2296: Use after free in Chrome OS Shell

+

+-------------------------------------------------------------------

+Thu Jul  7 18:07:43 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Chromium 103.0.5060.66

+  * no upstream release notes

+

+-------------------------------------------------------------------

+Sat Jun 25 10:43:48 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>

+

+- Chromium 103.0.5060.53 (boo#1200783)

+  * CVE-2022-2156: Use after free in Base

+  * CVE-2022-2157: Use after free in Interest groups

+  * CVE-2022-2158: Type Confusion in V8

+  * CVE-2022-2160: Insufficient policy enforcement in DevTools

+  * CVE-2022-2161: Use after free in WebApp Provider

+  * CVE-2022-2162: Insufficient policy enforcement in File System API

+  * CVE-2022-2163: Use after free in Cast UI and Toolbar

+  * CVE-2022-2164: Inappropriate implementation in Extensions API

+  * CVE-2022-2165: Insufficient data validation in URL formatting

+- Added patches:

+  * chromium-103-FrameLoadRequest-type.patch

+  * chromium-103-SubstringSetMatcher-packed.patch

+  * chromium-103-VirtualCursor-std-layout.patch

+  * chromium-103-compiler.patch

+- Removed patches:

+  * chromium-102-compiler.patch

+  * chromium-91-sql-standard-layout-type.patch

+  * chromium-101-libxml-unbundle.patch

+  * chromium-102-fenced_frame_utils-include.patch

+  * chromium-102-swiftshader-template-instantiation.patch

+  * chromium-102-symbolize-include.patch

+  * chromium-97-arm-tflite-cast.patch

+  * chromium-97-ScrollView-reference.patch

+

+-------------------------------------------------------------------

+Fri Jun 10 15:35:20 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Chromium 102.0.5005.115 (boo#1200423)

+  * CVE-2022-2007: Use after free in WebGPU

+  * CVE-2022-2008: Out of bounds memory access in WebGL

+  * CVE-2022-2010: Out of bounds read in compositing

+  * CVE-2022-2011: Use after free in ANGLE

+

+-------------------------------------------------------------------

+Wed Jun  8 13:40:43 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>

+

+- Switch to GTK4 on TW and Leap 15.4+ (boo#1200139)

+

+-------------------------------------------------------------------

+Wed Jun  1 09:43:54 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>

+

+- Disable ARM control flow integrity, it causes build issues

+  at the moment

+- Try a different SVG (black logo on GNOME)

+- Removed patches:

+  * chromium-third_party-symbolize-missing-include.patch

+  (replaced by chromium-102-symbolize-include.patch)

+

+-------------------------------------------------------------------

+Fri May 27 19:40:42 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>

+

+- Chromium 102.0.5001.61 (boo#1199893)

+  * CVE-2022-1853: Use after free in Indexed DB

+  * CVE-2022-1854: Use after free in ANGLE

+  * CVE-2022-1855: Use after free in Messaging

+  * CVE-2022-1856: Use after free in User Education

+  * CVE-2022-1857: Insufficient policy enforcement in File System API

+  * CVE-2022-1858: Out of bounds read in DevTools

+  * CVE-2022-1859: Use after free in Performance Manager

+  * CVE-2022-1860: Use after free in UI Foundations

+  * CVE-2022-1861: Use after free in Sharing

+  * CVE-2022-1862: Inappropriate implementation in Extensions

+  * CVE-2022-1863: Use after free in Tab Groups

+  * CVE-2022-1864: Use after free in WebApp Installs

+  * CVE-2022-1865: Use after free in Bookmarks

+  * CVE-2022-1866: Use after free in Tablet Mode

+  * CVE-2022-1867: Insufficient validation of untrusted input in Data Transfer

+  * CVE-2022-1868: Inappropriate implementation in Extensions API

+  * CVE-2022-1869: Type Confusion in V8

+  * CVE-2022-1870: Use after free in App Service

+  * CVE-2022-1871: Insufficient policy enforcement in File System API

+  * CVE-2022-1872: Insufficient policy enforcement in Extensions API

+  * CVE-2022-1873: Insufficient policy enforcement in COOP

+  * CVE-2022-1874: Insufficient policy enforcement in Safe Browsing

+  * CVE-2022-1875: Inappropriate implementation in PDF

+  * CVE-2022-1876: Heap buffer overflow in DevTools

+- Added patches:

+  * chromium-102-compiler.patch

+  * chromium-102-fenced_frame_utils-include.patch

+  * chromium-102-regex_pattern-array.patch

+  * chromium-102-swiftshader-template-instantiation.patch

+  * chromium-102-symbolize-include.patch

+  * ffmpeg-new-channel-layout.patch

+- Removed patches:

+  * chromium-100-compiler.patch

+  * chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch

+  * chromium-95-quiche-include.patch

+  * chromium-fix-swiftshader-template.patch

+  * chromium-missing-include-tuple.patch

+  * chromium-webrtc-stats-missing-vector.patch

+  * chromium-101-segmentation_platform-type.patch

+

+-------------------------------------------------------------------

+Sun May 15 09:03:28 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Chromium 101.0.4951.67

+  * fixes for other platforms

+

+-------------------------------------------------------------------

+Wed May 11 06:33:01 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>

+

+- Chromium 101.0.4951.64 (boo#1199409)

+  * CVE-2022-1633: Use after free in Sharesheet

+  * CVE-2022-1634: Use after free in Browser UI

+  * CVE-2022-1635: Use after free in Permission Prompts

+  * CVE-2022-1636: Use after free in Performance APIs

+  * CVE-2022-1637: Inappropriate implementation in Web Contents

+  * CVE-2022-1638: Heap buffer overflow in V8 Internationalization

+  * CVE-2022-1639: Use after free in ANGLE

+  * CVE-2022-1640: Use after free in Sharing

+  * CVE-2022-1641: Use after free in Web UI Diagnostics

+

+-------------------------------------------------------------------

+Wed May  4 09:34:58 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>

+

+- Chromium 101.0.4951.54 (boo#1199118)

+- Chromium 101.0.4951.41 (boo#1198917)

+  * CVE-2022-1477: Use after free in Vulkan

+  * CVE-2022-1478: Use after free in SwiftShader

+  * CVE-2022-1479: Use after free in ANGLE

+  * CVE-2022-1480: Use after free in Device API

+  * CVE-2022-1481: Use after free in Sharing

+  * CVE-2022-1482: Inappropriate implementation in WebGL

+  * CVE-2022-1483: Heap buffer overflow in WebGPU

+  * CVE-2022-1484: Heap buffer overflow in Web UI Settings

+  * CVE-2022-1485: Use after free in File System API

+  * CVE-2022-1486: Type Confusion in V8

+  * CVE-2022-1487: Use after free in Ozone

+  * CVE-2022-1488: Inappropriate implementation in Extensions API

+  * CVE-2022-1489: Out of bounds memory access in UI Shelf

+  * CVE-2022-1490: Use after free in Browser Switcher

+  * CVE-2022-1491: Use after free in Bookmarks

+  * CVE-2022-1492: Insufficient data validation in Blink Editing

+  * CVE-2022-1493: Use after free in Dev Tools

+  * CVE-2022-1494: Insufficient data validation in Trusted Types

+  * CVE-2022-1495: Incorrect security UI in Downloads

+  * CVE-2022-1496: Use after free in File Manager

+  * CVE-2022-1497: Inappropriate implementation in Input

+  * CVE-2022-1498: Inappropriate implementation in HTML Parser

+  * CVE-2022-1499: Inappropriate implementation in WebAuthentication

+  * CVE-2022-1500: Insufficient data validation in Dev Tools

+  * CVE-2022-1501: Inappropriate implementation in iframe

+- Added patches:

+  * chromium-101-libxml-unbundle.patch

+  * chromium-101-segmentation_platform-type.patch

+- Removed patches:

+  * chromium-100-SCTHashdanceMetadata-move.patch

+  * chromium-100-GLImplementationParts-constexpr.patch

+  * chromium-100-macro-typo.patch

+  

+-------------------------------------------------------------------

 Sun Apr 24 05:23:26 UTC 2022 - Carsten Ziepke <kieltux@gmail.com>

 - Rebase chromium 100.0.4896.127 for use as chromium-ffmpeg-extra

 -------------------------------------------------------------------

+Thu Apr 21 10:04:22 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>

+

+- Fixes for go 1.18

+

+-------------------------------------------------------------------

 Fri Apr 15 07:29:35 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>

 - Chromium 100.0.4896.127 (boo#1198509)

​

@@ -20,11 +20,16 @@

 %define outputdir out

 # bsc#1108175

 %define __provides_exclude ^lib.*\\.so.*$

-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400

+%if 0%{?suse_version} >= 1550

 %bcond_without system_icu

 %else

 %bcond_with system_icu

 %endif

+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400

+%bcond_without gtk4

+%else

+%bcond_with gtk4

+%endif

 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200

 %bcond_without pipewire

 %else

@@ -48,7 +53,7 @@

 # Chromium built with GCC 11 and LTO enabled crashes (boo#1194055)

 %bcond_with lto

 Name:           chromium-ffmpeg-extra

-Version:        100.0.4896.127

+Version:        103.0.5060.114

 Release:        0

 Summary:        Google's open source browser project

 License:        BSD-3-Clause AND LGPL-2.1-or-later

@@ -56,6 +61,7 @@

 Source0:        https://commondatastorage.googleapis.com/chromium-browser-official/%{rname}-%{version}.tar.xz

 Source1:        esbuild.tar.gz

 Source3:        README.SUSE

+Source4:        ffmpeg-new-channel-layout.patch

 # Toolchain definitions

 Source30:       master_preferences

 Source104:      chromium-symbolic.svg

@@ -82,33 +88,26 @@

 Patch11:        chromium-lp151-old-drm.patch

 # gentoo/fedora/arch patchset

 Patch12:        chromium-78-protobuf-RepeatedPtrField-export.patch

-Patch13:        chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch

-Patch15:        chromium-100-compiler.patch

+Patch15:        chromium-103-compiler.patch

 Patch17:        chromium-86-ImageMemoryBarrierData-init.patch

 Patch21:        chromium-gcc11.patch

 Patch40:        chromium-91-java-only-allowed-in-android-builds.patch

-Patch46:        chromium-91-sql-standard-layout-type.patch

 Patch50:        chromium-clang-nomerge.patch

 Patch62:        chromium-93-ffmpeg-4.4.patch

 Patch63:        chromium-ffmpeg-lp152.patch

 Patch65:        chromium-94-sql-no-assert.patch

+Patch68:        chromium-94-ffmpeg-roll.patch

 Patch69:        chromium-93-InkDropHost-crash.patch

-Patch72:        chromium-95-quiche-include.patch

 Patch78:        chromium-98-EnumTable-crash.patch

-Patch80:        chromium-97-ScrollView-reference.patch

-Patch84:        chromium-third_party-symbolize-missing-include.patch

-Patch85:        chromium-fix-swiftshader-template.patch

-Patch86:        chromium-97-arm-tflite-cast.patch

 Patch87:        chromium-98-gtk4-build.patch

-Patch89:        chromium-100-GLImplementationParts-constexpr.patch

 Patch90:        chromium-100-InMilliseconds-constexpr.patch

-Patch91:        chromium-100-SCTHashdanceMetadata-move.patch

-Patch92:        chromium-100-macro-typo.patch

-Patch93:        chromium-missing-include-tuple.patch

-Patch94:        chromium-webrtc-stats-missing-vector.patch

-Patch101:       chromium-86-fix-vaapi-on-intel.patch

+Patch98:        chromium-102-regex_pattern-array.patch

+Patch101:       chromium-103-FrameLoadRequest-type.patch

+Patch102:       chromium-103-SubstringSetMatcher-packed.patch

+Patch103:       chromium-103-VirtualCursor-std-layout.patch

+Patch201:       chromium-86-fix-vaapi-on-intel.patch

 # PATCH-FIX-SUSE: allow prop codecs to be set with chromium branding

-Patch102:       chromium-prop-codecs.patch

+Patch202:       chromium-prop-codecs.patch

 BuildRequires:  SDL-devel

 BuildRequires:  bison

 BuildRequires:  cups-devel

@@ -116,6 +115,7 @@

 BuildRequires:  elfutils

 BuildRequires:  fdupes

 BuildRequires:  flex

+BuildRequires:  git

 BuildRequires:  gn >= 0.1807

 BuildRequires:  gperf

 BuildRequires:  hicolor-icon-theme

@@ -153,8 +153,6 @@

 BuildRequires:  pkgconfig(flac++)

 BuildRequires:  pkgconfig(gbm)

 BuildRequires:  pkgconfig(glib-2.0)

-BuildRequires:  pkgconfig(gtk+-2.0)

-BuildRequires:  pkgconfig(gtk+-3.0)

 BuildRequires:  pkgconfig(hunspell)

 BuildRequires:  pkgconfig(imlib2)

 BuildRequires:  pkgconfig(jack)

@@ -243,6 +241,12 @@

 %if %{with system_zlib}

 BuildRequires:  pkgconfig(zlib)

 %endif

+%if %{with gtk4}

+BuildRequires:  pkgconfig(atk-bridge-2.0)

+BuildRequires:  pkgconfig(gtk4)

+%else

+BuildRequires:  pkgconfig(gtk+-3.0)

+%endif

 %if %{with clang}

 %if %{?suse_version} < 1550

 BuildRequires:  clang12

@@ -277,6 +281,10 @@

 %prep

 %setup -q -n %{rname}-%{version}

 %autopatch -p1

+%if 0%{?suse_version} >= 1550

+patch -R -p1 < %{PATCH68}

+%endif

+patch -R -p1 < %{SOURCE4}

 %build

 # esbuild

@@ -299,7 +307,7 @@

 ln -s %{_bindir}/eu-strip buildtools/third_party/eu-strip/bin/eu-strip

 # python3

-mkdir $HOME/bin

+mkdir -p $HOME/bin

 export PYTHON=python3

 ln -sfn %{_bindir}/$PYTHON $HOME/bin/python

 export PATH="$HOME/bin/:$PATH"

@@ -364,6 +372,7 @@

     third_party/ced

     third_party/cld_3

     third_party/closure_compiler

+    third_party/cpuinfo

     third_party/crashpad

     third_party/crashpad/crashpad/third_party/lss

     third_party/crashpad/crashpad/third_party/zlib

@@ -372,7 +381,6 @@

     third_party/dav1d

     third_party/dawn

     third_party/dawn/third_party

-    third_party/dawn/third_party/tint/src/ast

     third_party/depot_tools

     third_party/depot_tools/third_party/six

     third_party/devscripts

@@ -401,7 +409,9 @@

     third_party/fdlibm

     third_party/fft2d

     third_party/flatbuffers

+    third_party/fp16

     third_party/fusejs/dist

+    third_party/fxdiv

     third_party/gemmlowp

     third_party/google_input_tools

     third_party/google_input_tools/third_party/closure_library

@@ -438,7 +448,6 @@

     third_party/libx11/src

     third_party/libxcb-keysyms/keysyms

     third_party/libxml/chromium

-    third_party/libXNVCtrl

     third_party/libyuv

     third_party/libzip

     third_party/lottie

@@ -457,7 +466,6 @@

     third_party/node

     third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2

     third_party/one_euro_filter

-    third_party/opencv

     third_party/openscreen

     third_party/openscreen/src/third_party/mozilla

     third_party/openscreen/src/third_party/tinycbor/src/src

@@ -481,6 +489,7 @@

     third_party/private_membership

     third_party/protobuf

     third_party/protobuf/third_party/six

+    third_party/pthreadpool

     third_party/pyjson5

     third_party/qcms

     third_party/rnnoise

@@ -501,14 +510,14 @@

     third_party/swiftshader/third_party/llvm-10.0

     third_party/swiftshader/third_party/llvm-subzero

     third_party/swiftshader/third_party/marl

-    third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1

+    third_party/swiftshader/third_party/SPIRV-Headers

+    third_party/swiftshader/third_party/SPIRV-Tools

     third_party/swiftshader/third_party/subzero

     third_party/tensorflow-text

     third_party/tflite

     third_party/tflite/src/third_party/eigen3

     third_party/tflite/src/third_party/fft2d

     third_party/ukey2

-    third_party/usrsctp

     third_party/utf

     third_party/vulkan

     third_party/wayland

@@ -528,6 +537,7 @@

     third_party/wuffs

     third_party/x11proto

     third_party/xcbproto

+    third_party/xnnpack

     third_party/zlib/google

​

@@ -1,92 +0,0 @@

-From d32156fd3773330eca99e9cba5e18db57aaa1a53 Mon Sep 17 00:00:00 2001

-From: Stephan Hartmann <stha09@googlemail.com>

-Date: Sat, 19 Feb 2022 10:14:24 +0000

-Subject: PATCH GCC: make GLImplementationParts constructors constexpr

-

-Fix build error in GCC, as the constexpr operator== requires its

-invocations to be also constexpr.

----

- ui/gl/gl_implementation.cc | 23 -----------------------

- ui/gl/gl_implementation.h  | 25 +++++++++++++++++++++++--

- 2 files changed, 23 insertions(+), 25 deletions(-)

-

-diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc

-index e4e5456..3e4a47c 100644

---- a/ui/gl/gl_implementation.cc

-+++ b/ui/gl/gl_implementation.cc

-@@ -26,29 +26,6 @@

- 

- namespace gl {

- 

--ANGLEImplementation MakeANGLEImplementation(

--    const GLImplementation gl_impl,

--    const ANGLEImplementation angle_impl) {

--  if (gl_impl == kGLImplementationEGLANGLE) {

--    if (angle_impl == ANGLEImplementation::kNone) {

--      return ANGLEImplementation::kDefault;

--    } else {

--      return angle_impl;

--    }

--  } else {

--    return ANGLEImplementation::kNone;

--  }

--}

--

--GLImplementationParts::GLImplementationParts(

--    const ANGLEImplementation angle_impl)

--    : gl(kGLImplementationEGLANGLE),

--      angle(MakeANGLEImplementation(kGLImplementationEGLANGLE, angle_impl)) {}

--

--GLImplementationParts::GLImplementationParts(const GLImplementation gl_impl)

--    : gl(gl_impl),

--      angle(MakeANGLEImplementation(gl_impl, ANGLEImplementation::kDefault)) {}

--

- bool GLImplementationParts::IsValid() const {

-   if (angle == ANGLEImplementation::kNone) {

-     return (gl != kGLImplementationEGLANGLE);

-diff --git a/ui/gl/gl_implementation.h b/ui/gl/gl_implementation.h

-index 376ed58..a2513ea 100644

---- a/ui/gl/gl_implementation.h

-+++ b/ui/gl/gl_implementation.h

-@@ -59,8 +59,14 @@ enum class ANGLEImplementation {

- };

- 

- struct GL_EXPORT GLImplementationParts {

--  explicit GLImplementationParts(const ANGLEImplementation angle_impl);

--  explicit GLImplementationParts(const GLImplementation gl_impl);

-+  constexpr explicit GLImplementationParts(const ANGLEImplementation angle_impl)

-+      : gl(kGLImplementationEGLANGLE),

-+        angle(MakeANGLEImplementation(kGLImplementationEGLANGLE, angle_impl)) {}

-+

-+  constexpr explicit GLImplementationParts(const GLImplementation gl_impl)

-+      : gl(gl_impl),

-+        angle(MakeANGLEImplementation(gl_impl, ANGLEImplementation::kDefault)) {

-+  }

- 

-   GLImplementation gl = kGLImplementationNone;

-   ANGLEImplementation angle = ANGLEImplementation::kNone;

-@@ -80,6 +86,21 @@ struct GL_EXPORT GLImplementationParts {

-   bool IsValid() const;

-   bool IsAllowed(const std::vector<GLImplementationParts>& allowed_impls) const;

-   std::string ToString() const;

-+

-+ private:

-+  constexpr ANGLEImplementation MakeANGLEImplementation(

-+      const GLImplementation gl_impl,

-+      const ANGLEImplementation angle_impl) {

-+    if (gl_impl == kGLImplementationEGLANGLE) {

-+      if (angle_impl == ANGLEImplementation::kNone) {

-+        return ANGLEImplementation::kDefault;

-+      } else {

-+        return angle_impl;

-+      }

-+    } else {

-+      return ANGLEImplementation::kNone;

-+    }

-+  }

- };

- 

- struct GL_EXPORT GLWindowSystemBindingInfo {

--- 

-2.34.1

-

​

@@ -1,35 +0,0 @@

-From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001

-From: Jose Dapena Paz <jdapena@igalia.com>

-Date: Wed, 23 Feb 2022 12:18:57 +0100

-Subject: PATCH GCC: explicitely move return value of SCTHashdanceMetadata::ToValue

-

-GCC rejects to do Return Value Optimization in

-SCTHashdanceMetadata::ToValue, because the copy constructor is

-deleted, and in that scenario RVO is rejected in GCC:

-    ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’:

-    ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’

-      191 |   return value;

-          |          ^~~~~

-    In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14,

-                     from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5:

-    ../../base/values.h:254:3: note: declared here

-      254 |   Value(const Value&) = delete;

-          |   ^~~~~

-

-Bug: 819294

-Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166

----

-

-diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc

-index a057e8e..365527b 100644

---- a/services/network/sct_auditing/sct_auditing_reporter.cc

-+++ b/services/network/sct_auditing/sct_auditing_reporter.cc

-@@ -188,7 +188,7 @@

-       kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id))));

-   value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd));

-   value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry));

--  return value;

-+  return std::move(value);

- }

- 

- // static

​

@@ -1,220 +0,0 @@

-From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001

-From: Mike Gilbert <floppym@gentoo.org>

-Date: Thu, 3 Feb 2022 16:26:20 +0000

-Subject: PATCH Disable various compiler configs

-

----

- build/config/compiler/BUILD.gn | 105 ++++++---------------------------

- 1 file changed, 17 insertions(+), 88 deletions(-)

-

-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn

-index 61ceb0d..7392018 100644

---- a/build/config/compiler/BUILD.gn

-+++ b/build/config/compiler/BUILD.gn

-@@ -291,9 +291,7 @@ config("compiler") {

- 

-   configs += 

-     # See the definitions below.

--    ":clang_revision",

-     ":rustc_revision",

--    ":compiler_cpu_abi",

-     ":compiler_codegen",

-     ":compiler_deterministic",

-   

-@@ -534,31 +532,6 @@ config("compiler") {

-     ldflags +=  "-Wl,-z,keep-text-section-prefix" 

-   }

- 

--  if (is_clang && !is_nacl && current_os != "zos") {

--    cflags +=  "-fcrash-diagnostics-dir=" + clang_diagnostic_dir 

--

--    # TODO(hans): Remove this once Clang generates better optimized debug info

--    # by default. https://crbug.com/765793

--    cflags += 

--      "-mllvm",

--      "-instcombine-lower-dbg-declare=0",

--    

--    if (!is_debug && use_thin_lto && is_a_target_toolchain) {

--      if (is_win) {

--        ldflags +=  "-mllvm:-instcombine-lower-dbg-declare=0" 

--      } else {

--        ldflags +=  "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" 

--      }

--    }

--

--    # TODO(crbug.com/1235145): Investigate why/if this should be needed.

--    if (is_win) {

--      cflags +=  "/clang:-ffp-contract=off" 

--    } else {

--      cflags +=  "-ffp-contract=off" 

--    }

--  }

--

-   # Rust compiler setup (for either clang or rustc).

-   if (enable_rust) {

-     defines +=  "RUST_ENABLED" 

-@@ -1235,45 +1208,6 @@ config("compiler_deterministic") {

-     }

-   }

- 

--  # Makes builds independent of absolute file path.

--  if (is_clang && strip_absolute_paths_from_debug_symbols) {

--    # If debug option is given, clang includes $cwd in debug info by default.

--    # For such build, this flag generates reproducible obj files even we use

--    # different build directory like "out/feature_a" and "out/feature_b" if

--    # we build same files with same compile flag.

--    # Other paths are already given in relative, no need to normalize them.

--    if (is_nacl) {

--      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.

--      cflags += 

--        "-Xclang",

--        "-fdebug-compilation-dir",

--        "-Xclang",

--        ".",

--      

--    } else {

--      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=

--      # and -fcoverage-compilation-dir=.

--      cflags +=  "-ffile-compilation-dir=." 

--    }

--    if (!is_win) {

--      # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)

--      asmflags =  "-Wa,-fdebug-compilation-dir,." 

--    }

--

--    if (is_win && use_lld) {

--      if (symbol_level == 2 || (is_clang && using_sanitizer)) {

--        # Absolutize source file paths for PDB. Pass the real build directory

--        # if the pdb contains source-level debug information and if linker

--        # reproducibility is not critical.

--        ldflags +=  "/PDBSourcePath:" + rebase_path(root_build_dir) 

--      } else {

--        # Use a fake fixed base directory for paths in the pdb to make the pdb

--        # output fully deterministic and independent of the build directory.

--        ldflags +=  "/PDBSourcePath:o:\fake\prefix" 

--      }

--    }

--  }

--

-   # Tells the compiler not to use absolute paths when passing the default

-   # paths to the tools it invokes. We don't want this because we don't

-   # really need it and it can mess up the goma cache entries.

-@@ -1594,7 +1528,7 @@ config("chromium_code") {

-       defines =  "_HAS_NODISCARD" 

-     }

-   } else {

--    cflags =  "-Wall" 

-+    cflags = 

-     if (treat_warnings_as_errors) {

-       cflags +=  "-Werror" 

- 

-@@ -1603,10 +1537,6 @@ config("chromium_code") {

-       # well.

-       ldflags =  "-Werror" 

-     }

--    if (is_clang) {

--      # Enable extra warnings for chromium_code when we control the compiler.

--      cflags +=  "-Wextra" 

--    }

- 

-     # In Chromium code, we define __STDC_foo_MACROS in order to get the

-     # C99 macros on Mac and Linux.

-@@ -1615,15 +1545,6 @@ config("chromium_code") {

-       "__STDC_FORMAT_MACROS",

-     

- 

--    if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&

--        current_cpu != "s390" && current_cpu != "ppc64" &&

--        current_cpu != "mips" && current_cpu != "mips64") {

--      # Non-chromium code is not guaranteed to compile cleanly with

--      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are

--      # disabled, so only do that for Release build.

--      defines +=  "_FORTIFY_SOURCE=2" 

--    }

--

-     if (is_mac) {

-       cflags_objc =  "-Wobjc-missing-property-synthesis" 

-       cflags_objcc =  "-Wobjc-missing-property-synthesis" 

-@@ -2026,7 +1947,8 @@ config("default_stack_frames") {

- }

- 

- # Default "optimization on" config.

--config("optimize") {

-+config("optimize") { }

-+config("xoptimize") {

-   if (is_win) {

-     if (chrome_pgo_phase != 2) {

-       # Favor size over speed, /O1 must be before the common flags.

-@@ -2064,7 +1986,8 @@ config("optimize") {

- }

- 

- # Turn off optimizations.

--config("no_optimize") {

-+config("no_optimize") { }

-+config("xno_optimize") {

-   if (is_win) {

-     cflags = 

-       "/Od",  # Disable optimization.

-@@ -2104,7 +2027,8 @@ config("no_optimize") {

- # Turns up the optimization level. On Windows, this implies whole program

- # optimization and link-time code generation which is very expensive and should

- # be used sparingly.

--config("optimize_max") {

-+config("optimize_max") { }

-+config("xoptimize_max") {

-   if (is_nacl && is_nacl_irt) {

-     # The NaCl IRT is a special case and always wants its own config.

-     # Various components do:

-@@ -2137,7 +2061,8 @@ config("optimize_max") {

- #

- # TODO(crbug.com/621335) - rework how all of these configs are related

- # so that we don't need this disclaimer.

--config("optimize_speed") {

-+config("optimize_speed") { }

-+config("xoptimize_speed") {

-   if (is_nacl && is_nacl_irt) {

-     # The NaCl IRT is a special case and always wants its own config.

-     # Various components do:

-@@ -2163,7 +2088,8 @@ config("optimize_speed") {

-   }

- }

- 

--config("optimize_fuzzing") {

-+config("optimize_fuzzing") { }

-+config("xoptimize_fuzzing") {

-   cflags =  "-O1"  + common_optimize_on_cflags

-   rustflags =  "-Copt-level=1" 

-   ldflags = common_optimize_on_ldflags

-@@ -2283,7 +2209,8 @@ config("win_pdbaltpath") {

- }

- 

- # Full symbols.

--config("symbols") {

-+config("symbols") { }

-+config("xsymbols") {

-   if (is_win) {

-     if (is_clang) {

-       cflags =  "/Z7"   # Debug information in the .obj files.

-@@ -2411,7 +2338,8 @@ config("symbols") {

- # Minimal symbols.

​

@@ -1,29 +0,0 @@

-From 1183b14db8bd08d731ff3433c436887de00be3aa Mon Sep 17 00:00:00 2001

-From: Jose Dapena Paz <jdapena@igalia.com>

-Date: Fri, 18 Feb 2022 16:28:25 +0000

-Subject: PATCH Fix typo in non-clang GSL_OWNER macro

-

-GCC build fails because GSL_OWNER is not defined (GSL_OWNER_ was

-the one actually declared).

-

-Bug: 819294

-Change-Id: I1c3d17cb1c08b9bc0e8a888452da9868c308ddb5

-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3472080

-Reviewed-by: Daniel Cheng <dcheng@chromium.org>

-Commit-Queue: Daniel Cheng <dcheng@chromium.org>

-Cr-Commit-Position: refs/heads/main@{#972974}

----

-

-diff --git a/base/compiler_specific.h b/base/compiler_specific.h

-index eec5810..1ee8074 100644

---- a/base/compiler_specific.h

-+++ b/base/compiler_specific.h

-@@ -386,7 +386,7 @@

- #define GSL_OWNER gsl::Owner

- #define GSL_POINTER gsl::Pointer

- #else

--#define GSL_OWNER_

-+#define GSL_OWNER

- #define GSL_POINTER

- #endif

- 

​

@@ -0,0 +1,14 @@

+--- a/components/autofill/core/browser/BUILD.gn

++++ b/components/autofill/core/browser/BUILD.gn

+@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {

+ }

+ 

+ static_library("browser") {

++  if (is_clang) {

++    cflags = 

++      "-fbracket-depth=1000",

++    

++  }

+   sources = 

+     "address_normalization_manager.cc",

+     "address_normalization_manager.h",

​

@@ -0,0 +1,26 @@

+From 491bf840da4f76fa3591cc0aa2f4c19cdbe57ec4 Mon Sep 17 00:00:00 2001

+From: Stephan Hartmann <stha09@googlemail.com>

+Date: Thu, 12 May 2022 11:58:29 +0000

+Subject: PATCH GCC: fix ambiguous references in blink::FrameLoadRequest

+

+Add namespace to avoid confusion.

+---

+ third_party/blink/renderer/core/loader/frame_load_request.h | 2 +-

+ 1 file changed, 1 insertion(+), 1 deletion(-)

+

+diff --git a/third_party/blink/renderer/core/loader/frame_load_request.h b/third_party/blink/renderer/core/loader/frame_load_request.h

+index 444b25c..a86814d 100644

+--- a/third_party/blink/renderer/core/loader/frame_load_request.h

++++ b/third_party/blink/renderer/core/loader/frame_load_request.h

+@@ -179,7 +179,7 @@ struct CORE_EXPORT FrameLoadRequest {

+     impression_ = impression;

+   }

+ 

+-  const absl::optional<Impression>& Impression() const { return impression_; }

++  const absl::optional<blink::Impression>& Impression() const { return impression_; }

+ 

+   bool CanDisplay(const KURL&) const;

+ 

+-- 

+2.35.1

+

​

@@ -0,0 +1,70 @@

+From 3d274856e792a361336eb4ae1670bc9c1905f0cb Mon Sep 17 00:00:00 2001

+From: Steinar H. Gunderson <sesse@chromium.org>

+Date: Thu, 12 May 2022 16:42:40 +0200

+Subject: PATCH Make AhoCorasickNode 4-aligned.

+

+This should fix an issue where std::vector could allocate unaligned

+memory for AhoCorasickNode, and we'd then return a pointer to

+inline_edges, where a caller would expect the pointer to be aligned

+but it wasn't.

+

+Change-Id: Id9dff044c61f8e46062c63b8480b18ebc68c4862

+---

+

+diff --git a/base/substring_set_matcher/substring_set_matcher.cc b/base/substring_set_matcher/substring_set_matcher.cc

+index e110047..ef0b750 100644

+--- a/base/substring_set_matcher/substring_set_matcher.cc

++++ b/base/substring_set_matcher/substring_set_matcher.cc

+@@ -424,7 +424,12 @@

+     edges_.inline_edgesnum_edges() = AhoCorasickEdge{label, node};

+     if (label == kFailureNodeLabel) {

+       // Make sure that kFailureNodeLabel is first.

+-      std::swap(edges_.inline_edges0, edges_.inline_edgesnum_edges());

++      // NOTE: We don't use std::swap here, because GCC

++      // doesn't understand that inline_edges is 4-aligned

++      // and gives a warning.

++      AhoCorasickEdge temp = edges_.inline_edges0;

++      edges_.inline_edges0 = edges_.inline_edgesnum_edges();

++      edges_.inline_edgesnum_edges() = temp;

+     }

+     --num_free_edges_;

+     return;

+diff --git a/base/substring_set_matcher/substring_set_matcher.cc b/base/substring_set_matcher/substring_set_matcher.cc

+index e110047..ef0b750 100644

+--- a/base/substring_set_matcher/substring_set_matcher.h

++++ b/base/substring_set_matcher/substring_set_matcher.h

+@@ -154,8 +154,9 @@

+   static constexpr uint32_t kEmptyLabel = 0x103;

+ 

+   // A node in the trie, packed tightly together so that it occupies 12 bytes

+-  // (both on 32- and 64-bit platforms).

+-  class AhoCorasickNode {

++  // (both on 32- and 64-bit platforms), but aligned to at least 4 (see the

++  // comment on edges_).

++  class alignas(AhoCorasickEdge) AhoCorasickNode {

+    public:

+     AhoCorasickNode();

+     ~AhoCorasickNode();

+@@ -178,6 +179,10 @@

+     NodeID GetEdgeNoInline(uint32_t label) const;

+     void SetEdge(uint32_t label, NodeID node);

+     const AhoCorasickEdge* edges() const {

++      // NOTE: Returning edges_.inline_edges here is fine, because it's

++      // the first thing in the struct (see the comment on edges_).

++      DCHECK_EQ(0u, reinterpret_cast<uintptr_t>(edges_.inline_edges) %

++                        alignof(AhoCorasickEdge));

+       return edges_capacity_ == 0 ? edges_.inline_edges : edges_.edges;

+     }

+ 

+@@ -258,6 +263,11 @@

+     // in the first slot if it exists (ie., is not equal to kRootID), since we

+     // need to access that label during every single node we look at during

+     // traversal.

++    //

++    // NOTE: Keep this the first member in the struct, so that inline_edges gets

++    // 4-aligned (since the class is marked as such, despite being packed.

++    // Otherwise, edges() can return an unaligned pointer marked as aligned

++    // (the unalignedness gets lost).

+     static constexpr int kNumInlineEdges = 2;

+     union {

+       // Out-of-line edge storage, having room for edges_capacity_ elements.

​

@@ -0,0 +1,231 @@

+From 144479ad7b4287bee4067f95e4218f614798a865 Mon Sep 17 00:00:00 2001

+From: Stephan Hartmann <stha09@googlemail.com>

+Date: Sun, 16 Jan 2022 19:15:26 +0000

+Subject: PATCH sql: make VirtualCursor standard layout type

+

+sql::recover::VirtualCursor needs to be a standard layout type, but

+has members of type std::unique_ptr. However, std::unique_ptr is not

+guaranteed to be standard layout. Compiling with clang combined with

+gcc-11 libstdc++ fails because of this.

+

+Bug: 1189788

+Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c

+---

+

+diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc

+index cc9420e5..f12d8fa 100644

+--- a/sql/recover_module/btree.cc

++++ b/sql/recover_module/btree.cc

+@@ -136,16 +136,22 @@

+               "Move the destructor to the .cc file if it's non-trival");

+ #endif  // !DCHECK_IS_ON()

+ 

+-LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept

+-    : page_id_(db_reader->page_id()),

+-      db_reader_(db_reader),

+-      cell_count_(ComputeCellCount(db_reader)),

+-      next_read_index_(0),

+-      last_record_size_(0) {

++LeafPageDecoder::LeafPageDecoder() noexcept = default;

++

++void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {

++  page_id_ = db_reader->page_id();

++  db_reader_ = db_reader;

++  cell_count_ = ComputeCellCount(db_reader);

++  next_read_index_ = 0;

++  last_record_size_ = 0;

+   DCHECK(IsOnValidPage(db_reader));

+   DCHECK(DatabasePageReader::IsValidPageId(page_id_));

+ }

+ 

++void LeafPageDecoder::Reset() {

++  db_reader_ = nullptr;

++}

++

+ bool LeafPageDecoder::TryAdvance() {

+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

+   DCHECK(CanAdvance());

+diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h

+index eaa087a5..df0e0c9 100644

+--- a/sql/recover_module/btree.h

++++ b/sql/recover_module/btree.h

+@@ -101,9 +101,7 @@

+  public:

+   // Creates a decoder for a DatabasePageReader's last read page.

+   //

+-  // |db_reader| must have been used to read an inner page of a table B-tree.

+-  // |db_reader| must outlive this instance.

+-  explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;

++  LeafPageDecoder() noexcept;

+   ~LeafPageDecoder() noexcept = default;

+ 

+   LeafPageDecoder(const LeafPageDecoder&) = delete;

+@@ -151,6 +149,17 @@

+   // read as long as CanAdvance() returns true.

+   bool TryAdvance();

+ 

++  // Initialize with DatabasePageReader

++  // |db_reader| must have been used to read an inner page of a table B-tree.

++  // |db_reader| must outlive this instance.

++  void Initialize(DatabasePageReader* db_reader);

++

++  // Reset internal DatabasePageReader

++  void Reset();

++

++  // True if DatabasePageReader is valid

++  bool IsValid() { return (db_reader_ != nullptr); }

++

+   // True if the given reader may point to an inner page in a table B-tree.

+   //

+   // The last ReadPage() call on |db_reader| must have succeeded.

+@@ -164,14 +173,14 @@

+   static int ComputeCellCount(DatabasePageReader* db_reader);

+ 

+   // The number of the B-tree page this reader is reading.

+-  const int64_t page_id_;

++  int64_t page_id_;

+   // Used to read the tree page.

+   //

+   // Raw pointer usage is acceptable because this instance's owner is expected

+   // to ensure that the DatabasePageReader outlives this.

+-  DatabasePageReader* const db_reader_;

++  DatabasePageReader* db_reader_;

+   // Caches the ComputeCellCount() value for this reader's page.

+-  const int cell_count_ = ComputeCellCount(db_reader_);

++  int cell_count_;

+ 

+   // The reader's cursor state.

+   //

+diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc

+index 4f827ed..240de499 100644

+--- a/sql/recover_module/cursor.cc

++++ b/sql/recover_module/cursor.cc

+@@ -28,7 +28,7 @@

+ int VirtualCursor::First() {

+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

+   inner_decoders_.clear();

+-  leaf_decoder_ = nullptr;

++  leaf_decoder_.Reset();

+ 

+   AppendPageDecoder(table_->root_page_id());

+   return Next();

+@@ -38,18 +38,18 @@

+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

+   record_reader_.Reset();

+ 

+-  while (!inner_decoders_.empty() || leaf_decoder_.get()) {

+-    if (leaf_decoder_.get()) {

+-      if (!leaf_decoder_->CanAdvance()) {

++  while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {

++    if (leaf_decoder_.IsValid()) {

++      if (!leaf_decoder_.CanAdvance()) {

+         // The leaf has been exhausted. Remove it from the DFS stack.

+-        leaf_decoder_ = nullptr;

++        leaf_decoder_.Reset();

+         continue;

+       }

+-      if (!leaf_decoder_->TryAdvance())

++      if (!leaf_decoder_.TryAdvance())

+         continue;

+ 

+-      if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),

+-                                      leaf_decoder_->last_record_offset())) {

++      if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),

++                                      leaf_decoder_.last_record_offset())) {

+         continue;

+       }

+       if (!record_reader_.Initialize())

+@@ -101,13 +101,13 @@

+ int64_t VirtualCursor::RowId() {

+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

+   DCHECK(record_reader_.IsInitialized());

+-  DCHECK(leaf_decoder_.get());

+-  return leaf_decoder_->last_record_rowid();

++  DCHECK(leaf_decoder_.IsValid());

++  return leaf_decoder_.last_record_rowid();

+ }

+ 

+ void VirtualCursor::AppendPageDecoder(int page_id) {

+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

+-  DCHECK(leaf_decoder_.get() == nullptr)

++  DCHECK(!leaf_decoder_.IsValid())

+       << __func__

+       << " must only be called when the current path has no leaf decoder";

+ 

+@@ -115,7 +115,7 @@

+     return;

+ 

+   if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {

+-    leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);

++    leaf_decoder_.Initialize(&db_reader_);

+     return;

+   }

+ 

+diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h

+index 845b785..cc4e85f8 100644

+--- a/sql/recover_module/cursor.h

++++ b/sql/recover_module/cursor.h

+@@ -130,7 +130,7 @@

+   std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;

+ 

+   // Decodes the leaf page containing records.

+-  std::unique_ptr<LeafPageDecoder> leaf_decoder_;

++  LeafPageDecoder leaf_decoder_;

+ 

+   SEQUENCE_CHECKER(sequence_checker_);

+ };

+diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc

+index 58e75de..69d98cef 100644

+--- a/sql/recover_module/pager.cc

++++ b/sql/recover_module/pager.cc

+@@ -23,8 +23,7 @@

+               "ints are not appropriate for representing page IDs");

+ 

+ DatabasePageReader::DatabasePageReader(VirtualTable* table)

+-    : page_data_(std::make_unique<uint8_t>(table->page_size())),

+-      table_(table) {

++    : page_data_(table->page_size()), table_(table) {

+   DCHECK(table != nullptr);

+   DCHECK(IsValidPageSize(table->page_size()));

+ }

+@@ -58,7 +57,7 @@

+                 "The |read_offset| computation above may overflow");

+ 

+   int sqlite_status =

+-      RawRead(sqlite_file, read_size, read_offset, page_data_.get());

++      RawRead(sqlite_file, read_size, read_offset, page_data_.data());

+ 

+   // |page_id_| needs to be set to kInvalidPageId if the read failed.

+   // Otherwise, future ReadPage() calls with the previous |page_id_| value

​

@@ -0,0 +1,235 @@

+From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001

+From: Mike Gilbert <floppym@gentoo.org>

+Date: Tue, 3 May 2022 10:51:55 +0000

+Subject: PATCH Disable various compiler configs

+

+---

+ build/config/compiler/BUILD.gn | 114 +++++----------------------------

+ 1 file changed, 17 insertions(+), 97 deletions(-)

+

+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn

+index f378b95..cb2aeb3 100644

+--- a/build/config/compiler/BUILD.gn

++++ b/build/config/compiler/BUILD.gn

+@@ -286,9 +286,7 @@ config("compiler") {

+ 

+   configs += 

+     # See the definitions below.

+-    ":clang_revision",

+     ":rustc_revision",

+-    ":compiler_cpu_abi",

+     ":compiler_codegen",

+     ":compiler_deterministic",

+   

+@@ -522,31 +520,6 @@ config("compiler") {

+     ldflags +=  "-Wl,-z,keep-text-section-prefix" 

+   }

+ 

+-  if (is_clang && !is_nacl && current_os != "zos") {

+-    cflags +=  "-fcrash-diagnostics-dir=" + clang_diagnostic_dir 

+-

+-    # TODO(hans): Remove this once Clang generates better optimized debug info

+-    # by default. https://crbug.com/765793

+-    cflags += 

+-      "-mllvm",

+-      "-instcombine-lower-dbg-declare=0",

+-    

+-    if (!is_debug && use_thin_lto && is_a_target_toolchain) {

+-      if (is_win) {

+-        ldflags +=  "-mllvm:-instcombine-lower-dbg-declare=0" 

+-      } else {

+-        ldflags +=  "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" 

+-      }

+-    }

+-

+-    # TODO(crbug.com/1235145): Investigate why/if this should be needed.

+-    if (is_win) {

+-      cflags +=  "/clang:-ffp-contract=off" 

+-    } else {

+-      cflags +=  "-ffp-contract=off" 

+-    }

+-  }

+-

+   # Rust compiler setup (for either clang or rustc).

+   if (enable_rust) {

+     defines +=  "RUST_ENABLED" 

+@@ -1231,45 +1204,6 @@ config("compiler_deterministic") {

+     }

+   }

+ 

+-  # Makes builds independent of absolute file path.

+-  if (is_clang && strip_absolute_paths_from_debug_symbols) {

+-    # If debug option is given, clang includes $cwd in debug info by default.

+-    # For such build, this flag generates reproducible obj files even we use

+-    # different build directory like "out/feature_a" and "out/feature_b" if

+-    # we build same files with same compile flag.

+-    # Other paths are already given in relative, no need to normalize them.

+-    if (is_nacl) {

+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.

+-      cflags += 

+-        "-Xclang",

+-        "-fdebug-compilation-dir",

+-        "-Xclang",

+-        ".",

+-      

+-    } else {

+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=

+-      # and -fcoverage-compilation-dir=.

+-      cflags +=  "-ffile-compilation-dir=." 

+-    }

+-    if (!is_win) {

+-      # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)

+-      asmflags =  "-Wa,-fdebug-compilation-dir,." 

+-    }

+-

+-    if (is_win && use_lld) {

+-      if (symbol_level == 2 || (is_clang && using_sanitizer)) {

+-        # Absolutize source file paths for PDB. Pass the real build directory

+-        # if the pdb contains source-level debug information and if linker

+-        # reproducibility is not critical.

+-        ldflags +=  "/PDBSourcePath:" + rebase_path(root_build_dir) 

+-      } else {

+-        # Use a fake fixed base directory for paths in the pdb to make the pdb

+-        # output fully deterministic and independent of the build directory.

+-        ldflags +=  "/PDBSourcePath:o:\fake\prefix" 

+-      }

+-    }

+-  }

+-

+   # Tells the compiler not to use absolute paths when passing the default

+   # paths to the tools it invokes. We don't want this because we don't

+   # really need it and it can mess up the goma cache entries.

+@@ -1534,15 +1468,6 @@ config("default_warnings") {

+         cflags +=  "-Wno-unqualified-std-cast-call" 

+       }

+ 

+-      if (!is_nacl && !(is_chromeos ||

+-                        default_toolchain == "//build/toolchain/cros:target")) {

+-        # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out

+-        cflags += 

+-          "-Xclang",

+-          "-no-opaque-pointers",

+-        

+-      }

+-

+       if (is_fuchsia) {

+         # TODO(https://bugs.chromium.org/p/fuchsia/issues/detail?id=77383)

+         cflags +=  "-Wno-deprecated-copy" 

+@@ -1611,7 +1536,7 @@ config("chromium_code") {

+       defines =  "_HAS_NODISCARD" 

+     }

+   } else {

+-    cflags =  "-Wall" 

++    cflags = 

+     if (treat_warnings_as_errors) {

+       cflags +=  "-Werror" 

+ 

+@@ -1620,10 +1545,6 @@ config("chromium_code") {

+       # well.

+       ldflags =  "-Werror" 

+     }

+-    if (is_clang) {

+-      # Enable extra warnings for chromium_code when we control the compiler.

+-      cflags +=  "-Wextra" 

+-    }

+ 

+     # In Chromium code, we define __STDC_foo_MACROS in order to get the

+     # C99 macros on Mac and Linux.

+@@ -1632,15 +1553,6 @@ config("chromium_code") {

+       "__STDC_FORMAT_MACROS",

+     

+ 

+-    if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&

+-        current_cpu != "s390" && current_cpu != "ppc64" &&

+-        current_cpu != "mips" && current_cpu != "mips64") {

+-      # Non-chromium code is not guaranteed to compile cleanly with

+-      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are

+-      # disabled, so only do that for Release build.

+-      defines +=  "_FORTIFY_SOURCE=2" 

+-    }

+-

+     if (is_mac) {

+       cflags_objc =  "-Wobjc-missing-property-synthesis" 

+       cflags_objcc =  "-Wobjc-missing-property-synthesis" 

+@@ -2031,7 +1943,8 @@ config("default_stack_frames") {

+ }

+ 

+ # Default "optimization on" config.

+-config("optimize") {

++config("optimize") { }

++config("xoptimize") {

+   if (is_win) {

+     if (chrome_pgo_phase != 2) {

+       # Favor size over speed, /O1 must be before the common flags.

+@@ -2069,7 +1982,8 @@ config("optimize") {

+ }

+ 

+ # Turn off optimizations.

+-config("no_optimize") {

++config("no_optimize") { }

++config("xno_optimize") {

+   if (is_win) {

+     cflags = 

+       "/Od",  # Disable optimization.

+@@ -2109,7 +2023,8 @@ config("no_optimize") {

+ # Turns up the optimization level. On Windows, this implies whole program

+ # optimization and link-time code generation which is very expensive and should