From patchwork Mon Jul 15 06:32:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 258958 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id D78922C0131 for ; Mon, 15 Jul 2013 16:32:53 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=u7hL0knN/Zqv9ahNln/iCXtCmCnsFuy0ob0Adu/bgjqU4iHpUm1kR y1JKx3sQ0n1eQ7ZdgmQd1IgjfxTI8uA+ZeXU7yLdlA++Y0VNPOlDgCE/g6P2oreT uRxNhVm4H91uXvrsAJ7CEDZJnIIw0zqGL57Y5jUs6cdhA+LhH33CbQ= 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:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=hmfXkxWBu+qqNf099Ui6ELTOR+Q=; b=Lu12BtGd9qXSTdBVTJT3 ppeN1BTtSS1fzJ0cS2CaTj6H9spTAhV0Xg3j5JA92GSxHc9mKTYBPBiEDywqeqkb aakhQGww0EXKX5szjipo3vfiCCPiwjEvDhh5orKfr8Y3YHwATylDZdOIBar2vlyl LIYr/aStPHAk4mRFb7gSS6Q= Received: (qmail 24407 invoked by alias); 15 Jul 2013 06:32:46 -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 24381 invoked by uid 89); 15 Jul 2013 06:32:45 -0000 X-Spam-SWARE-Status: No, score=-4.4 required=5.0 tests=AWL, BAYES_50, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL, RDNS_NONE, SPF_HELO_PASS, SPF_PASS, UPPERCASE_50_75 autolearn=no version=3.3.1 Received: from Unknown (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 15 Jul 2013 06:32:45 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6F6WbO9017699 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Jul 2013 02:32:37 -0400 Received: from redhat.com (ovpn-116-23.ams2.redhat.com [10.36.116.23]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r6F6WUsu028617 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Mon, 15 Jul 2013 02:32:35 -0400 Date: Mon, 15 Jul 2013 08:32:30 +0200 From: Marek Polacek To: GCC Patches Subject: [ubsan] Don't always use NORETURN Message-ID: <20130715063229.GK3697@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Some libubsan functions aren't really noreturn, so don't mark them as such. This prevents failures with -O1+, since we don't generate any code after calling noreturn routines, thus segfault when we actually get there. Applying to ubsan branch. 2013-07-15 Marek Polacek * builtin-attrs.def (ATTR_COLD_NOTHROW_LEAF_LIST): Define. * sanitizer.def (BUILT_IN_UBSAN_HANDLE_DIVREM_OVERFLOW): Don't mark as NORETURN. (BUILT_IN_UBSAN_HANDLE_SHIFT_OUT_OF_BOUNDS): Likewise. * asan.c (ATTR_COLD_NOTHROW_LEAF_LIST): Define. Marek --- gcc/builtin-attrs.def.mp2 2013-07-15 07:52:25.339442743 +0200 +++ gcc/builtin-attrs.def 2013-07-15 08:16:45.725146824 +0200 @@ -131,6 +131,8 @@ DEF_ATTR_TREE_LIST (ATTR_NORETURN_NOTHRO ATTR_NULL, ATTR_NOTHROW_LIST) DEF_ATTR_TREE_LIST (ATTR_NORETURN_NOTHROW_LEAF_LIST, ATTR_NORETURN,\ ATTR_NULL, ATTR_NOTHROW_LEAF_LIST) +DEF_ATTR_TREE_LIST (ATTR_COLD_NOTHROW_LEAF_LIST, ATTR_COLD,\ + ATTR_NULL, ATTR_NOTHROW_LEAF_LIST) DEF_ATTR_TREE_LIST (ATTR_COLD_NORETURN_NOTHROW_LEAF_LIST, ATTR_COLD,\ ATTR_NULL, ATTR_NORETURN_NOTHROW_LEAF_LIST) DEF_ATTR_TREE_LIST (ATTR_CONST_NORETURN_NOTHROW_LEAF_LIST, ATTR_CONST,\ --- gcc/sanitizer.def.mp2 2013-07-15 07:47:46.080293252 +0200 +++ gcc/sanitizer.def 2013-07-15 08:17:03.830219023 +0200 @@ -288,11 +288,11 @@ DEF_SANITIZER_BUILTIN(BUILT_IN_TSAN_ATOM DEF_SANITIZER_BUILTIN(BUILT_IN_UBSAN_HANDLE_DIVREM_OVERFLOW, "__ubsan_handle_divrem_overflow", BT_FN_VOID_PTR_PTR_PTR, - ATTR_COLD_NORETURN_NOTHROW_LEAF_LIST) + ATTR_COLD_NOTHROW_LEAF_LIST) DEF_SANITIZER_BUILTIN(BUILT_IN_UBSAN_HANDLE_SHIFT_OUT_OF_BOUNDS, "__ubsan_handle_shift_out_of_bounds", BT_FN_VOID_PTR_PTR_PTR, - ATTR_COLD_NORETURN_NOTHROW_LEAF_LIST) + ATTR_COLD_NOTHROW_LEAF_LIST) DEF_SANITIZER_BUILTIN(BUILT_IN_UBSAN_HANDLE_BUILTIN_UNREACHABLE, "__ubsan_handle_builtin_unreachable", BT_FN_VOID_PTR, --- gcc/asan.c.mp2 2013-07-15 07:46:29.786987718 +0200 +++ gcc/asan.c 2013-07-15 08:21:21.224095627 +0200 @@ -2102,6 +2102,9 @@ initialize_sanitizer_builtins (void) #undef ATTR_TMPURE_NORETURN_NOTHROW_LEAF_LIST #define ATTR_TMPURE_NORETURN_NOTHROW_LEAF_LIST \ ECF_TM_PURE | ATTR_NORETURN_NOTHROW_LEAF_LIST +#undef ATTR_COLD_NOTHROW_LEAF_LIST +#define ATTR_COLD_NOTHROW_LEAF_LIST \ + /* ECF_COLD missing */ ATTR_NOTHROW_LEAF_LIST #undef ATTR_COLD_NORETURN_NOTHROW_LEAF_LIST #define ATTR_COLD_NORETURN_NOTHROW_LEAF_LIST \ /* ECF_COLD missing */ ATTR_NORETURN_NOTHROW_LEAF_LIST