Auto merge of #97604 - nnethercote:inline-bridge-Buffer-methods, r=eddyb

[rust.git] / src / etc / gdb_providers.py

diff --git a/src/etc/gdb_providers.py b/src/etc/gdb_providers.py
index 33d26db547efc8c2ceed8353904b81652a09bcec..0a52b8c976f6ad87bb0c0482b36736ad6e813b55 100644 (file)
--- a/src/etc/gdb_providers.py
+++ b/src/etc/gdb_providers.py
@@ -12,8 +12,10 @@ FIRST_FIELD = "__1"
 def unwrap_unique_or_non_null(unique_or_nonnull):
     # BACKCOMPAT: rust 1.32
     # https://github.com/rust-lang/rust/commit/7a0911528058e87d22ea305695f4047572c5e067
+    # BACKCOMPAT: rust 1.60
+    # https://github.com/rust-lang/rust/commit/2a91eeac1a2d27dd3de1bf55515d765da20fd86f
     ptr = unique_or_nonnull["pointer"]
-    return ptr if ptr.type.code == gdb.TYPE_CODE_PTR else ptr[ZERO_FIELD]
+    return ptr if ptr.type.code == gdb.TYPE_CODE_PTR else ptr[ptr.type.fields()[0]]
 
 
 class EnumProvider: