X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Ftramp-frame.c;h=b13ca51482221760bfa840abe097bca8b910d57e;hb=7c80aab93666727965c2d5d6e17b1338d88293e0;hp=8f5701e904a3b481be646435429e5e85e8e85e79;hpb=19ba03f49581e407097a3e4821a957c422551ae5;p=binutils-gdb.git

diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c
index 8f5701e904a..b13ca514822 100644
--- a/gdb/tramp-frame.c
+++ b/gdb/tramp-frame.c
@@ -1,6 +1,6 @@
 /* Signal trampoline unwinder, for GDB the GNU Debugger.
 
-   Copyright (C) 2004-2015 Free Software Foundation, Inc.
+   Copyright (C) 2004-2021 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -102,14 +102,15 @@ tramp_frame_start (const struct tramp_frame *tramp,
 	{
 	  gdb_byte buf[sizeof (tramp->insn[0])];
 	  ULONGEST insn;
+	  size_t insn_size = tramp->insn_size;
 
 	  if (tramp->insn[i].bytes == TRAMP_SENTINEL_INSN)
 	    return func;
 	  if (!safe_frame_unwind_memory (this_frame,
-					 func + i * tramp->insn_size,
-					 buf, tramp->insn_size))
+					 func + i * insn_size,
+					 {buf, insn_size}))
 	    break;
-	  insn = extract_unsigned_integer (buf, tramp->insn_size, byte_order);
+	  insn = extract_unsigned_integer (buf, insn_size, byte_order);
 	  if (tramp->insn[i].bytes != (insn & tramp->insn[i].mask))
 	    break;
 	}