From: Tom Tromey <tom@tromey.com>
Date: Sun, 11 Dec 2022 19:48:07 +0000 (-0700)
Subject: Fix crash in is_nocall_function
X-Git-Tag: gdb-13-branchpoint~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=785545988c222f603a7a190170b04d4b971d7959;p=thirdparty%2Fbinutils-gdb.git

Fix crash in is_nocall_function

is_nocall_function anticipates only being called for a function or a
method.  However, PR gdb/29871 points out a situation where an unusual
expression -- but one that parses to a valid, if extremely weird,
function call -- breaks this assumption.

This patch changes is_nocall_function to remove this assert and
instead simply return 'false' in this case.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29871
---

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 2166257f71e..30dd7744553 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -4037,8 +4037,8 @@ type_byte_order (const struct type *type)
 bool
 is_nocall_function (const struct type *type)
 {
-  gdb_assert (type->code () == TYPE_CODE_FUNC
-	      || type->code () == TYPE_CODE_METHOD);
+  if (type->code () != TYPE_CODE_FUNC && type->code () != TYPE_CODE_METHOD)
+    return false;
 
   return TYPE_CALLING_CONVENTION (type) == DW_CC_nocall;
 }
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index d7189ff9813..8fc5c97c95a 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -2845,9 +2845,7 @@ extern unsigned int overload_debug;
    to call by the debugger.
 
    This usually indicates that the function does not follow the target's
-   standard calling convention.
-
-   The TYPE argument must be of code TYPE_CODE_FUNC or TYPE_CODE_METHOD.  */
+   standard calling convention.  */
 
 extern bool is_nocall_function (const struct type *type);
 
diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp
index 5bf03bf1320..7037ef0cd89 100644
--- a/gdb/testsuite/gdb.base/exprs.exp
+++ b/gdb/testsuite/gdb.base/exprs.exp
@@ -271,3 +271,7 @@ gdb_test "print & (void) v_char" "value not located in memory."
 # Regression test for "&&".
 gdb_test "print null_t_struct && null_t_struct->v_int_member == 0" \
     " = 0"
+
+# Regression test for unusual function-call parse that caused a crash.
+gdb_test "print v_short++(97)" \
+    "cast the call to its declared return type"