From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by sourceware.org (Postfix) with ESMTPS id C9CCE3858414 for ; Sat, 5 Nov 2022 11:06:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C9CCE3858414 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-x62d.google.com with SMTP id q9so19319526ejd.0 for ; Sat, 05 Nov 2022 04:06:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=LednTYON8JJnPXH7Tfm8O1Fn15GIxaIE6FkV8iY6TzM=; b=ZJMEeXihXbDkN5wRrYtVSNYMcCKRILYo4OGZ4hzpFDRGG5hcYlQkNWuwZm1O3CZUaJ aNQ6eVbanoEKDyrqaLfZTD0AvRlXJKSXUtwKno0zUNJ7xx2MEFnh0uMFduf6TvR6DiUK DEv5VICCN1ynt4GeGvHt6JAx5AYP/Zyi4Ig0kugoZiJTZl1+rgNSnsrggs1fCg7/Q+rY 97Fd5/xnx4JjFWQGPukVuBpSRiaqLQSCoWQdxVKJZSt4VqwNUcR1NSAwxBiFO6+WZAht zA490lBe0XpCqaeaNPgTzyDA5338JYcJoFem8lrt/76JVnavb/2JCbsJuMCGI6h9wICx u05Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LednTYON8JJnPXH7Tfm8O1Fn15GIxaIE6FkV8iY6TzM=; b=SiHuPJ3EgTEoT7I8ejUdQ0hkLg88oF7tAom6U+UBYbprwH1DtwBJaZ7ymGvEkR/xqD mBMRFdouBSoPLnFiuJdyz5ShxQpeCu6hNxeNzz9QzWcBmqXZQ/6ZnW9kxZknLcmlc+Sg fG2ZPsPD34u5ohfnpy0u1U26+JS9DDtgOZG7f0RVZ5wsLCw4d0AEBGqE2j5KX+dg/ile HWiqp0Jj1SJTt7xgUCMLAEepYK1XlAK8BcewwoxpzUKfdRlJR3XhZyjbTqaNCD/D4Bur ikFMdFRAIcxVjdVOXryeqH0phh5lcY/h5FhgAT4ZD/JwcsbAsYgZEe9Gb6l++7uNTUBF LBig== X-Gm-Message-State: ACrzQf3KkMZYYfKTtpxcXjD3INO2SjasV6xQ9CZmBpEcU9p3pt7ipkok PgGmv/aLmAke4XF3KHOM+89Gl0Qng+CsGBhHgNk= X-Google-Smtp-Source: AMsMyM7oe8DW2OOD5QIER2qIJAFLpsw9LO+aFOIZoZuXAkZfbveqk0acvFRglfh75Zc5AM6ve1G+o/XW8PbgWgnabhA= X-Received: by 2002:a17:907:971f:b0:7ad:e232:f115 with SMTP id jg31-20020a170907971f00b007ade232f115mr26761973ejc.754.1667646415506; Sat, 05 Nov 2022 04:06:55 -0700 (PDT) MIME-Version: 1.0 References: <20221104172537.1039148-1-richard.purdie@linuxfoundation.org> In-Reply-To: <20221104172537.1039148-1-richard.purdie@linuxfoundation.org> From: Richard Biener Date: Sat, 5 Nov 2022 12:06:42 +0100 Message-ID: Subject: Re: [PATCH] gcc/file-prefix-map: Fix NULL filename handling To: Richard Purdie Cc: gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-8.4 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 List-Id: On Fri, Nov 4, 2022 at 6:26 PM Richard Purdie via Gcc-patches wrote: > > e5c15eb183f17e806ad6b58c9497321ded87866f introduced a regression as > some ada tests end up passing NULL as the filename to remap_filename(). > Handle this as before to fix the tests. OK. > gcc/ChangeLog: > > * file-prefix-map.cc (remap_filename): Handle NULL filenames. > > Signed-off-by: Richard Purdie > --- > gcc/file-prefix-map.cc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gcc/file-prefix-map.cc b/gcc/file-prefix-map.cc > index 439586bd2b5..40b10edcf92 100644 > --- a/gcc/file-prefix-map.cc > +++ b/gcc/file-prefix-map.cc > @@ -73,7 +73,7 @@ remap_filename (file_prefix_map *maps, const char *filename) > char *realname; > size_t name_len; > > - if (lbasename (filename) == filename) > + if (!filename || lbasename (filename) == filename) > return filename; > > realname = lrealpath (filename); > -- > 2.34.1 >