From patchwork Thu Jul 21 21:31:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 113 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e252:0:0:0:0:0 with SMTP id bl18csp1649433wrb; Thu, 21 Jul 2022 14:32:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s2vZDtmGpHg88ZpSYhAqPexDDqj50pNjZnjR4vEAPNpZoJWFcr+rl/gtS5krk8VWjioLSU X-Received: by 2002:a17:906:53c7:b0:711:d2e9:99d4 with SMTP id p7-20020a17090653c700b00711d2e999d4mr456138ejo.716.1658439144871; Thu, 21 Jul 2022 14:32:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658439144; cv=none; d=google.com; s=arc-20160816; b=sdFEeT0rAYQ4EtEg8gbhW7mgnTT/J5fQJklFBQOJ1P59ikFpyORyqvVSfl07ztpwFG k0Oyg+NwNxIPEB/VrFasoHUYs8kLo3qGK/8gKaLrv5pYsbMbXmgYS5I1o5kuKFSpMTlI hPc7fH4T4N4IhrpPqUO8Zin9aU9Pzpc+IbdamUupLxHStW4SUJIq+wJql7CjU3pgE66u GHgyP9CQLDA8e4OcGfMCCtEiYl8xWKs1Turw8NpOEiLmmQ9cneV2/wk+WjWx/s19AzaR B7CS03kPs2D0UdlZ2bmPGifuUkuj+1Lrtg5lZGf7JqVOiK0BG+hsWzGhSv844pFKpnGh TELg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=9/ekwBL17EsOMNmn+hW/A2+pWkmtZErqlX0NKcubkXg=; b=MtaV5wHM5p/iLp3eZ0/hQEjmE+OdQcphKyPtcQegRkpTA4520hBdv/TYKTT0JjCpe7 nlMAtbuiiTD6NU44rnVa3eaEohXOgZ7Jp5gZhTEJPcrR5nUPENy4Tkp4X7znXdcsEKMI ASYrnkmlaW6kphGU1Nc1gtLs0/2TTbAdBhzuDab8R1p2GbBrtDH6WTUH7l9LolwRVFLE rk4L90dqCGdOD04OvCq1ScgEijyBwdYv/INynNParUuPBWJ3noV3X6s7Dvjjd+uQkeCy sXD7Tq/GPhYcAic3d/9lgZtOkKU22zA4Y+p7o22oFRdjklYFrEKr3367giI2c3cMIgEY 66RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=hKTPx7kM; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id ji10-20020a170907980a00b00718d033df13si4278468ejc.678.2022.07.21.14.32.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 14:32:24 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=hKTPx7kM; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D6560383568C for ; Thu, 21 Jul 2022 21:32:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D6560383568C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1658439143; bh=9/ekwBL17EsOMNmn+hW/A2+pWkmtZErqlX0NKcubkXg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hKTPx7kMPMROhdwGt35fFth2iYVNZ0AlZYW4Gm8M1svbpqFNnnDbzaa8nV7NHnivi 69Dd3lq7DSg1EXtPNn4qicymrOFl7IrRsihyLVQvVTIasaS+UWZ5pSA5M0gpbScJZG a1GwHcJy8oEFVFhPSJ5SK6ML/HTRcBOtjiY2T6tE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 863D13835839 for ; Thu, 21 Jul 2022 21:31:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 863D13835839 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-497-cni90WYRNHK_2VuWf8nlUg-1; Thu, 21 Jul 2022 17:31:39 -0400 X-MC-Unique: cni90WYRNHK_2VuWf8nlUg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F1108032E3 for ; Thu, 21 Jul 2022 21:31:39 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.16.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADB1C492C3B; Thu, 21 Jul 2022 21:31:38 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [committed] analyzer: fix -Wanalyzer-va-list-exhausted false +ve on va_arg in subroutine [PR106383] Date: Thu, 21 Jul 2022 17:31:37 -0400 Message-Id: <20220721213137.1597389-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Malcolm via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: David Malcolm Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1738999484740683675?= X-GMAIL-MSGID: =?utf-8?q?1738999484740683675?= Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r13-1786-gb852aa7f265424. gcc/analyzer/ChangeLog: PR analyzer/106383 * varargs.cc (region_model::impl_call_va_arg): When determining if we're doing interprocedural analysis, use the stack depth of the frame in which va_start was called, rather than the current stack depth. gcc/testsuite/ChangeLog: PR analyzer/106383 * gcc.dg/analyzer/stdarg-3.c: New test. Signed-off-by: David Malcolm --- gcc/analyzer/varargs.cc | 4 +- gcc/testsuite/gcc.dg/analyzer/stdarg-3.c | 57 ++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/analyzer/stdarg-3.c diff --git a/gcc/analyzer/varargs.cc b/gcc/analyzer/varargs.cc index c92a56dd2f9..c45585ce457 100644 --- a/gcc/analyzer/varargs.cc +++ b/gcc/analyzer/varargs.cc @@ -971,7 +971,7 @@ region_model::impl_call_va_arg (const call_details &cd) const frame_region *frame_reg = arg_reg->get_frame_region (); unsigned next_arg_idx = arg_reg->get_index (); - if (get_stack_depth () > 1) + if (frame_reg->get_stack_depth () > 1) { /* The interprocedural case: the called frame will have been populated with any variadic aruguments. @@ -1009,7 +1009,7 @@ region_model::impl_call_va_arg (const call_details &cd) any specific var_arg_regions populated within it. We already have a conjured_svalue for the result, so leave it untouched. */ - gcc_assert (get_stack_depth () == 1); + gcc_assert (frame_reg->get_stack_depth () == 1); } if (saw_problem) diff --git a/gcc/testsuite/gcc.dg/analyzer/stdarg-3.c b/gcc/testsuite/gcc.dg/analyzer/stdarg-3.c new file mode 100644 index 00000000000..68146147adb --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/stdarg-3.c @@ -0,0 +1,57 @@ +typedef __builtin_va_list va_list; + +struct printf_spec { + unsigned int type; +}; + +int +format_decode(const char *fmt, struct printf_spec *spec); + +static int vbin_printf(const char *fmt, va_list args) { + struct printf_spec spec; + int width = 0; + + while (*fmt) { + int read = format_decode(fmt, &spec); + + fmt += read; + + switch (spec.type) { + case 0: + break; + case 1: + width = __builtin_va_arg(args, int); /* { dg-bogus "-Wanalyzer-va-list-exhausted" } */ + break; + } + } + + return width; +} + +int bprintf(const char *fmt, ...) { + va_list args; + int ret; + + __builtin_va_start(args, fmt); + ret = vbin_printf(fmt, args); + __builtin_va_end(args); + + return ret; +} + +static int called_by_test_2 (va_list args) +{ + return __builtin_va_arg(args, int); /* { dg-bogus "-Wanalyzer-va-list-exhausted" } */ +} + +int test_2 (const char *fmt, ...) +{ + va_list args; + int ret; + + __builtin_va_start (args, fmt); + ret = called_by_test_2 (args); + __builtin_va_end (args); + + return ret; +}