From 9254742566852f40b57753ea37da6c7db39a6e0d Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Mon, 11 Jan 2021 23:41:24 +0000 Subject: [PATCH] Reland revert of "Added mitigation for b/122921367""" This reverts commit 08ba820d9e210178795e9b9cb3a8e419fee7d991. Reason for revert: The original breakage of aosp_cf_x86_pasan should be fixed with the compiler update. Change-Id: I551923330bd920e0645c62246801cc87a16402b2 --- core/jni/com_android_internal_os_Zygote.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 827d13f3deb99..691027dbf83d6 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -14,15 +14,6 @@ * limitations under the License. */ -/* - * Disable optimization of this file if we are compiling with the address - * sanitizer. This is a mitigation for b/122921367 and can be removed once the - * bug is fixed. - */ -#if __has_feature(address_sanitizer) -#pragma clang optimize off -#endif - #define LOG_TAG "Zygote" // sys/mount.h has to come before linux/fs.h due to redefinition of MS_RDONLY, MS_BIND, etc