From patchwork Wed Apr 5 16:07:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 67398 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 703B13858C50 for ; Wed, 5 Apr 2023 16:07:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 703B13858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680710855; bh=6WFSF58QsVbqs5pMJ+LwKb02d1nAIdCHkmGJtokGtuU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=dc9btJhwk4B+HIKHuiPgkJxJVrQB5V0E9NrDo+z91n4b5kJTtiXEeSjVL9uTaKT5U amHDgA+9z7JujV2Jd7trDAVvF2q3EFd6QsRala5G3KIpkA/DZ9JkAk9ZKfedSpZvXW 46MXXgY04w9jrYrcpHAttsAwXT7bFPvmCeOmfBbo= 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 B766C3858C54 for ; Wed, 5 Apr 2023 16:07:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B766C3858C54 Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-116-x1prkPhFOlSN-wMCsI0QGg-1; Wed, 05 Apr 2023 12:07:29 -0400 X-MC-Unique: x1prkPhFOlSN-wMCsI0QGg-1 Received: by mail-qt1-f199.google.com with SMTP id c14-20020ac87d8e000000b003e38726ec8bso24652618qtd.23 for ; Wed, 05 Apr 2023 09:07:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680710848; 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=6WFSF58QsVbqs5pMJ+LwKb02d1nAIdCHkmGJtokGtuU=; b=kRcULOcwnwJ8VSX9qPaL3TSOQM+x3uRUOBoRmcrke5cHIU7i5ejU3h3kb2+AkjpiPE M6GCFl8PFikzk1fF5C2i055s2EhQ9/vHUwF7kZND22VvS+DohQYlUZf8+9DcPiS5mx6x k/Lt2lmFAX9OePUwyYbAEliGgG3gXwGAENjkDKVyLPbrf574V30daIqVfnlMWVkrzC8f HMiSL5M8+9DcdbXt1Br5F0O8IJsSBof9IKRXdv3qhcxR1k/li6jYr8nV1Ju65rL3ew+B uzOgmrsrdVpL4qhK3XMESiBrLeG09BRGQYcG6HlLWU997JvKOfxOXptPT3yJIH3XtvfR CQYw== X-Gm-Message-State: AAQBX9fB7b4vaJ6GLMA0Tl+9sdOJo5IGBXo9IYUej5Mp48gm0nrJYZ+H NbdXHt8ie8pD8dlXDYKGWorZRblJ6HS4/q1MireKULggTE1LiSsTv75hWcTZn82F/p2scba7gtn lEX+xDqkQID4RYOTPorl4+DIwZd7TMNyQsHDR1lg6l0adPBv0fOa15gwjaEae47MQJZXYv5lqIk F6 X-Received: by 2002:a05:6214:27ca:b0:5e3:c85f:dc6f with SMTP id ge10-20020a05621427ca00b005e3c85fdc6fmr8372975qvb.30.1680710848348; Wed, 05 Apr 2023 09:07:28 -0700 (PDT) X-Google-Smtp-Source: AKy350YjV0bGJAIiUZDzs+0QQJJWXu1FjbDkPk7GLNWex/wx/90pexRQtuygxw4V90MGKyymv887tg== X-Received: by 2002:a05:6214:27ca:b0:5e3:c85f:dc6f with SMTP id ge10-20020a05621427ca00b005e3c85fdc6fmr8372948qvb.30.1680710847795; Wed, 05 Apr 2023 09:07:27 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id og18-20020a056214429200b005dd8b934587sm4299331qvb.31.2023.04.05.09.07.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 09:07:27 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 1FFBE581C79; Wed, 5 Apr 2023 18:07:25 +0200 (CEST) To: libabigail@sourceware.org Subject: [PATCH, applied] reader: Make reader::get_scope_for_node handle subranges at array scope. Organization: Red Hat / France X-Operating-System: Fedora 38 X-URL: http://www.redhat.com Date: Wed, 05 Apr 2023 18:07:24 +0200 Message-ID: <87h6tul3cz.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 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 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.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Dodji Seketeli via Libabigail From: Dodji Seketeli Reply-To: Dodji Seketeli Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Hello, Now that subranges can be standalone types, we need to teach reader::get_scope_for_node about the fact that subranges can be at array scope too. * src/abg-reader.cc (reader::get_scope_for_node): A subrange at array scope is meant to be in the scope of the array. Signed-off-by: Dodji Seketeli --- src/abg-reader.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/abg-reader.cc b/src/abg-reader.cc index 4c2ff529..e1d13296 100644 --- a/src/abg-reader.cc +++ b/src/abg-reader.cc @@ -1490,7 +1490,8 @@ reader::get_scope_for_node(xmlNodePtr node, && (xmlStrEqual(parent->name, BAD_CAST("data-member")) || xmlStrEqual(parent->name, BAD_CAST("member-type")) || xmlStrEqual(parent->name, BAD_CAST("member-function")) - || xmlStrEqual(parent->name, BAD_CAST("member-template")))) + || xmlStrEqual(parent->name, BAD_CAST("member-template")) + || xmlStrEqual(parent->name, BAD_CAST("array-type-def")))) { read_access(parent, access); parent = parent->parent;