From patchwork Mon Feb 12 21:26:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 85632 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 870BF3858409 for ; Mon, 12 Feb 2024 21:26:21 +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.129.124]) by sourceware.org (Postfix) with ESMTPS id 869D73858C52 for ; Mon, 12 Feb 2024 21:26:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 869D73858C52 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 869D73858C52 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707773176; cv=none; b=dvlZILIrugnOBrib6qAzOuLwYONfa0YJV6/C1sOAa+eE6QFrRaNZVDsqhOpiCL3VHj9tjXFLfUUMbWOEM99YkUdLPjKusmzXPbhu9pvFZMMA+HzYzgEdsIzJ0+Z0QdLmRlrM2wUIKcTetYVW1SoMuWGetWxr0FBcmiBekwFZKUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707773176; c=relaxed/simple; bh=zMRwH4NsziP94BCUAJmbdKqX39NRPmf27tKe7tAM9OI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Q1VZPYKdw5rEYDy/Nt1HTYo2m+kMvy5++dki3kitfO5AKz95840Ipwginjpo8D7FNHeSYZ+dGcENDq2qkvGt6aMxA9fUGpjXy2OABv89WJjmZ99O7sDerR4N+y0NBsfL3XZUQO08NF7kDtbGs6HXcs2qOAqkruQ55YOhP6+qGjw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707773175; 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=cmZDHqiEI2xAODxWY7KrSIJYDMETaFdJ+gzbdd0Decs=; b=V5PpYIKOnKVPa6q/YB6mt+xYJcy9aFbBnWwrhGt5mFctPoPcw53pl7njvhKO+OsXo9eta9 XB88UdSDGhOZBluOnbNq5+5+cW9bUGfm/qiFZnt9PmJZf6LSh1DB4HwJz4AWnOpyu4FSzj fY8J3NcW+LGNk/ALA0G/4uZOpqLjX6M= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-201-nnxUe9BHPveP9QIh63N4ow-1; Mon, 12 Feb 2024 16:26:14 -0500 X-MC-Unique: nnxUe9BHPveP9QIh63N4ow-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-785d4d3e5f0so160640885a.0 for ; Mon, 12 Feb 2024 13:26:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707773173; x=1708377973; 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=cmZDHqiEI2xAODxWY7KrSIJYDMETaFdJ+gzbdd0Decs=; b=AU7QrL+94Zlv1TzusIRVUKo7rEWusbP2d9m3MetHqCrja8snRVLZ1B6VD5bieZnnX4 1fn9n8EoR5nTqAXIz63mZ68wvKcyoyA8aaQm+9E9kxkQ+PY9C1qzbjIGJe6VGX3tyBAP dqAkrVm7ZJZpFcUJAFiiF9bhXJqjewqsU8gYB/5WvFrClAFm7puIGHM0xU8cyz2LuuVE ZC5UPcxqFFWwJLhZpH7y5uzN2rfQV6BXu/daOZORJJ48MdOvsSlV9IVkUWNr0v4mku+1 d5k4StL9i9b/Y0sQmR75ojCxof5WkczVH6VTilcGXNHQP3lfEYK5WD1+zmEPCMaMG0L6 GP2A== X-Gm-Message-State: AOJu0Yw/cxNUoWhtulTwqcMlXZU0WNNujJVhvsEASfLkCrUzJ9MtxQKP +nvTpER8P0Q247FKcZ2imyp5OdXjgaHdRLncvpIo2a48uvrdXY/SbQr7njYZiJp4BNFqnVyUxq0 qhAhi3r3L2mGwBJ6SRfbyoBPYnwYEIrLVTR7Tri+RuSQmNNIhex1CB/Z/C22vA/mQ1Q== X-Received: by 2002:a05:620a:24d1:b0:783:d709:54e3 with SMTP id m17-20020a05620a24d100b00783d70954e3mr9229239qkn.25.1707773173323; Mon, 12 Feb 2024 13:26:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHvPVgKSQb183fDj34wzjimqSYNgQ/hXyJfLJ6tTxFEfQIpOqBlGSisuQqwuCJ2WrGNYJELVQ== X-Received: by 2002:a05:620a:24d1:b0:783:d709:54e3 with SMTP id m17-20020a05620a24d100b00783d70954e3mr9229227qkn.25.1707773173055; Mon, 12 Feb 2024 13:26:13 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWHYWYLUczuP7VVtavwJAIhWIUq1uZuIDD5wzdb6z4eQKG2ah/9vnwt0x6t2uoD7kOMijmCcM2+k3fsMS9UHrmQ Received: from localhost (88-120-130-27.subs.proxad.net. [88.120.130.27]) by smtp.gmail.com with ESMTPSA id s19-20020a05620a16b300b00785d97bdeddsm860665qkj.99.2024.02.12.13.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 13:26:12 -0800 (PST) Received: by localhost (Postfix, from userid 1000) id 295B7B4FCA; Mon, 12 Feb 2024 22:26:11 +0100 (CET) From: Dodji Seketeli To: libabigail@sourceware.org Subject: [PATCH, applying to mainline] dwarf-reader: Fix detection of C language DIEs Organization: Red Hat / France X-Operating-System: CentOS Stream release 9 X-URL: http://www.redhat.com Date: Mon, 12 Feb 2024 22:26:11 +0100 Message-ID: <874jedz85o.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.4 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_H2, 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, If a DIE comes from C, then for that type, namespace support is disabled. In this case, we mistakenly look at the language of the current translation unit DIE rather than the language of the DIE itself. So we mistakenly find that the DIE comes from C when it actually can come from C++. And we thus mistakenly disable namespaces. Fixed thus. * src/abg-dwarf-reader.cc (build_ir_node_from_die): Use reader::die_is_in_c rather than looking at the language of the current translation unit. Signed-off-by: Dodji Seketeli Applying to the master branch. --- src/abg-dwarf-reader.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 8c624d48..dc491b93 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -16181,7 +16181,7 @@ build_ir_node_from_die(reader& rdr, if (!die) return decl_base_sptr(); - if (is_c_language(rdr.cur_transl_unit()->get_language())) + if (rdr.die_is_in_c(die)) { const scope_decl_sptr& scop = rdr.global_scope(); return build_ir_node_from_die(rdr, die, scop.get(),