From b57200de601e4ef6827727176611d7192016b8b2 Mon Sep 17 00:00:00 2001 From: Fendor <power.walross@gmail.com> Date: Mon, 15 Jan 2024 18:59:49 +0100 Subject: [PATCH] Prefer RdrName over OccName for looking up locations in doc renaming step Looking up by OccName only does not take into account when functions are only imported in a qualified way. Fixes issue #24294 Bump haddock submodule to include regression test --- compiler/GHC/Rename/Doc.hs | 2 +- utils/haddock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/GHC/Rename/Doc.hs b/compiler/GHC/Rename/Doc.hs index f32f3ec7cc0c..2816b3407183 100644 --- a/compiler/GHC/Rename/Doc.hs +++ b/compiler/GHC/Rename/Doc.hs @@ -40,5 +40,5 @@ rnHsDocIdentifiers :: GlobalRdrEnv rnHsDocIdentifiers gre_env ns = [ L l $ greName gre | L l rdr_name <- ns - , gre <- lookupGRE gre_env (LookupOccName (rdrNameOcc rdr_name) AllRelevantGREs) + , gre <- lookupGRE gre_env (LookupRdrName rdr_name AllRelevantGREs) ] diff --git a/utils/haddock b/utils/haddock index 65453a581857..9fcf5cf49910 160000 --- a/utils/haddock +++ b/utils/haddock @@ -1 +1 @@ -Subproject commit 65453a58185726aab95289c2da0d9fb27b7ce0af +Subproject commit 9fcf5cf499102baf9e00986bb8b54b80ec5ffc81 -- GitLab