From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 50E383858D38 for ; Fri, 4 Nov 2022 17:25:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 50E383858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linuxfoundation.org Received: by mail-wr1-x432.google.com with SMTP id bk15so7944285wrb.13 for ; Fri, 04 Nov 2022 10:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=0oqby/KdWjLwfdNiCGFRRaInd3ynjfgRTejs7bHLxBc=; b=NMyaQ9GAd2nQRK57PxcWDoHOZhD5iDCQ53dx0Zj2Ss8D4pqebba4orv0D6CsAnJldq Oimxpi+cxl6WW/ajDFAJMvkg5i31Oe025Ztsz8nDhvMEGhZGCThWGjdXXbuBK+GZa7Og Gkw06aS01MEMtAuS13OLzRq40cJwFVY9Db/p4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0oqby/KdWjLwfdNiCGFRRaInd3ynjfgRTejs7bHLxBc=; b=juVoKDB2550QNBoaDCN8fELI6XtpY271nWR2arMglBOS+P91OefOBpBB6y3sxVDxXH mCUrT7MagWmnqvTiNqfa3Sbm7hUZXNJCMZhNGg+lip1gKYg3upIwme9IQ8/XQB56WlFZ voOYA3dos+DNqmQv0iwiZQCW/w7DM42YOE/AcYz73U5+jbUPQ8ctyPlt7rpF+oxte3Lh CAgXRvvcdCNJjDLRy5O/UYNfmjUv3JZZlIsNMviSNiFEeBtw7CEjEIS11Ca+htkSDPlh L1PUY6dc5vRsmbVQ47P/ujyGYiH2vvlaJFgx/LHEPtU3Jfhzi4KyFTVtVJtcsaYUWjJg 9Dqw== X-Gm-Message-State: ACrzQf2ezFvsyFCoZNwe1yQIPzwFiY4rgpB9ENgqLdCeSwFOSu//NS2Z 3BUYtfG/sSw7yeBxi6jtkA4C7E0z8omWDw== X-Google-Smtp-Source: AMsMyM7D0koccWVGtJqUcfZ7KKeO+hQv3n8XhHS5/giUYHtUk3aQvNvrSXaaFpZ8lCV8mNE5DDG0eA== X-Received: by 2002:a5d:4b04:0:b0:235:f22b:6621 with SMTP id v4-20020a5d4b04000000b00235f22b6621mr22948521wrq.462.1667582740568; Fri, 04 Nov 2022 10:25:40 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:28c5:bec7:4f4d:2683]) by smtp.gmail.com with ESMTPSA id d33-20020a05600c4c2100b003cf37c5ddc0sm7037wmp.22.2022.11.04.10.25.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 10:25:39 -0700 (PDT) From: Richard Purdie To: gcc-patches@gcc.gnu.org Subject: [PATCH] gcc/file-prefix-map: Fix NULL filename handling Date: Fri, 4 Nov 2022 17:25:37 +0000 Message-Id: <20221104172537.1039148-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 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,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: 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. 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