From ebfadfd82b6e200c0f078f41322675db162edaf9 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Fri, 13 Nov 2020 20:46:43 +0000 Subject: [PATCH] Revert "Added mitigation for b/122921367" This reverts commit 30f16caf64b6a86fd9e7b9519500aafea57155be. Reason for revert: Clang crash is fixed in `clang-r399163b`. Change-Id: I97ba2b3fec8e1de7ce999c761e19b33d5c18db1e Test: lunch aosp_x86-eng; m out/soong/.intermediates/frameworks/base/core/jni/libandroid_runtime/android_x86_shared_asan/obj/frameworks/base/core/jni/com_android_internal_os_Zygote.o --- 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