From patchwork Mon Oct 24 20:55:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 10279 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp648170wru; Mon, 24 Oct 2022 13:56:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4YxG3J6P8VVv1i4tclVyodgFIStTfoGpUL3TeJ/5aO1bxF26rIQ+rcKIp9Zv5p7IXbAn2y X-Received: by 2002:a17:907:e93:b0:78d:b8ff:9b5f with SMTP id ho19-20020a1709070e9300b0078db8ff9b5fmr29641154ejc.12.1666645014777; Mon, 24 Oct 2022 13:56:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666645014; cv=none; d=google.com; s=arc-20160816; b=anpr3vi3s7ZjVdOMmyWykxDa+N+AFjLA0Goy6nmJG6ANOkvP7GcNBVt+oygsfRKQZ5 iFISYFRrsemjmc5UH/hGe8W5vb/WhcEsBnb0usKMkr58NJ37diAtqLoOSVQ9DPwiJmKB cwFZSM/lNpVlO3HfWrsyKMKSKHT/oh79DJdIG7UxzrjlwOBJuaIX7PIejSFs1SkgIdKQ XZ4V9HhOhO1OtSf+ee3b81s5vvflPXiFdBgOsZ5lYjDFk/CjVw3reh36t0H/fQw12P9U 3bE4MDDAa6v7NyGneWQ2ql3RFA1o3SOkHyxKtFrzsasy96m8mrqoGk/7I0QdB355Ictr SrTQ== 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=JbMMZgArPD8rVyyv3Yzpo81sSmWymMf8gjOVaWkmLAs=; b=BoMIpO6KqoujLZXyQYToj7DV5931UsYBT4BmpTR4140xgst1xeQW0DA9Ui2sTSHQn0 f0ak09ipuSEYplvt5yptLrHTWPXkrEP1PSVVfi3TyJ9kZkrrJt0m7L1NRBCcIKxvZju+ dMmwmcarxDS1MH+cxieONkqmW16GLhUBdszaEFPgBSjgSNxCEp/HyYrlCggsnpYtb3bu 9lTEQ3Fpw5llyeg8YPfaFIJPJWCIzDR2j3H6WdabHMNu9wmgJBX2os3pfCUnlDsCcEnv fH4K4fm74Wf61gIeR2r5j8RjAYHdWbmBb3vmgBhW6ZhbU33VkpVZYKXiaW6PdCT+oGG5 oS3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=EnwAYWuO; 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 e5-20020a17090658c500b0078e18bd3073si699159ejs.820.2022.10.24.13.56.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Oct 2022 13:56:54 -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=EnwAYWuO; 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 63247385780A for ; Mon, 24 Oct 2022 20:56:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 63247385780A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666645010; bh=JbMMZgArPD8rVyyv3Yzpo81sSmWymMf8gjOVaWkmLAs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=EnwAYWuOy10AKCRdMniiCXQVZW2/IrVU8GS/8Mmkeb5FjrjY2O6laJGfKZ32x8I/Y 5fbYagQJSF6qYZpU+BtKOwU2t/vEpALen9VsftFL5V/QIOzLYGNAzQhp440h61qFm+ sRXYmjHvR61RFhZ1PtLDcGluzYfudAacm1ENwBpk= 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 5A79638582B6 for ; Mon, 24 Oct 2022 20:55:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5A79638582B6 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-593-l6oIenxzNf2Q_em03MdFqQ-1; Mon, 24 Oct 2022 16:55:56 -0400 X-MC-Unique: l6oIenxzNf2Q_em03MdFqQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5283884343 for ; Mon, 24 Oct 2022 20:55:55 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.17.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id A184A40C2064; Mon, 24 Oct 2022 20:55:55 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [commited] analyzer: fix ICE on va_copy [PR107349] Date: Mon, 24 Oct 2022 16:55:54 -0400 Message-Id: <20221024205554.1760903-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.6 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_NONE, RCVD_IN_MSPIKE_H2, 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: David Malcolm 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?1747603963234286934?= X-GMAIL-MSGID: =?utf-8?q?1747603963234286934?= Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Lightly tested with aarch64-unknown-linux. Pushed to trunk as r13-3470-g687d11fd74e7de gcc/analyzer/ChangeLog: PR analyzer/107349 * varargs.cc (get_va_copy_arg): Fix the non-pointer case. gcc/testsuite/ChangeLog: PR analyzer/107349 * gcc.dg/analyzer/stdarg-1-ms_abi.c (pr107349): New. * gcc.dg/analyzer/stdarg-1-sysv_abi.c (pr107349): New. * gcc.dg/analyzer/stdarg-1.c (pr107349): New. Signed-off-by: David Malcolm --- gcc/analyzer/varargs.cc | 5 ++--- gcc/testsuite/gcc.dg/analyzer/stdarg-1-ms_abi.c | 6 ++++++ gcc/testsuite/gcc.dg/analyzer/stdarg-1-sysv_abi.c | 6 ++++++ gcc/testsuite/gcc.dg/analyzer/stdarg-1.c | 6 ++++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gcc/analyzer/varargs.cc b/gcc/analyzer/varargs.cc index 20c83dbbadc..e4dbad79f42 100644 --- a/gcc/analyzer/varargs.cc +++ b/gcc/analyzer/varargs.cc @@ -171,9 +171,8 @@ get_va_copy_arg (const region_model *model, const svalue *arg_sval = model->get_rvalue (arg, ctxt); if (const svalue *cast = arg_sval->maybe_undo_cast ()) arg_sval = cast; - /* Expect a POINTER_TYPE; does it point to an array type? */ - gcc_assert (TREE_CODE (TREE_TYPE (arg)) == POINTER_TYPE); - if (TREE_CODE (TREE_TYPE (TREE_TYPE (arg))) == ARRAY_TYPE) + if (TREE_CODE (TREE_TYPE (arg)) == POINTER_TYPE + && TREE_CODE (TREE_TYPE (TREE_TYPE (arg))) == ARRAY_TYPE) { /* va_list_arg_type_node is a pointer to a va_list; return *ARG_SVAL. */ diff --git a/gcc/testsuite/gcc.dg/analyzer/stdarg-1-ms_abi.c b/gcc/testsuite/gcc.dg/analyzer/stdarg-1-ms_abi.c index b0143a7d3e3..e55f10de66b 100644 --- a/gcc/testsuite/gcc.dg/analyzer/stdarg-1-ms_abi.c +++ b/gcc/testsuite/gcc.dg/analyzer/stdarg-1-ms_abi.c @@ -435,3 +435,9 @@ void test_va_arg_after_return (void) __analyzer_called_by_test_va_arg_after_return (42, 1066); i = __builtin_va_arg (global_ap, int); /* { dg-warning "dereferencing pointer 'global_ap' to within stale stack frame" } */ } + +void pr107349 (void) +{ + __builtin_ms_va_list x,y; + __builtin_ms_va_copy(x,y); /* { dg-warning "use of uninitialized value 'y'" } */ +} /* { dg-warning "missing call to 'va_end'" } */ diff --git a/gcc/testsuite/gcc.dg/analyzer/stdarg-1-sysv_abi.c b/gcc/testsuite/gcc.dg/analyzer/stdarg-1-sysv_abi.c index 1dc97ea3a44..fb49b3584e2 100644 --- a/gcc/testsuite/gcc.dg/analyzer/stdarg-1-sysv_abi.c +++ b/gcc/testsuite/gcc.dg/analyzer/stdarg-1-sysv_abi.c @@ -435,3 +435,9 @@ void test_va_arg_after_return (void) __analyzer_called_by_test_va_arg_after_return (42, 1066); i = __builtin_va_arg (global_ap, int); /* { dg-warning "dereferencing pointer 'global_ap' to within stale stack frame" } */ } + +void pr107349 (void) +{ + __builtin_sysv_va_list x,y; + __builtin_sysv_va_copy(x,y); /* { dg-warning "use of uninitialized value 'y'" } */ +} /* { dg-warning "missing call to 'va_end'" } */ diff --git a/gcc/testsuite/gcc.dg/analyzer/stdarg-1.c b/gcc/testsuite/gcc.dg/analyzer/stdarg-1.c index f23d28c5b89..f2766a50522 100644 --- a/gcc/testsuite/gcc.dg/analyzer/stdarg-1.c +++ b/gcc/testsuite/gcc.dg/analyzer/stdarg-1.c @@ -431,3 +431,9 @@ void test_va_arg_after_return (void) __analyzer_called_by_test_va_arg_after_return (42, 1066); i = __builtin_va_arg (global_ap, int); /* { dg-warning "dereferencing pointer 'global_ap' to within stale stack frame" } */ } + +void pr107349 (void) +{ + __builtin_va_list x,y; + __builtin_va_copy(x,y); /* { dg-warning "use of uninitialized value 'y'" } */ +} /* { dg-warning "missing call to 'va_end'" } */