From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666644957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbMMZgArPD8rVyyv3Yzpo81sSmWymMf8gjOVaWkmLAs=; b=KC5/K969mH2vZzkHLQzI75AdRde5RF3wjVRtY21LVjqrKp4B9ksgejICiwBiqoko9pMScY Du/K1/Z1NKATiku+VA80tBDbGu8CadDj6E3CMY4haxSUx1e6poeSqCg5LFI5DPnJ3w0kBn iWrkI9rROmM8N8kl5yVAygeaFscgOVQ= 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) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 List-Id: 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'" } */ -- 2.26.3