From patchwork Fri Aug 16 19:55:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 1148449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-507149-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sandoe.co.uk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="rEl4rorE"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 469DZK1jDJz9sBF for ; Sat, 17 Aug 2019 05:55:18 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:content-transfer-encoding:mime-version:subject :message-id:date:cc:to; q=dns; s=default; b=pXI0SDeKhBtY4hwDssbE KpYpZlhRfZpRWl7JY76MJ6A6iMkGurwmAf32gMgafT3e8F5EvAD/2qAdXs8AhoIf EyhjTfNFiW0IdbeInDSkXs5X9I+fLt5P3G9XAA4enIHdPUfCrmDfoUtXTrGg/Iqh 0VAFygVrRcli3HVVgSXsUyc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:content-transfer-encoding:mime-version:subject :message-id:date:cc:to; s=default; bh=3kBfDJXOG6jUtTqj9QBxL8a4AH 4=; b=rEl4rorE+2xaqUO30sslqilAqNfl2/WVXVQN9tn1nq7LBbu/Dd11izhpwB lc+gC463ZmznY6f0DuV9mmMRvgcU9p80u78m/Ad7H9M0+zqRzu7ZXrZ9csokg+fe KhC25DshM6ySwpws47ADK2D+QF7sk5ESQ2EBjthE/Cpp9wvDM= Received: (qmail 109275 invoked by alias); 16 Aug 2019 19:55:11 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 109267 invoked by uid 89); 16 Aug 2019 19:55:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_COUK, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=r274540, reapply, sk:asan_in, Reapply X-HELO: smtp1.wavenetuk.net Received: from smtp.wavenetuk.net (HELO smtp1.wavenetuk.net) (195.26.36.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 16 Aug 2019 19:55:09 +0000 Received: from euterpe-sie.home (unknown [81.138.1.83]) by smtp1.wavenetuk.net (Postfix) with ESMTPA id 073F0120164B; Fri, 16 Aug 2019 20:55:07 +0100 (BST) From: Iain Sandoe Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: [libsanitizer, committed] Reapply r272406. Message-Id: <9F8B67AA-247E-4281-A846-34AB0598DF6F@sandoe.co.uk> Date: Fri, 16 Aug 2019 20:55:01 +0100 Cc: =?utf-8?q?Martin_Li=C5=A1ka?= To: GCC Patches Hi Somehow, I failed to commit the change to LOCAL_PATCHES for the fix for PR87880 applied in r272406. Fixed as below after re-checking on x86_64-linux-gnu, powerpc64-linux-gnu and x86_64-darwin. Also committed the change to LOCAL_PATCHES this time! thanks Iain. libsanitizer/ 2019-08-16 Iain Sandoe * asan/asan_interceptors.h: Reapply r272406. diff --git a/libsanitizer/asan/asan_interceptors.h b/libsanitizer/asan/asan_interceptors.h index 155ea4156a..035a84e1a4 100644 --- a/libsanitizer/asan/asan_interceptors.h +++ b/libsanitizer/asan/asan_interceptors.h @@ -80,7 +80,12 @@ void InitializePlatformInterceptors(); #if ASAN_HAS_EXCEPTIONS && !SANITIZER_WINDOWS && !SANITIZER_SOLARIS && \ !SANITIZER_NETBSD # define ASAN_INTERCEPT___CXA_THROW 1 -# define ASAN_INTERCEPT___CXA_RETHROW_PRIMARY_EXCEPTION 1 +# if ! defined(ASAN_HAS_CXA_RETHROW_PRIMARY_EXCEPTION) \ + || ASAN_HAS_CXA_RETHROW_PRIMARY_EXCEPTION +# define ASAN_INTERCEPT___CXA_RETHROW_PRIMARY_EXCEPTION 1 +# else +# define ASAN_INTERCEPT___CXA_RETHROW_PRIMARY_EXCEPTION 0 +# endif # if defined(_GLIBCXX_SJLJ_EXCEPTIONS) || (SANITIZER_IOS && defined(__arm__)) # define ASAN_INTERCEPT__UNWIND_SJLJ_RAISEEXCEPTION 1 # else libsanitizer/ 2019-08-16 Iain Sandoe * LOCAL_PATCHES: Add r274585. diff --git a/libsanitizer/LOCAL_PATCHES b/libsanitizer/LOCAL_PATCHES index 4f36773022..4fe34f58b7 100644 --- a/libsanitizer/LOCAL_PATCHES +++ b/libsanitizer/LOCAL_PATCHES @@ -1,2 +1,3 @@ r274427 r274540 +r274585