From patchwork Tue Mar 11 14:57:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominik Mascherbauer X-Patchwork-Id: 107695 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2AEE83857BB9 for ; Tue, 11 Mar 2025 15:00:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2AEE83857BB9 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=CHeoHgYL X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by sourceware.org (Postfix) with ESMTPS id A2087385840D for ; Tue, 11 Mar 2025 14:57:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A2087385840D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A2087385840D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::630 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741705052; cv=none; b=nGTpZr/2BVHpFruWUGUQ6dvIPYIe27Mk7Bl7zx9xqYiAsrBLWukheYiEas+eudsZSOlqhXlzIIk5xH8AYWZwH5JnD0CGz5SQTfdcEsTPbKxjQZuE9y8PKe7xi33Qf0Kh3SqS8YQnwMF47VR3zlvZT+JRlKn6BuO0pRR5gm3QWNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741705052; c=relaxed/simple; bh=Zzk+HS+6H7orPIqbejove/J1NKJr/qf+0GJezsTBWUM=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=ce1BMHiCu9B+9Ou+Gt9Wk45I0Rihn7FIhdqAcuksDlsUCNuS+QVo/eu+8WJTJfXwJxgjWgOOfJ3jmiDoNz44Mmp7YTsV1+EmTUlshNPHRPZj79ZFCD9Iz8kmz+DuaLW5pVVoqddJDgxAqpuDV0CACvnhVeRbykVRPxJS8Ocd+SQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A2087385840D Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-aaecf50578eso990360066b.2 for ; Tue, 11 Mar 2025 07:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741705051; x=1742309851; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=92oyP1FP9mrDB7wfOzbrHjA+gwInowm/nf4UHLE2M7w=; b=CHeoHgYLZVaEJfm+5Vc1py1SIngaGZiR4DxDPySHE683KGGexdsTM0n1Ue9+wkbaV4 EuozK3HTgpQ6BxVvzdbNqGxJvR29ITjT2ihlxtySehpil36uVrRGuDjL5cszCspQhREW uzNFJqle8rPAQSSvUEr/8PLM1u/ivhWdR3GNwynw2ILvrv2wVxv/Dk32AUkHzFkq98ZG FMkjeMhFgg2i1Op9aOdmS6w48j8bcgTZW9cpV8+zT+cS1Awwe+4KwTJiOGhx65k+GxXn 3l/h2uUQzOrbFAqqgvZP9YaiBzbhNV1Q427Q29TVMf8SA4mXwUbQMuzvXfkH8KHn70KG EHig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741705051; x=1742309851; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=92oyP1FP9mrDB7wfOzbrHjA+gwInowm/nf4UHLE2M7w=; b=QeOOzapT6hens64nO+QFyWtMnZyJBbXhesy0f6eWgf+0cVI7H2HK6subpqACwagv1p LHYavPDkWxbHtYzXGvJeuz/NODSW3JaTSozIMdzC2uVo+6mbuus8EwIpyn53DF07FCke pDP2e1NvtSOEiTKMqdm9zwZy+l/KSwE7/livI0VpRavvzhJXuEHa3EcuBxOXdQ2ApQNo 1c4DPpu+a8GgEWXWZCbu2rad5UbdWL8L01oZoaIcQRd0nXrWmPTioR5yCC3JkAVN0zH2 iBcZq1V/jwbLrZqnqg6g03tGwqKvgoacwTNNiLj/lp8IERetbEIZ8JoBNhTznOJ27sHg gp7g== X-Gm-Message-State: AOJu0YySLsTFZ/rrWCx3efvfKJ4mv4FhgshzAPLzWEikE8H6ejkErs7P GxFON2sxsD12/uM7avGpoPNwLpcGECIarCm7qLVsMgzKG8tX5MhuLBBFEA== X-Gm-Gg: ASbGnctCiRJboALSP3Ps7/LK0ky9W4c6rTwOAIL5WYePWx+4DeE0ud1HgnKssHmvEvm V5ISuFXEglhVZwGV7zCQfycAyc6p6XgD14Ub0wGhTvcucw4HWITfIOZd+2F+R08h/5nTLVaXgZj F1mX1L28NOPg+GjvLrfyfXJF6MzJXum8zn/Fo6vX2wrqOLjVqbf9C3Nkc3syCe64bWp4YnAFhX4 KOeTcwJon/QGD/aTbYrITNavQC5KBgQfMUoql9SQWiUMdqMznrOGBTvtfpTBAIHE4bQGldV7U1Z Bj71h+NSmkYKMU1bpvYDqoZO/NHhRgVFWNDlZtO23kiTNTLbk9vhVQjNQHR/zyr0ZMMr X-Google-Smtp-Source: AGHT+IENTMIvk/Nd3UK3RnlZoTJdXGDfSwhHfiC+Oo0cumaIwj9jTe/vK0AvA8JDgNCeYNG+3ts1nA== X-Received: by 2002:a17:907:c91f:b0:ac2:c1e:dff0 with SMTP id a640c23a62f3a-ac252a88554mr1326204966b.19.1741705050696; Tue, 11 Mar 2025 07:57:30 -0700 (PDT) Received: from pop-os.ssw.jku.at ([140.78.145.202]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac239439074sm945195866b.10.2025.03.11.07.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 07:57:30 -0700 (PDT) From: dominikmascherbauer X-Google-Original-From: dominikmascherbauer To: gdb-patches@sourceware.org Cc: dominikmascherbauer Subject: [PATCH 1/3] Add new commands for controlling type signature fallback. Date: Tue, 11 Mar 2025 15:57:18 +0100 Message-Id: <9c04ac7d791b96d90c624fba5333f2e9009393a3.1741701275.git.dominik.mascherbauer@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org 'set dwarf-type-signature-fallback (off|main|full)': Enable type signature fallback. If a type signature is not found in the current objfile, either looks up the 'main' objfile or all objfiles in a progspace to find the type signature. Usually a type signature is unique, ther should only be one type unit for each type signature. Therefore, it should be okay to check other objfile for a type signature. However, whether this is really the case depends on the debug info producer. This is why its disabled by default. 'set dwarf-type-signature-fallback-jit': Whether the type signature fallback is enabled for only JIT objfiles. JIT objfiles are self-contained, but usually share most debug info with some already loaded objfile. This is why JIT objfiles are a major use case for the type signature fallback. This option is added to restrict the type signature fallback to match this exact use-case and provides a more granular use of the type signature fallback. Reviewed-By: Eli Zaretskii --- gdb/NEWS | 14 +++++++++ gdb/doc/gdb.texinfo | 26 +++++++++++++++++ gdb/dwarf2/read.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+) diff --git a/gdb/NEWS b/gdb/NEWS index 2c504a9b603..53368d7463c 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -261,6 +261,20 @@ disable missing-objfile-handler LOCUS HANDLER or can be a regular expression which is matched against the filename of the primary executable in each program space. +set dwarf-type-signature-fallback (off|main|full) + New command which enables a type signature lookup fallback, if a + dwarf objfile from a JIT compilation does not provide its own type + units, but relies on type units from other objfiles. The 'main' + setting allows to limit the scope of the lookup to just the main + symfile objfile, 'full' uses all objfiles in a progspace. + The default value is 'off'. + +set dwarf-type-signature-fallback-jit on|off + New command that is used in combination with type-signature-fallback + and is on by default. If type signature fallback is enabled, + this restricts the fallback to objfiles that were loaded with the + JIT debug interface. + * Changed commands remove-symbol-file diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 04719bf65e6..901152dd15e 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -42325,6 +42325,32 @@ Symbol "argc" is a complex DWARF expression: For more information on these expressions, see @uref{http://www.dwarfstd.org/, the DWARF standard}. +@kindex set dwarf-type-signature-fallback +@kindex show dwarf-type-signature-fallback +@item set dwarf-type-signature-fallback @samp{full|main|off} +@itemx show dwarf-type-signature-fallback +Control the behavior of the type signature lookup for type units if a +type signature is undefined within an objfile. + +The default is @code{off}, which means @value{GDBN} will not use other +objfiles in the progspace to lookup missing type signatures. When +@code{main}, @value{GDBN} will check the current main objfile for a +missing signatured type. When @code{full}, all objfiles in the current +progspace will be searched for the missing signatured type. + +@kindex set dwarf-type-signature-fallback-jit +@kindex show dwarf-type-signature-fallback-jit +@item set dwarf-type-signature-fallback-jit +@itemx show dwarf-type-signature-fallback-jit + +Control whether @code{dwarf type-signature-fallback} is limited to +objfiles originated from the JIT interface (@pxref{JIT Interface}) +or all objfiles with a missing signatured type. + +The default is @code{on}, which limits the type signature fallback to +only objfiles from the JIT interface. When @code{off}, the type signature +fallback will look for missing signatured types for all objfiles. + @kindex maint set dwarf max-cache-age @kindex maint show dwarf max-cache-age @item maint set dwarf max-cache-age diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index c5375b68567..dc8cc7652d9 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -737,6 +737,49 @@ show_dwarf_max_cache_age (struct ui_file *file, int from_tty, value); } +/* If the type for a type signature is not found in the CUs objfile + fallback to other objfiles for type signature resolution */ +const char type_signature_fallback_off[] = "off"; +const char type_signature_fallback_main[] = "main"; +const char type_signature_fallback_full[] = "full"; +static const char *type_signature_fallback_enums[] = + { + type_signature_fallback_off, + type_signature_fallback_main, + type_signature_fallback_full, + nullptr + }; +static const char *type_signature_fallback = type_signature_fallback_off; + +static void +show_type_signature_fallback (struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) +{ + gdb_printf (file, _ ("Resolution of type signatures with " + "fallback objfiles is %s.\n"), + value); +} + +/* Type signature fallback is by default restricted to only jit objfiles. */ +static bool type_signature_fallback_jit = true; + +static void +show_type_signature_fallback_jit (struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) +{ + gdb_printf (file, _ ("Whether type signature resolution with " + "fallback objfiles is restricted to jit objfiles is %s.\n"), + value); +} + +/* Check if type signature fallback applies to OBJFILE. */ +static bool +use_type_signature_fallback (struct objfile *objfile) +{ + return type_signature_fallback != type_signature_fallback_off && + (!type_signature_fallback_jit || objfile->flags & OBJF_JIT); +} + /* When true, wait for DWARF reading to be complete. */ static bool dwarf_synchronous = false; @@ -20103,6 +20146,33 @@ caching, which can slow down startup."), &set_dwarf_cmdlist, &show_dwarf_cmdlist); + add_setshow_enum_cmd ("dwarf-type-signature-fallback", class_support, + type_signature_fallback_enums, &type_signature_fallback, + _ ("\ +Set resolution of type signatures with other objfiles as fallback."), _ ("\ +Show resolution of type signatures with other objfiles as fallback."), _ ("\ +This option will only take effect if set before loading symbols.\n\ +off == turn type signature fallback off\n\ +main == use the main symbolfile as fallback objfile\n\ + for type signature resolution\n\ +full == use all objfiles with type units in the current progspace\n\ + as fallback objfiles for type signature resolution."), + NULL, show_type_signature_fallback, &setlist, + &showlist); + + add_setshow_boolean_cmd ("dwarf-type-signature-fallback-jit", class_support, + &type_signature_fallback_jit, + _ ("\ +Set wether resolution of type signatures with other objfiles as fallback\n\ +is restricted to jit objfiles."), _ ("\ +Show resolution of type signatures with other objfiles as fallback\n\ +is restricted to jit objfiles."), _ ("\ +By default, type signature resolution with fallback objfiles is restricted\n\ +to jit objfiles.\n\ +This option will only take effect if type-signature-fallback is enabled."), + NULL, show_type_signature_fallback_jit, &setlist, + &showlist); + add_setshow_boolean_cmd ("synchronous", class_obscure, &dwarf_synchronous, _("\ Set whether DWARF is read synchronously."), _("\ From patchwork Tue Mar 11 14:57:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominik Mascherbauer X-Patchwork-Id: 107694 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D14223857836 for ; Tue, 11 Mar 2025 15:00:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D14223857836 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=aYBoZUTV X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id DC8343858288 for ; Tue, 11 Mar 2025 14:57:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC8343858288 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DC8343858288 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::62e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741705054; cv=none; b=KMazaU5Mxs/YseZKqDKub3yFejibgQrofx7++SpTY5phQFfUrQB1VvlaN+H/7CkD8UPWmoEJ5YBgnu/i3Gp3qXN5HWkL6lnbM+vmt+XsIZyxK4arSVx069zaHKS8E8w3Y6pnaW54fdM8z+G6d8rW+gO2M8eSif4GuWxtFQpJ+Y8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741705054; c=relaxed/simple; bh=ASA6idqfCgZX97lCjq9dCdWlR3g/DbexOMVJPY0KpDk=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Dobbo/ggqMwjmyHH0FpvxpuR1/3Wo4aDcx5AUJnVD6vs48TQh8JnejPhJ3iXMgMb26kHNk9L50r1d1dR2ZbmnHDjxFgZcUFwEPlSHMFbbXgsyvQbnghiRQMm92qQ81nAoUJvE8HuyJ2z9hIk8eag4NRl5m3TSAGO8zZ0480Xys8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-aaeec07b705so881306766b.2 for ; Tue, 11 Mar 2025 07:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741705052; x=1742309852; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0974Xrde6t4so8sdGmPqYwoiutG9hrj1EDL5JBMCb80=; b=aYBoZUTVzaXag3rBp4vbcBSyR4V8l4f8UblmjE1q5PaeBvxYlrn9taVL7pW07uiXUt H1G/40hjNpMBP1J2tbSj1iRcy03P0SyOu90hWYKJHBdOPE59VSVw6BBeJpjLsy3jzYyK Sndr4GhKAW0D3AF5k5PE8hI/xFFVZgrPjNxqpnoce4RTeMhF5YU8PP/fCqar9czR69ah /vz0yBGIk7XsDuarpFEr/pt+rHpRL/zgByxuBbpOBBSsgxbU6INisIIFJF0TEyY0FFKM QUftuENTb95ijj3MSu/e3t+o63EJGSv9G32hxROuJ56XeZTE7SO/mNc2LY0DMU7js+/p WwuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741705052; x=1742309852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0974Xrde6t4so8sdGmPqYwoiutG9hrj1EDL5JBMCb80=; b=C1UVKNbw+gFpPVoE1teb+wC93zWn18q1DICSfHEOGGjkjDH75E64/6Kwne1ud1p33S hjnDVpCTn2QU0bOBqkHh5wvH+zPJpPGR5rtHsvxwwwBhXivCkFP0GuODuncDHSImOjRN DuuJ0oWN5gU8ufCJtq86i2uB5YWNvbIkgQEkL9t0wfUeZ3ECx0oH+d0G47JOp1GHrA1D 1HDRqHk/2AB62LfX5AeSIhDRM3zlGT30JHwqWNJSqTjxv0Iv3n6XJZf4HGwCieQuPKd1 Fbsqz8Cl6H9PqemM8qqb+sMis0m2yQ1h88XD2N/Lp5gyJwDVKCji5nyW1wXtNf2bBuFM UT8A== X-Gm-Message-State: AOJu0Yya/rq76EjxymR0TzJxa3dgyBRsxxyiAoEaVHP7itjXtwqH6kPV +P0xaLsXq6raqVfPg+AmUf722JTXQAeHBXWjsjksvBNRTEJxbxZPiy378w== X-Gm-Gg: ASbGncsNz0B8yX6Vo0t+L5vtQfNyNQK+C5jL6MKREou8RwgaaADeEtKSByiB2tyCxjs LgyB7xkeknIFrz9b0oXLscryDCXlFvQpRezItYGDtWsvAt7AuN7Tdcs999ZNFfhmHmppvqB7IWs gVYeS56/dAVzgedorLm/uUviIjLNOUBYvvAwIr37gStZzhDInSJTb52IjtymlS3V+drSTuNJY7+ XGxls6QyLOK1OjGBYlQJVv6LAt4SjdiXhVTUSD/WtS0OaiAE88o/5NG8j8o7e+H0BbwvjG4j+lw WOeoyQe2oWknaCfRM5QhmWsgK3QHJsT7t+xlmWv55PEad7B6zcELnhQxbuynjUBbAvWCmdIq/qo 523M= X-Google-Smtp-Source: AGHT+IEuIsTfNv6xIeRuWj7wxT8xceifdrvahv9N5mG2wlmh6mBhx6UJCsF7P7gWWzb9VVR+6tbSPw== X-Received: by 2002:a17:907:3f9f:b0:abf:6b14:6cfb with SMTP id a640c23a62f3a-ac2b9db4897mr455136766b.5.1741705051905; Tue, 11 Mar 2025 07:57:31 -0700 (PDT) Received: from pop-os.ssw.jku.at ([140.78.145.202]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac239439074sm945195866b.10.2025.03.11.07.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 07:57:30 -0700 (PDT) From: dominikmascherbauer X-Google-Original-From: dominikmascherbauer To: gdb-patches@sourceware.org Cc: dominikmascherbauer Subject: [PATCH 2/3] Add type signature fallback and JIT objfile restriction. Date: Tue, 11 Mar 2025 15:57:19 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org To support type signature fallback, the lookup_signatured_type method is extended. If no type signature was found in the current objfile or in a dwo file, the dwraf-type-signature-fallback option is checked: 'off': return nullptr 'main': only check the current main objfile for the type signature. This reduces the additional load for a fallback as only one additional objfile is checked. The main objfile often contains major parts of the debug info, thus it is also likely that the requested type signature is found there. If the main objfile is linked to dwo/dwp files, those are also checked for the type signature. This should be the same behavior as if the type signature is lookup up without fallback. 'full': check all objfiles in the current prospace. Requires potentially more time than just checking the main objfile, but it will also find a type signature in a loaded shared library. If a type signature was found in a fallback objfile, the per_objfile after lookup_signatured_type is the fallback per_objfile. This ensures that if the type unit still needs to be read, it is read from the correct objfile. Additionally, a flag is added to objfiles that marks an objfile as a JIT objfile. With this information the type signature fallback can be restricted to only work for JIT objfiles. This is a separate option because JIT objfile are self-contained but usually share debug info (especially type information) with some other already loaded objfile. So this leaves loading other objfiles as is to avoid unexpected behavior if needed. --- gdb/dwarf2/read.c | 184 +++++++++++++++++++++++++++++++++++++------- gdb/jit.c | 6 +- gdb/objfile-flags.h | 3 + 3 files changed, 162 insertions(+), 31 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index dc8cc7652d9..2c02f17e85a 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -2668,12 +2668,12 @@ fill_in_sig_entry_from_dwo_entry (dwarf2_per_objfile *per_objfile, to read all the DWOs to build the type unit groups. */ static struct signatured_type * -lookup_dwo_signatured_type (struct dwarf2_cu *cu, ULONGEST sig) +lookup_dwo_signatured_type (struct dwo_unit *dwo_unit, ULONGEST sig, + struct dwarf2_per_objfile *per_objfile) { - dwarf2_per_objfile *per_objfile = cu->per_objfile; dwarf2_per_bfd *per_bfd = per_objfile->per_bfd; - gdb_assert (cu->dwo_unit); + gdb_assert (dwo_unit); /* We only ever need to read in one copy of a signatured type. Use the global signatured_types array to do our own comdat-folding @@ -2696,14 +2696,14 @@ lookup_dwo_signatured_type (struct dwarf2_cu *cu, ULONGEST sig) && (*sig_type_it)->tu_read) return *sig_type_it; - /* Note: cu->dwo_unit is the dwo_unit that references this TU, not the + /* Note: dwo_unit is the dwo_unit that references this TU, not the dwo_unit of the TU itself. */ - dwo_file *dwo_file = cu->dwo_unit->dwo_file; + dwo_file *dwo_file = dwo_unit->dwo_file; auto it = dwo_file->tus.find (sig); if (it == dwo_file->tus.end ()) return nullptr; - dwo_unit *dwo_entry = *it; + struct dwo_unit *dwo_entry = *it; /* If the global table doesn't have an entry for this TU, add one. */ if (sig_type_it == per_bfd->signatured_types.end ()) @@ -2723,13 +2723,12 @@ lookup_dwo_signatured_type (struct dwarf2_cu *cu, ULONGEST sig) it won't be in .gdb_index. */ static struct signatured_type * -lookup_dwp_signatured_type (struct dwarf2_cu *cu, ULONGEST sig) +lookup_dwp_signatured_type (ULONGEST sig, + struct dwarf2_per_objfile *per_objfile) { - dwarf2_per_objfile *per_objfile = cu->per_objfile; dwarf2_per_bfd *per_bfd = per_objfile->per_bfd; struct dwp_file *dwp_file = get_dwp_file (per_objfile); - gdb_assert (cu->dwo_unit); gdb_assert (dwp_file != NULL); auto sig_type_it = per_bfd->signatured_types.find (sig); @@ -2755,34 +2754,133 @@ lookup_dwp_signatured_type (struct dwarf2_cu *cu, ULONGEST sig) return *sig_type_it; } +/* Subroutine of lookup_signatured_type. + Look up the type for signature SIG, from a fallback objfile. + If we don't have a DWO/DWP file or can't find the signature there, check the + fallback object file. + If a signatured type was found, PER_OBJFILE will contain its per_objfile. */ + +static struct signatured_type * +lookup_fallback_signatured_type (struct objfile *fallback_objfile, ULONGEST sig, + struct dwarf2_per_objfile **per_objfile) +{ + struct signatured_type *sig_type = nullptr; + + /* If we have a separate debug objfile, use it for the fallback. */ + if (fallback_objfile->separate_debug_objfile != nullptr) + fallback_objfile = fallback_objfile->separate_debug_objfile; + + struct dwarf2_per_objfile *fallback_per_objfile = get_dwarf2_per_objfile + (fallback_objfile); + + /* The fallback objfile must be different to the current objfile. Otherwise, + this is no fallback so all necessary checks were already performed in + lookup_signatured_type. */ + if (fallback_per_objfile == *per_objfile) + return nullptr; + + /* Do we have a dwp file? */ + if (get_dwp_file (fallback_per_objfile) != nullptr) + { + sig_type = lookup_dwp_signatured_type (sig, fallback_per_objfile); + } + /* Do we have dwo files? */ + else + { + /* Look for dwo_entry that contains the signatured type. */ + for (const dwo_file_up &file : fallback_per_objfile->per_bfd->dwo_files) + { + auto it = file->tus.find (sig); + if (it != file->tus.end ()) + { + /* We found the dwo entry. Check for the signatured type. */ + sig_type = lookup_dwo_signatured_type (*it, sig, + fallback_per_objfile); + break; + } + } + } + + /* Do we still need to check the fallback per_objfile or was the signatured + type found in a DWO/DWP file? */ + if (sig_type == nullptr) + { + auto sig_type_it + = fallback_per_objfile->per_bfd->signatured_types.find (sig); + + if (sig_type_it != fallback_per_objfile->per_bfd->signatured_types.end ()) + sig_type = *sig_type_it; + } + + if (sig_type != nullptr) + /* Ensure we will know where the signature type came from. */ + *per_objfile = fallback_per_objfile; + return sig_type; +} + /* Lookup a signature based type for DW_FORM_ref_sig8. Returns NULL if signature SIG is not present in the table. - It is up to the caller to complain about this. */ + It is up to the caller to complain about this. + If type_signature_fallback is enabled and the signatured type is found, + per_objfile is the objfile where the signatured type was found in. */ static struct signatured_type * -lookup_signatured_type (struct dwarf2_cu *cu, ULONGEST sig) +lookup_signatured_type (struct dwarf2_cu *cu, ULONGEST sig, + struct dwarf2_per_objfile **per_objfile) { - dwarf2_per_objfile *per_objfile = cu->per_objfile; - dwarf2_per_bfd *per_bfd = per_objfile->per_bfd; + struct signatured_type *sig_type = nullptr; + dwarf2_per_bfd *per_bfd = (*per_objfile)->per_bfd; if (cu->dwo_unit) { /* We're in a DWO/DWP file, and we're using .gdb_index. - These cases require special processing. */ - if (get_dwp_file (per_objfile) == NULL) - return lookup_dwo_signatured_type (cu, sig); + These cases require special processing. */ + if (get_dwp_file (*per_objfile) == nullptr) + sig_type = lookup_dwo_signatured_type (cu->dwo_unit, sig, *per_objfile); else - return lookup_dwp_signatured_type (cu, sig); + sig_type = lookup_dwp_signatured_type (sig, *per_objfile); + + /* If we already found the signatured type, return it. */ + if (sig_type != nullptr) + return sig_type; } else { + /* Lookup type signature in the current objfile. */ auto sig_type_it = per_bfd->signatured_types.find (sig); + /* If we already found the signatured type, return it. */ if (sig_type_it != per_bfd->signatured_types.end ()) return *sig_type_it; + } - return nullptr; + /* Handle fallback if type signature lookup fallback is enabled for this + objfile. */ + if (use_type_signature_fallback ((*per_objfile)->objfile)) + { + /* Do a full fallback through all objfiles in the progspace. */ + if (type_signature_fallback == type_signature_fallback_full) + { + for (objfile *objfile: (*per_objfile)->objfile->pspace ()->objfiles ()) + { + sig_type = lookup_fallback_signatured_type (objfile, sig, + per_objfile); + /* If we already found the signatured type, return it. */ + if (sig_type != nullptr) + return sig_type; + } + } + else + { + /* fallback to main symfile objfile. */ + struct objfile *objfile + = (*per_objfile)->objfile->pspace ()->symfile_object_file; + return lookup_fallback_signatured_type (objfile, sig, per_objfile); + } } + + /* We could not find the signatured type. */ + return nullptr; } /* Low level DIE reading support. */ @@ -4332,8 +4430,19 @@ maybe_queue_comp_unit (struct dwarf2_cu *dependent_cu, dwarf2_per_cu *per_cu, bool queued = false; if (!per_objfile->symtab_set_p (per_cu)) { - /* Add it to the queue. */ - queue_comp_unit (per_cu, per_objfile, pretend_language); + if (dependent_cu != nullptr && !per_objfile->queue.has_value () && + type_signature_fallback != type_signature_fallback_off) + { + /* If the signatured type in the fallback objfile references another + signatured type we might end up here with no queue in the fallback + objfile. */ + dw2_instantiate_symtab (per_cu, per_objfile, false); + } + else + { + /* Add it to the queue. */ + queue_comp_unit (per_cu, per_objfile, pretend_language); + } queued = true; dwarf_read_debug_printf ("Queuing CU for expansion: " @@ -8382,7 +8491,7 @@ static int queue_and_load_dwo_tu (dwo_unit *dwo_unit, dwarf2_cu *cu) { ULONGEST signature = dwo_unit->signature; - signatured_type *sig_type = lookup_dwo_signatured_type (cu, signature); + signatured_type *sig_type = lookup_dwo_signatured_type (cu->dwo_unit, signature, cu->per_objfile); if (sig_type != NULL) { @@ -18984,6 +19093,7 @@ dwarf2_get_die_type (cu_offset die_offset, dwarf2_per_cu *per_cu, static struct die_info * follow_die_sig_1 (struct die_info *src_die, struct signatured_type *sig_type, + struct dwarf2_per_objfile *sig_type_per_objfile, struct dwarf2_cu **ref_cu) { struct dwarf2_cu *sig_cu; @@ -18999,12 +19109,14 @@ follow_die_sig_1 (struct die_info *src_die, struct signatured_type *sig_type, Even if maybe_queue_comp_unit doesn't require us to load the CU's DIEs, it doesn't mean they are currently loaded. Since we require them to be loaded, we must check for ourselves. */ - if (maybe_queue_comp_unit (*ref_cu, sig_type, per_objfile, + if (maybe_queue_comp_unit (*ref_cu, sig_type, sig_type_per_objfile, language_minimal) - || per_objfile->get_cu (sig_type) == nullptr) - read_signatured_type (sig_type, per_objfile); + || sig_type_per_objfile->get_cu (sig_type) == nullptr) + { + read_signatured_type (sig_type, sig_type_per_objfile); + } - sig_cu = per_objfile->get_cu (sig_type); + sig_cu = sig_type_per_objfile->get_cu (sig_type); gdb_assert (sig_cu != NULL); gdb_assert (to_underlying (sig_type->type_offset_in_section) != 0); @@ -19040,7 +19152,8 @@ follow_die_sig (struct die_info *src_die, const struct attribute *attr, gdb_assert (attr->form == DW_FORM_ref_sig8); - sig_type = lookup_signatured_type (*ref_cu, signature); + dwarf2_per_objfile *sig_type_per_objfile = (*ref_cu)->per_objfile; + sig_type = lookup_signatured_type (*ref_cu, signature, &sig_type_per_objfile); /* sig_type will be NULL if the signatured type is missing from the debug info. */ if (sig_type == NULL) @@ -19052,7 +19165,7 @@ follow_die_sig (struct die_info *src_die, const struct attribute *attr, objfile_name ((*ref_cu)->per_objfile->objfile)); } - die = follow_die_sig_1 (src_die, sig_type, ref_cu); + die = follow_die_sig_1 (src_die, sig_type, sig_type_per_objfile, ref_cu); if (die == NULL) { src_die->error_dump (); @@ -19079,7 +19192,8 @@ get_signatured_type (struct die_info *die, ULONGEST signature, struct die_info *type_die; struct type *type; - sig_type = lookup_signatured_type (cu, signature); + dwarf2_per_objfile *sig_type_per_objfile = per_objfile; + sig_type = lookup_signatured_type (cu, signature, &sig_type_per_objfile); /* sig_type will be NULL if the signatured type is missing from the debug info. */ if (sig_type == NULL) @@ -19098,7 +19212,7 @@ get_signatured_type (struct die_info *die, ULONGEST signature, return type; type_cu = cu; - type_die = follow_die_sig_1 (die, sig_type, &type_cu); + type_die = follow_die_sig_1 (die, sig_type, sig_type_per_objfile, &type_cu); if (type_die != NULL) { /* N.B. We need to call get_die_type to ensure only one type for this DIE @@ -19125,6 +19239,18 @@ get_signatured_type (struct die_info *die, ULONGEST signature, type = build_error_marker_type (cu, die); } + if (type_signature_fallback != type_signature_fallback_off) + { + /* We might already have read the required signatured type + after looking for it in a fallback objfile */ + struct type *existing_type = per_objfile->get_type_for_signatured_type + (sig_type); + if (existing_type != nullptr) + { + gdb_assert (type == existing_type); + return type; + } + } per_objfile->set_type_for_signatured_type (sig_type, type); return type; diff --git a/gdb/jit.c b/gdb/jit.c index d55e371b02a..ce19591c378 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -664,7 +664,8 @@ jit_object_close_impl (struct gdb_symbol_callbacks *cb, priv_data->entry.symfile_addr)); objfile *objfile = objfile::make (nullptr, current_program_space, - objfile_name.c_str (), OBJF_NOT_FILENAME); + objfile_name.c_str (), + OBJF_NOT_FILENAME | OBJF_JIT); objfile->section_offsets.push_back (0); objfile->sect_index_text = 0; objfile->per_bfd->gdbarch = priv_data->gdbarch; @@ -801,7 +802,8 @@ JITed symbol file is not an object file, ignoring it.\n")); objfile = symbol_file_add_from_bfd (nbfd, bfd_get_filename (nbfd.get ()), 0, &sai, - OBJF_SHARED | OBJF_NOT_FILENAME, NULL); + OBJF_SHARED | OBJF_NOT_FILENAME | + OBJF_JIT, NULL); add_objfile_entry (objfile, entry_addr, code_entry->symfile_addr, code_entry->symfile_size); diff --git a/gdb/objfile-flags.h b/gdb/objfile-flags.h index e0a84bcdc2e..0ad6e4037dd 100644 --- a/gdb/objfile-flags.h +++ b/gdb/objfile-flags.h @@ -56,6 +56,9 @@ enum objfile_flag : unsigned /* User requested that we do not read this objfile's symbolic information. */ OBJF_READNEVER = 1 << 6, + + /* Set if this objfile originates from a JIT compilation */ + OBJF_JIT = 1 << 7, }; DEF_ENUM_FLAGS_TYPE (enum objfile_flag, objfile_flags); From patchwork Tue Mar 11 14:57:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominik Mascherbauer X-Patchwork-Id: 107696 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6A3463857706 for ; Tue, 11 Mar 2025 15:01:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6A3463857706 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=NTfpf+hl X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id CC2F03858294 for ; Tue, 11 Mar 2025 14:57:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CC2F03858294 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CC2F03858294 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::432 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741705055; cv=none; b=v34UyEcZOZP8158qTSWP2/fFL6wVzibmOwCTMemAcmpPvNkVbPWVwz3coQGUXA+v/ePPGm5CYDLPKU9A/X22CTjJ4ee9w33KzCbO1YZ5fFwSUd4QfOaVL3fZoMiFZnY3wcj2Yl1uUnNduXADZPPpnaCE3ZPH4vsWMnfobBY0VmI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741705055; c=relaxed/simple; bh=1Qky8UHlVkfG94X3ApRXl2xk4iQViTL2uj2oM5RhPyU=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=tm26FDua0+yieLfyb7sTRu7lTN/bjvszcKy8jVMSLkwBxJ8Y3e3QvEoeAUXQUKKWKuoPBvdTIfSIDpUqwNus06rLlZH1e6ufaAZs24GjOiONoJrJ2UHQ3yUYzD8InppRpcpBy+GionX0vUomteMSMm2LccyhoduL5Oo+hPrxqjo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-390fdaf2897so5401855f8f.0 for ; Tue, 11 Mar 2025 07:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741705053; x=1742309853; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RE3i5sWYOv8n4BAWEnW0gLBro5CA0lNgpSz88RSMC3Q=; b=NTfpf+hlO0RHtd17Tcyhxvk3XezcBBzY8usbnwWgmTlRPvnq615bApQ5uBejCdXJJT 8NfDDIoIFWVF50sDmgu+MRtCz+3VLfsnCsqOEJP7KyaAsh1kaknzRZVMRzpaYcNp6mhg UCdqJS5WHAujXbGsCki6BffEJXapMn8ZOooJsYtoOxLMuJ1NG7rf2w3pUTB70AEvI2OZ BUtK/UNGnWHNGVAiAeMeRc8opLbNqDkOcz+awA2vnep3WPeUhslGr8Jw3E2llJNsUb+Y qiVvNYuLB7DYEnEesrkQN8LVaCNHQd4MQVSzlHJ31Te2OLJAUtZC8zbutigWTdsoP0aW LDgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741705053; x=1742309853; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RE3i5sWYOv8n4BAWEnW0gLBro5CA0lNgpSz88RSMC3Q=; b=MO7un1T9Y0HAyYgXEKhhOHAgPsc2hhB/QJ5HXRT2yLbhea8u5Rya3AcPpeDzsmI6Jy EbL6Lwy0aUbLnNXSnBxgpOvDVB7bBMM5TEZ+zQdSV9ZcWhZmqY5JNKKf7POxA8V7M8fR x8xewCTpjwaBBoWV5RYi1FeC2K0CFgtpT1XT3nJFjgy7aFIRsm0NEz0Rt8SY1m96qi1z JSSSwVVhrzdJCAl50rXm6gFUfrZoide2/aIVRpbjiHyOwttuCV2u5MQk3H/2cgGZzH00 7baqP3FRLvSAnwQMSct3mNy+IioqXcuJmXJQT8UpYtdwLQ0vZEdMTOm6jDzyyvSZrPwa lFYg== X-Gm-Message-State: AOJu0YyANtpCYOrdlCkgNe0Ck9vpHNteGsyjVNN4lWVxdkOKTAN9IB9P ZJSuUhkKinWOL0J28S3uV2axI3th2Bc7FbkOET3Euw9XJAdlHHfAOCfobA== X-Gm-Gg: ASbGncuU4PVI99QxmXpboBJHlIIz8sfm05QDL69YTzPUkeIcs3fsk7F2lF/4ZZEguKS iUXP0aUUV6zGV278DZFrlqiOetvIFPxjU1R6uIVO4uvRajBhmsnRBqE7Ztv2Uo0Vt+j5UL2wTqd LSEOFNeYx5coXjbd8EZgqzo6XHAuf0ETo+IasIfYcjC3idcbvNCEI0kjk0lJrzT7wQY2G5Z7BIc Vsw68RSg6ulQAr5Wk8d8aamkh08//aI87YvY56i52H5afBKaD1SiCrNVDbkJn2cnjpteoNrIEkt w3V+AiYOXHRd/xG7QNudFYycOx5R5cpaHSPvxP+R5v+4AeHU1r1dfPKNj+MaGBI4pRjY X-Google-Smtp-Source: AGHT+IHe7nwV3Oi156ddV87WHJkw2/IJwyH/dadp1eOgErPkC101iyju2o2q/0nD3CL8amkYHW1CIw== X-Received: by 2002:a5d:64c7:0:b0:390:e2a3:cb7b with SMTP id ffacd0b85a97d-39132da28a0mr18225276f8f.34.1741705052643; Tue, 11 Mar 2025 07:57:32 -0700 (PDT) Received: from pop-os.ssw.jku.at ([140.78.145.202]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac239439074sm945195866b.10.2025.03.11.07.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 07:57:32 -0700 (PDT) From: dominikmascherbauer X-Google-Original-From: dominikmascherbauer To: gdb-patches@sourceware.org Cc: dominikmascherbauer Subject: [PATCH 3/3] Add testing for type signature fallback. Date: Tue, 11 Mar 2025 15:57:20 +0100 Message-Id: <486562227f9adc935db44ab048eecf7e9f10de2f.1741701275.git.dominik.mascherbauer@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org Create an executable with a type unit that loads a JIT objfile with a reference its type unit. Then in the context of the JIT objfile the type is checked. This causes a type signature lookup with a fallback to the main objfile. --- .../gdb.dwarf2/sig-type-fallback-jit.c | 62 +++++++++++++++ .../gdb.dwarf2/sig-type-fallback-jit.exp | 75 +++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 gdb/testsuite/gdb.dwarf2/sig-type-fallback-jit.c create mode 100644 gdb/testsuite/gdb.dwarf2/sig-type-fallback-jit.exp diff --git a/gdb/testsuite/gdb.dwarf2/sig-type-fallback-jit.c b/gdb/testsuite/gdb.dwarf2/sig-type-fallback-jit.c new file mode 100644 index 00000000000..da83e27ad64 --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/sig-type-fallback-jit.c @@ -0,0 +1,62 @@ +/* This test program is part of GDB, the GNU debugger. + + Copyright 2024 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Simulate loading of JIT code. */ + +#include "../gdb.base/jit-elf-util.h" +#include "../gdb.base/jit-protocol.h" + +/* Must be defined by .exp file when compiling to know + what address to map the ELF binary to. */ +#ifndef LIB_ADDRESS +#error "Must define LOAD_ADDRESS" +#endif +#ifndef LIB_NAME_STRING +#error "Must define LIB_NAME_STRING" +#endif + +int +main () +{ + size_t obj_size; + void *load_addr = (void *) (size_t) (LIB_ADDRESS); + void *addr = load_elf (LIB_NAME_STRING, &obj_size, load_addr); + + /* Link entry at the end of the list. */ + struct jit_code_entry *const entry = calloc (1, sizeof (*entry)); + entry->symfile_addr = (const char *) addr; + entry->symfile_size = obj_size; + __jit_debug_descriptor.relevant_entry = entry; + __jit_debug_descriptor.first_entry = entry; + + /* Notify GDB. */ + __jit_debug_descriptor.action_flag = JIT_REGISTER; + __jit_debug_register_code (); + + // breakpoint 1 + + /* Now unregister entry. */ + /* Notify GDB. */ + __jit_debug_descriptor.action_flag = JIT_UNREGISTER; + __jit_debug_register_code (); + + __jit_debug_descriptor.first_entry = NULL; + __jit_debug_descriptor.relevant_entry = NULL; + free (entry); + + return 0; +} diff --git a/gdb/testsuite/gdb.dwarf2/sig-type-fallback-jit.exp b/gdb/testsuite/gdb.dwarf2/sig-type-fallback-jit.exp new file mode 100644 index 00000000000..91465118c5f --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/sig-type-fallback-jit.exp @@ -0,0 +1,75 @@ +# Copyright 2024 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +load_lib dwarf.exp + +require dwarf2_support allow_shlib_tests + +set lib_address 0x7000000 +set lib_name libfoo.so + +standard_testfile .c .S -lib.S + +# Create fake DWARF TU for the main objfile. +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble ${asm_file} { + tu {version 5} 0x1122334455667788 the_type { + type_unit {} { + the_type: base_type { + {name myType} + {encoding @DW_ATE_signed} + {byte_size 4 sdata} + } + } + } +} + +# Create fake DWARF CU with type reference for the jit object file. +set asm_file_lib [standard_output_file $srcfile3] +Dwarf::assemble ${asm_file_lib} { + cu {} { + compile_unit {} { + declare_labels typedef_label + + typedef_label: typedef { + {name bar} + {type 0x1122334455667788 ref_sig8 } + } + } + } +} + + +set libobj [standard_output_file $lib_name] +if {[build_executable "build shared library" $libobj $asm_file_lib \ + [list debug text_segment=$lib_address shlib]] != 0} { + return -1 +} + +if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile $asm_file] \ + [list debug additional_flags=-DLIB_ADDRESS=$lib_address \ + additional_flags=-DLIB_NAME_STRING=\"$libobj\" ]]} { + return -1 +} + +if {![runto_main]} { + return -1 +} + +gdb_test_no_output "set dwarf-type-signature-fallback main" +gdb_breakpoint [gdb_get_line_number "breakpoint 1"] +gdb_continue_to_breakpoint "first breakpoint" +gdb_test "ptype bar" "type = myType" \ No newline at end of file