@@ -1798,7 +1798,8 @@ fd_state_machine::check_for_new_socket_fd (const call_details &cd,
|| old_state == m_new_datagram_socket
|| old_state == m_new_unknown_socket
|| old_state == m_start
- || old_state == m_stop))
+ || old_state == m_stop
+ || old_state == m_constant_fd))
{
/* Complain about "bind" or "connect" in wrong phase. */
tree diag_arg = sm_ctxt->get_diagnostic_tree (fd_sval);
@@ -1900,6 +1901,7 @@ fd_state_machine::on_listen (const call_details &cd,
if (!check_for_socket_fd (cd, successful, sm_ctxt, fd_sval, node, old_state))
return false;
if (!(old_state == m_start
+ || old_state == m_constant_fd
|| old_state == m_stop
|| old_state == m_bound_stream_socket
|| old_state == m_bound_unknown_socket
@@ -2015,8 +2017,9 @@ fd_state_machine::on_accept (const call_details &cd,
if (!check_for_socket_fd (cd, successful, sm_ctxt, fd_sval, node, old_state))
return false;
- if (old_state == m_start)
- /* If we were in the start state, assume we had the expected state. */
+ if (old_state == m_start || old_state == m_constant_fd)
+ /* If we were in the start state (or a constant), assume we had the
+ expected state. */
sm_ctxt->set_next_state (cd.get_call_stmt (), fd_sval,
m_listening_stream_socket);
else if (old_state == m_stop)
@@ -67,3 +67,8 @@ int test_accept_on_accept (int fd_a)
return fd_b;
}
+
+int test_accept_on_constant ()
+{
+ return accept (0, NULL, 0);
+}
@@ -72,3 +72,8 @@ void test_bind_after_accept (int fd, const char *sockname)
close (afd);
}
+
+int test_bind_on_constant ()
+{
+ return bind (0, NULL, 0);
+}
@@ -44,3 +44,8 @@ void test_connect_after_bind (const char *sockname,
close (fd);
}
+
+int test_connect_on_constant ()
+{
+ return connect (0, NULL, 0);
+}
@@ -52,7 +52,7 @@ void test_listen_on_new_datagram_socket (void)
close (fd);
}
-void test_listed_on_connected_socket (int fd)
+void test_listen_on_connected_socket (int fd)
{
int afd = accept (fd, NULL, 0);
if (afd == -1)
@@ -61,3 +61,8 @@ void test_listed_on_connected_socket (int fd)
/* { dg-message "'listen' expects a bound stream socket file descriptor but 'afd' is connected" "final event" { target *-*-* } .-1 } */
close (afd);
}
+
+int test_listen_on_constant ()
+{
+ return listen (0, 10);
+}
This was crashing inside fd_phase_mismatch's ctor with assertion failure when the state was "fd-constant". Fix the ICE by not complaining about constants passed to these APIs. Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r13-4248-g64fb291c5839e1. gcc/analyzer/ChangeLog: PR analyzer/107783 * sm-fd.cc (fd_state_machine::check_for_new_socket_fd): Don't complain when old state is "fd-constant". (fd_state_machine::on_listen): Likewise. (fd_state_machine::on_accept): Likewise. gcc/testsuite/ChangeLog: PR analyzer/107783 * gcc.dg/analyzer/fd-accept.c (test_accept_on_constant): New. * gcc.dg/analyzer/fd-bind.c (test_bind_on_constant): New. * gcc.dg/analyzer/fd-connect.c (test_connect_on_constant): New. * gcc.dg/analyzer/fd-listen.c (test_listen_on_connected_socket): Fix typo. (test_listen_on_constant): New. Signed-off-by: David Malcolm <dmalcolm@redhat.com> --- gcc/analyzer/sm-fd.cc | 9 ++++++--- gcc/testsuite/gcc.dg/analyzer/fd-accept.c | 5 +++++ gcc/testsuite/gcc.dg/analyzer/fd-bind.c | 5 +++++ gcc/testsuite/gcc.dg/analyzer/fd-connect.c | 5 +++++ gcc/testsuite/gcc.dg/analyzer/fd-listen.c | 7 ++++++- 5 files changed, 27 insertions(+), 4 deletions(-)