From patchwork Fri Mar 8 17:36:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 86988 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 5750D385E009 for ; Fri, 8 Mar 2024 17:36:39 +0000 (GMT) X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 762B13858D38 for ; Fri, 8 Mar 2024 17:36:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 762B13858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 762B13858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709919393; cv=none; b=qnhv8/JmhG23ibWROfYtZOM2zVuGUAkeHiSXxPBEVjIH/m3bxwzATe7Ny45fMZZxt/VOqyurOp5Qb+tiYcf1hKgAtZ+aoUocJQcQosSGGwK0iHH3ZJx9Qg9vbDlVcNl+XHn/gV6F4PvFTdWKd+BOTN7TOKynF53vUXBIzaWgAD8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709919393; c=relaxed/simple; bh=Gb30VrNJaN76DhTeSr0hJL990Pu1yWYhH++hYJhA5UQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Y8PQxVXMGSkOn+lU4bTpvK9fdRj4DPsjHFtLCeJd/SoodCfQHCFwdvwvIppc7bEW7QOmLJk3xTpM+faQFU9yYdyxURJ+J+yXGafLknXmDS3k510BkXxY3OCvCYBFjpucAtb37RgBrAV78d8uBhjUV4VPwwEKI5kZFvQrRiy5Rvk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709919392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=LuXkgLHhTUjuI8b7+NqHKC2Zo02vsOUQ5ZIAu0gDqfU=; b=FJJ9HiFryocWucxlWFijmko3RUntKPFeFsV08uLPTlpyDvZ5heIYnDEzYX3fngy06qb3BE pT488vk1KHil3qPJgBK8yApNt+Iky+5VurDFNZENFsyqv5kx80lFVE2KCFF11BiEZhe7WT Op/I6LSTNgNAmyGhTBN/RcYuyDsj5eY= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-682-UcFXkDtyNFOfX6nkcxu4SQ-1; Fri, 08 Mar 2024 12:36:29 -0500 X-MC-Unique: UcFXkDtyNFOfX6nkcxu4SQ-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-690b05829c8so14490356d6.0 for ; Fri, 08 Mar 2024 09:36:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709919389; x=1710524189; h=mime-version:user-agent:message-id:date:organization:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LuXkgLHhTUjuI8b7+NqHKC2Zo02vsOUQ5ZIAu0gDqfU=; b=VPdStXvmwBxzP9ZVOrTQIDAcaiGEmajgjESSgE25z73f6pAp2jwNcENVxHEBhTdB2D KVzSIk5QKAaaf/9/DSASPLPSNetn/SDoto6AytB1b7p+7kPeI8kHxojPNWNphPHMaD+K qZVC7T+u5pAx4XAg077hsXt5FZt5zsK+6opiDJ7oLmXDTBFixAlsmiluGy0zQ07CaHgh vdOxmh6395TnibhWsFOSMjajICe8d0v1RzWXpy+gFo6z68NNThRGphKlVkCSH9tCVbdt BJUAJTvyYZuvo5iiscS1bjib7QmFp/xNfygHSd4hsMhf/NX9P+tSeNcrqsoWQzqTqaZM HT6Q== X-Gm-Message-State: AOJu0YzQ4q3SzdWa3xxkKaiLnNcoo9RTNl6r8sG91btIut+fO6z/079s 9s3R0CyW7322lKFhh8D2qak6Kpyk+unAg336y2oDstdBLBqvDOwWNju7KxMcwkeQHvCWnVBv7b1 4YvhyZLIuKnE2OVvxhTIe84eEoWHxOxIREWU9dz83Ncsa6eLp7tBeswe1nBwtec6azmYkGTOxmp yHDBsA4nwaJfk6pDndC1jro8J01myoKEHtLcRGmg== X-Received: by 2002:ad4:5913:0:b0:690:ae61:dd2c with SMTP id ez19-20020ad45913000000b00690ae61dd2cmr3758557qvb.34.1709919389207; Fri, 08 Mar 2024 09:36:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IFX3HA8JCzCxiQEMp5VjkRbgemHzvhGE0KT/jmqeRjS/LkD1SXNiw2+4EfVqI92h/kCcnAw9A== X-Received: by 2002:ad4:5913:0:b0:690:ae61:dd2c with SMTP id ez19-20020ad45913000000b00690ae61dd2cmr3758541qvb.34.1709919388832; Fri, 08 Mar 2024 09:36:28 -0800 (PST) Received: from localhost (88-120-130-27.subs.proxad.net. [88.120.130.27]) by smtp.gmail.com with ESMTPSA id lq3-20020a0562145b8300b0069068161388sm7197780qvb.131.2024.03.08.09.36.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 09:36:28 -0800 (PST) Received: by localhost (Postfix, from userid 1000) id 9BE165071022; Fri, 8 Mar 2024 18:36:26 +0100 (CET) From: Dodji Seketeli To: libabigail@sourceware.org Subject: [PATCH, applying to mainline] dwarf-reader: Support creating functions from DW_TAG_inlined_subroutine DIE Organization: Red Hat / France X-Operating-System: AlmaLinux 9.3 X-URL: http://www.redhat.com Date: Fri, 08 Mar 2024 18:36:26 +0100 Message-ID: <87ttlg4odh.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: libabigail@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Hello, While working on something else, I realized the recent support of build_ir_node_from_die for DW_TAG_inlined_subroutine DIEs was triggering an assert violation in build_function_decl. So I am applying the patch below to the mainline to address that. Update the assert in build_function_decl to work on DW_TAG_inlined_subroutine DIEs. * src/abg-dwarf-reader.cc (build_function_decl): Loosen the assert to accept DW_TAG_inlined_subroutine DIEs. Signed-off-by: Dodji Seketeli --- src/abg-dwarf-reader.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 2473588c..dda5507d 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -15348,7 +15348,8 @@ build_function_decl(reader& rdr, function_decl_sptr result = fn; if (!die) return result; - ABG_ASSERT(dwarf_tag(die) == DW_TAG_subprogram); + int tag = dwarf_tag(die); + ABG_ASSERT(tag == DW_TAG_subprogram || tag == DW_TAG_inlined_subroutine); if (!die_is_public_decl(die)) return result;