From ce1c99f1ccd7b1229a4f8531d6b6de6cf571a9ef Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 3 Mar 2023 16:41:29 +0000
Subject: [PATCH] gcc: Adjust gdbhooks.py VecPrinter for vec layout changes
 [PR109006]

gcc/ChangeLog:

	PR middle-end/109006
	* gdbhooks.py (VecPrinter): Adjust for new vec layout.
---
 gcc/gdbhooks.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/gdbhooks.py b/gcc/gdbhooks.py
index c9dea9bf828d..78e6c97c30d7 100644
--- a/gcc/gdbhooks.py
+++ b/gcc/gdbhooks.py
@@ -461,7 +461,11 @@ class VecPrinter:
             return
         m_vecpfx = self.gdbval['m_vecpfx']
         m_num = m_vecpfx['m_num']
-        m_vecdata = self.gdbval['m_vecdata']
+        typ = self.gdbval.type
+        if typ.code == gdb.TYPE_CODE_PTR:
+            typ = typ.target()
+        typ = typ.template_argument(0) # the type T
+        m_vecdata = (self.gdbval.address + 1).cast(typ.pointer())
         for i in range(m_num):
             yield ('[%d]' % i, m_vecdata[i])
 
-- 
2.47.2