1*d9f75844SAndroid Build Coastguard WorkerFrom 15f51edf989cc47588c3d8635a62c255cdeb0072 Mon Sep 17 00:00:00 2001 2*d9f75844SAndroid Build Coastguard WorkerFrom: Daniel Cheng <[email protected]> 3*d9f75844SAndroid Build Coastguard WorkerDate: Wed, 6 Oct 2021 03:23:23 -0700 4*d9f75844SAndroid Build Coastguard WorkerSubject: [PATCH] Turn on hardened mode and alias absl types to STL types.. 5*d9f75844SAndroid Build Coastguard Worker 6*d9f75844SAndroid Build Coastguard WorkerThe absl implementations contain various hardening checks that are 7*d9f75844SAndroid Build Coastguard Workersometimes simply UB as defined by the standard, and thus, as 8*d9f75844SAndroid Build Coastguard Workerimplemented by STL. 9*d9f75844SAndroid Build Coastguard Worker--- 10*d9f75844SAndroid Build Coastguard Worker third_party/abseil-cpp/absl/base/options.h | 10 +++++----- 11*d9f75844SAndroid Build Coastguard Worker 1 file changed, 5 insertions(+), 5 deletions(-) 12*d9f75844SAndroid Build Coastguard Worker 13*d9f75844SAndroid Build Coastguard Workerdiff --git a/third_party/abseil-cpp/absl/base/options.h b/third_party/abseil-cpp/absl/base/options.h 14*d9f75844SAndroid Build Coastguard Workerindex 230bf1eecc4a4..1641271cd3ff9 100644 15*d9f75844SAndroid Build Coastguard Worker--- a/third_party/abseil-cpp/absl/base/options.h 16*d9f75844SAndroid Build Coastguard Worker+++ b/third_party/abseil-cpp/absl/base/options.h 17*d9f75844SAndroid Build Coastguard Worker@@ -100,7 +100,7 @@ 18*d9f75844SAndroid Build Coastguard Worker // User code should not inspect this macro. To check in the preprocessor if 19*d9f75844SAndroid Build Coastguard Worker // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. 20*d9f75844SAndroid Build Coastguard Worker 21*d9f75844SAndroid Build Coastguard Worker-#define ABSL_OPTION_USE_STD_ANY 2 22*d9f75844SAndroid Build Coastguard Worker+#define ABSL_OPTION_USE_STD_ANY 0 23*d9f75844SAndroid Build Coastguard Worker 24*d9f75844SAndroid Build Coastguard Worker 25*d9f75844SAndroid Build Coastguard Worker // ABSL_OPTION_USE_STD_OPTIONAL 26*d9f75844SAndroid Build Coastguard Worker@@ -127,7 +127,7 @@ 27*d9f75844SAndroid Build Coastguard Worker // absl::optional is a typedef of std::optional, use the feature macro 28*d9f75844SAndroid Build Coastguard Worker // ABSL_USES_STD_OPTIONAL. 29*d9f75844SAndroid Build Coastguard Worker 30*d9f75844SAndroid Build Coastguard Worker-#define ABSL_OPTION_USE_STD_OPTIONAL 2 31*d9f75844SAndroid Build Coastguard Worker+#define ABSL_OPTION_USE_STD_OPTIONAL 0 32*d9f75844SAndroid Build Coastguard Worker 33*d9f75844SAndroid Build Coastguard Worker 34*d9f75844SAndroid Build Coastguard Worker // ABSL_OPTION_USE_STD_STRING_VIEW 35*d9f75844SAndroid Build Coastguard Worker@@ -154,7 +154,7 @@ 36*d9f75844SAndroid Build Coastguard Worker // absl::string_view is a typedef of std::string_view, use the feature macro 37*d9f75844SAndroid Build Coastguard Worker // ABSL_USES_STD_STRING_VIEW. 38*d9f75844SAndroid Build Coastguard Worker 39*d9f75844SAndroid Build Coastguard Worker-#define ABSL_OPTION_USE_STD_STRING_VIEW 2 40*d9f75844SAndroid Build Coastguard Worker+#define ABSL_OPTION_USE_STD_STRING_VIEW 0 41*d9f75844SAndroid Build Coastguard Worker 42*d9f75844SAndroid Build Coastguard Worker // ABSL_OPTION_USE_STD_VARIANT 43*d9f75844SAndroid Build Coastguard Worker // 44*d9f75844SAndroid Build Coastguard Worker@@ -180,7 +180,7 @@ 45*d9f75844SAndroid Build Coastguard Worker // absl::variant is a typedef of std::variant, use the feature macro 46*d9f75844SAndroid Build Coastguard Worker // ABSL_USES_STD_VARIANT. 47*d9f75844SAndroid Build Coastguard Worker 48*d9f75844SAndroid Build Coastguard Worker-#define ABSL_OPTION_USE_STD_VARIANT 2 49*d9f75844SAndroid Build Coastguard Worker+#define ABSL_OPTION_USE_STD_VARIANT 0 50*d9f75844SAndroid Build Coastguard Worker 51*d9f75844SAndroid Build Coastguard Worker 52*d9f75844SAndroid Build Coastguard Worker // ABSL_OPTION_USE_INLINE_NAMESPACE 53*d9f75844SAndroid Build Coastguard Worker@@ -233,6 +233,6 @@ 54*d9f75844SAndroid Build Coastguard Worker // checks enabled by this option may abort the program in a different way and 55*d9f75844SAndroid Build Coastguard Worker // log additional information when `NDEBUG` is not defined. 56*d9f75844SAndroid Build Coastguard Worker 57*d9f75844SAndroid Build Coastguard Worker-#define ABSL_OPTION_HARDENED 0 58*d9f75844SAndroid Build Coastguard Worker+#define ABSL_OPTION_HARDENED 1 59*d9f75844SAndroid Build Coastguard Worker 60*d9f75844SAndroid Build Coastguard Worker #endif // ABSL_BASE_OPTIONS_H_ 61*d9f75844SAndroid Build Coastguard Worker-- 62*d9f75844SAndroid Build Coastguard Worker2.33.0.882.g93a45727a2-goog 63*d9f75844SAndroid Build Coastguard Worker 64