Fix several note references, part 2

2 files changed, 2 insertions, 41 deletions

diff --git a/testsuite/tests/linters/notes.stdout b/testsuite/tests/linters/notes.stdout
index 8540d0c06d..b8822bd476 100644
--- a/testsuite/tests/linters/notes.stdout
+++ b/testsuite/tests/linters/notes.stdout
@@ -6,73 +6,36 @@ ref    compiler/GHC/Core/Opt/Simplify.hs:3239:0:     Note [Suppressing binder-sw
 ref    compiler/GHC/Core/Opt/Simplify.hs:3767:8:     Note [Lambda-bound unfoldings]
 ref    compiler/GHC/Core/Opt/Simplify/Utils.hs:1225:37:     Note [Gentle mode]
 ref    compiler/GHC/Core/Opt/Specialise.hs:1593:28:     Note [Arity decrease]
-ref    compiler/GHC/Core/RoughMap.hs:183:35:     Note [RoughMatch and beta reduction]
 ref    compiler/GHC/Core/TyCo/Rep.hs:1711:31:     Note [What prevents a constraint from floating]
 ref    compiler/GHC/Driver/Main.hs:1566:34:     Note [simpleTidyPgm - mkBootModDetailsTc]
 ref    compiler/GHC/Driver/Session.hs:3916:49:     Note [Eta-reduction in -O0]
 ref    compiler/GHC/Hs/Extension.hs:140:5:     Note [Strict argument type constraints]
 ref    compiler/GHC/HsToCore/Binds.hs:313:33:     Note [AbsBinds wrappers]
-ref    compiler/GHC/HsToCore/Binds.hs:849:46:     Note [Free dictionaries]
-ref    compiler/GHC/HsToCore/Binds.hs:883:36:     Note [Free tyvars in rule LHS]
-ref    compiler/GHC/HsToCore/Binds.hs:884:35:     Note [Free dictionaries in rule LHS]
-ref    compiler/GHC/HsToCore/Binds.hs:942:24:     Note [Free dictionaries]
-ref    compiler/GHC/HsToCore/Binds.hs:999:34:     Note [Dead spec binders]
-ref    compiler/GHC/HsToCore/Docs.hs:126:70:     Note [1]
-ref    compiler/GHC/HsToCore/Docs.hs:130:0:     Note [1]
 ref    compiler/GHC/HsToCore/Pmc/Solver.hs:853:20:     Note [COMPLETE sets on data families]
-ref    compiler/GHC/HsToCore/Utils.hs:939:62:     Note [Don't CPR join points]
 ref    compiler/GHC/Rename/Pat.hs:888:29:     Note [Disambiguating record fields]
-ref    compiler/GHC/Rename/Splice.hs:450:27:     Note [Splices]
-ref    compiler/GHC/Runtime/Eval.hs:996:2:     Note [Querying instances for a type]
-ref    compiler/GHC/Runtime/Interpreter.hs:198:30:     Note [uninterruptibleMask_]
 ref    compiler/GHC/StgToCmm.hs:108:18:     Note [codegen-split-init]
 ref    compiler/GHC/StgToCmm.hs:111:18:     Note [pipeline-split-init]
 ref    compiler/GHC/StgToCmm/Expr.hs:585:4:     Note [case on bool]
 ref    compiler/GHC/StgToCmm/Expr.hs:848:3:     Note [alg-alt heap check]
-ref    compiler/GHC/Tc/Errors.hs:180:13:     Note [Fail fast on kind errors]
-ref    compiler/GHC/Tc/Errors.hs:2016:0:     Note [Highlighting ambiguous type variables]
-ref    compiler/GHC/Tc/Errors/Ppr.hs:1760:11:     Note [Highlighting ambiguous type variables]
-ref    compiler/GHC/Tc/Errors/Types.hs:2986:28:     Note [Don't promote data constructors with non-equality contexts]
-ref    compiler/GHC/Tc/Gen/Arrow.hs:435:29:     Note [RecStmt]
 ref    compiler/GHC/Tc/Gen/Expr.hs:670:24:     Note [Disambiguating record fields]
 ref    compiler/GHC/Tc/Gen/Expr.hs:1195:7:     Note [Disambiguating record fields]
 ref    compiler/GHC/Tc/Gen/Expr.hs:1298:11:     Note [Deprecating ambiguous fields]
-ref    compiler/GHC/Tc/Gen/Foreign.hs:149:26:     Note [Expanding newtypes]
 ref    compiler/GHC/Tc/Gen/HsType.hs:552:56:     Note [Skolem escape prevention]
 ref    compiler/GHC/Tc/Gen/HsType.hs:2623:7:     Note [Matching a kind sigature with a declaration]
-ref    compiler/GHC/Tc/Gen/Match.hs:553:20:     Note [GroupStmt binder map]
-ref    compiler/GHC/Tc/Gen/Match.hs:746:20:     Note [GroupStmt binder map]
-ref    compiler/GHC/Tc/Gen/Match.hs:1011:0:     Note [typechecking ApplicativeStmt]
 ref    compiler/GHC/Tc/Gen/Pat.hs:169:20:     Note [Typing patterns in pattern bindings]
-ref    compiler/GHC/Tc/Gen/Pat.hs:476:7:     Note [Pattern coercions]
 ref    compiler/GHC/Tc/Gen/Pat.hs:1077:7:     Note [Matching polytyped patterns]
-ref    compiler/GHC/Tc/Gen/Pat.hs:1376:16:     Note [Pattern coercions]
 ref    compiler/GHC/Tc/Gen/Sig.hs:78:10:     Note [Overview of type signatures]
 ref    compiler/GHC/Tc/Instance/Family.hs:515:35:     Note [Constrained family instances]
 ref    compiler/GHC/Tc/Module.hs:698:15:     Note [Extra dependencies from .hs-boot files]
 ref    compiler/GHC/Tc/Solver/Canonical.hs:1229:33:     Note [Canonical LHS]
 ref    compiler/GHC/Tc/Solver/Interact.hs:1638:9:     Note [No touchables as FunEq RHS]
 ref    compiler/GHC/Tc/Solver/Rewrite.hs:1032:7:     Note [Stability of rewriting]
-ref    compiler/GHC/Tc/TyCl.hs:627:3:     Note [Single function non-recursive binding special-case]
 ref    compiler/GHC/Tc/TyCl.hs:1106:6:     Note [Unification variables need fresh Names]
-ref    compiler/GHC/Tc/TyCl.hs:1895:13:     Note [TyConBinders for the result kind signatures of a data type]
-ref    compiler/GHC/Tc/TyCl/Instance.hs:947:26:     Note [Generalising in tcFamTyPatsGuts]
 ref    compiler/GHC/Tc/Types.hs:696:33:     Note [Extra dependencies from .hs-boot files]
-ref    compiler/GHC/Tc/Types.hs:1230:36:     Note [Bindings with closed types]
 ref    compiler/GHC/Tc/Types.hs:1466:47:     Note [Care with plugin imports]
 ref    compiler/GHC/Tc/Types/Constraint.hs:238:34:     Note [NonCanonical Semantics]
-ref    compiler/GHC/Tc/Utils/Env.hs:556:7:     Note [Bindings with closed types]
-ref    compiler/GHC/Tc/Utils/Env.hs:1128:7:     Note [Generating fresh names for ccall wrapper]
-ref    compiler/GHC/Tc/Utils/Env.hs:1192:7:     Note [Placeholder PatSyn kinds]
-ref    compiler/GHC/Tc/Utils/TcMType.hs:793:7:     Note [Kind checking for GADTs]
-ref    compiler/GHC/Tc/Utils/TcType.hs:529:7:     Note [TyVars and TcTyVars]
-ref    compiler/GHC/ThToHs.hs:1738:11:     Note [Adding parens for splices]
-ref    compiler/GHC/ThToHs.hs:1749:3:     Note [Adding parens for splices]
-ref    compiler/GHC/Types/Basic.hs:619:17:     Note [Safe Haskell isSafeOverlap]
 ref    compiler/GHC/Types/Demand.hs:307:25:     Note [Preserving Boxity of results is rarely a win]
-ref    compiler/GHC/Types/Demand.hs:1100:4:     Note [Use one-shot information]
 ref    compiler/GHC/Types/Name/Occurrence.hs:301:4:     Note [Unique OccNames from Template Haskell]
-ref    compiler/GHC/Types/Unique.hs:78:25:     Note [Uniques-prelude - Uniques for wired-in Prelude things]
 ref    compiler/GHC/Unit/Module/Deps.hs:79:13:     Note [Structure of dep_boot_mods]
 ref    compiler/GHC/Utils/Monad.hs:391:34:     Note [multiShotIO]
 ref    compiler/Language/Haskell/Syntax/Binds.hs:226:31:     Note [fun_id in Match]
@@ -80,7 +43,6 @@ ref    compiler/Language/Haskell/Syntax/Expr.hs:1561:32:     Note [Quasi-quote o
 ref    compiler/Language/Haskell/Syntax/Pat.hs:336:12:     Note [Disambiguating record fields]
 ref    configure.ac:212:10:     Note [Linking ghc-bin against threaded stage0 RTS]
 ref    docs/core-spec/core-spec.mng:177:6:     Note [TyBinders]
-ref    ghc/GHCi/UI.hs:3646:25:     Note [ModBreaks.decls]
 ref    ghc/ghc.mk:62:6:     Note [Linking ghc-bin against threaded stage0 RTS]
 ref    hadrian/src/Expression.hs:130:30:     Note [Linking ghc-bin against threaded stage0 RTS]
 ref    libraries/base/GHC/ST.hs:139:7:     Note [Definition of runRW#]
@@ -91,7 +53,6 @@ ref    testsuite/driver/testlib.py:152:10:     Note [Why is there no stage1 setu
 ref    testsuite/driver/testlib.py:156:2:     Note [Why is there no stage1 setup function?]
 ref    testsuite/mk/boilerplate.mk:263:2:     Note [WayFlags]
 ref    testsuite/tests/indexed-types/should_fail/ExtraTcsUntch.hs:30:27:     Note [Extra TcS Untouchables]
-ref    testsuite/tests/perf/join_points/join005.hs:19:63:     Note [Don't CPR join points]
 ref    testsuite/tests/perf/should_run/all.T:3:6:     Note [Solving from instances when interacting Dicts]
 ref    testsuite/tests/polykinds/CuskFam.hs:16:11:     Note [Unifying implicit CUSK variables]
 ref    testsuite/tests/simplCore/should_compile/T5776.hs:16:7:     Note [Simplifying RULE lhs constraints]
diff --git a/testsuite/tests/perf/join_points/join005.hs b/testsuite/tests/perf/join_points/join005.hs
index 611a3de4ae..4d715c2d87 100644
--- a/testsuite/tests/perf/join_points/join005.hs
+++ b/testsuite/tests/perf/join_points/join005.hs
@@ -16,8 +16,8 @@ sumOfMultiplesOf p ns
 It's hard to test for this, but what should happen is that go gets W/W'd and the
 worker is a join point (else Core Lint will complain). Interestingly, go is
 *not* CPR'd, because then the worker couldn't be a join point, but once the
-simplifier runs, the worker ends up returning Int# anyway. See Note [Don't CPR
-join points] in GHC.Core.Opt.WorkWrap.
+simplifier runs, the worker ends up returning Int# anyway. See Note [Don't w/w
+join points for CPR] in GHC.Core.Opt.WorkWrap.
 -}
 
 main = print $ sumOfMultiplesOf 2 [1..10]