1*8975f5c5SAndroid Build Coastguard WorkerFrom 15f51edf989cc47588c3d8635a62c255cdeb0072 Mon Sep 17 00:00:00 2001 2*8975f5c5SAndroid Build Coastguard WorkerFrom: Daniel Cheng <[email protected]> 3*8975f5c5SAndroid Build Coastguard WorkerDate: Wed, 6 Oct 2021 03:23:23 -0700 4*8975f5c5SAndroid Build Coastguard WorkerSubject: [PATCH] Turn on hardened mode and alias absl types to STL types.. 5*8975f5c5SAndroid Build Coastguard Worker 6*8975f5c5SAndroid Build Coastguard WorkerThe absl implementations contain various hardening checks where the 7*8975f5c5SAndroid Build Coastguard Workerstandard is UB. At the time, libc++ lacked corresponding hardening 8*8975f5c5SAndroid Build Coastguard Workerchecks, so we forced the use of absl types. As of 9*8975f5c5SAndroid Build Coastguard Workerhttps://crbug.com/1335422, this is no longer true. Switching to the STL 10*8975f5c5SAndroid Build Coastguard Workerversion of variant is tracked by https://crbug.com/1373620. 11*8975f5c5SAndroid Build Coastguard Worker--- 12*8975f5c5SAndroid Build Coastguard Worker third_party/abseil-cpp/absl/base/options.h | 10 +++++----- 13*8975f5c5SAndroid Build Coastguard Worker 1 file changed, 5 insertions(+), 5 deletions(-) 14*8975f5c5SAndroid Build Coastguard Worker 15*8975f5c5SAndroid Build Coastguard Workerdiff --git a/third_party/abseil-cpp/absl/base/options.h b/third_party/abseil-cpp/absl/base/options.h 16*8975f5c5SAndroid Build Coastguard Workerindex 230bf1eecc4a4..1641271cd3ff9 100644 17*8975f5c5SAndroid Build Coastguard Worker--- a/third_party/abseil-cpp/absl/base/options.h 18*8975f5c5SAndroid Build Coastguard Worker+++ b/third_party/abseil-cpp/absl/base/options.h 19*8975f5c5SAndroid Build Coastguard Worker@@ -180,7 +180,7 @@ 20*8975f5c5SAndroid Build Coastguard Worker // absl::variant is a typedef of std::variant, use the feature macro 21*8975f5c5SAndroid Build Coastguard Worker // ABSL_USES_STD_VARIANT. 22*8975f5c5SAndroid Build Coastguard Worker 23*8975f5c5SAndroid Build Coastguard Worker-#define ABSL_OPTION_USE_STD_VARIANT 2 24*8975f5c5SAndroid Build Coastguard Worker+#define ABSL_OPTION_USE_STD_VARIANT 0 25*8975f5c5SAndroid Build Coastguard Worker 26*8975f5c5SAndroid Build Coastguard Worker 27*8975f5c5SAndroid Build Coastguard Worker // ABSL_OPTION_USE_INLINE_NAMESPACE 28*8975f5c5SAndroid Build Coastguard Worker@@ -233,6 +233,6 @@ 29*8975f5c5SAndroid Build Coastguard Worker // checks enabled by this option may abort the program in a different way and 30*8975f5c5SAndroid Build Coastguard Worker // log additional information when `NDEBUG` is not defined. 31*8975f5c5SAndroid Build Coastguard Worker 32*8975f5c5SAndroid Build Coastguard Worker-#define ABSL_OPTION_HARDENED 0 33*8975f5c5SAndroid Build Coastguard Worker+#define ABSL_OPTION_HARDENED 1 34*8975f5c5SAndroid Build Coastguard Worker 35*8975f5c5SAndroid Build Coastguard Worker #endif // ABSL_BASE_OPTIONS_H_ 36*8975f5c5SAndroid Build Coastguard Worker-- 37*8975f5c5SAndroid Build Coastguard Worker2.33.0.882.g93a45727a2-goog 38