diff options
| author | Reid Barton <rwbarton@gmail.com> | 2014-12-23 16:53:16 -0500 |
|---|---|---|
| committer | Reid Barton <rwbarton@gmail.com> | 2014-12-23 19:41:21 -0500 |
| commit | 3e3aa9258b521d362d3a51cb48969df3eeab4981 (patch) | |
| tree | dc897d4432e02d55535707e650941b04f34b635d /compiler/cmm | |
| parent | cc510b46b4f6046115cd74acc2c8726c91823bcf (diff) | |
| download | haskell-3e3aa9258b521d362d3a51cb48969df3eeab4981.tar.gz | |
Fix linker interaction between Template Haskell and HPC (#9762)
Summary:
I'm not really happy about perpetuating the hackish fix for #8696,
but at least in the context of building with -fhpc, the performance
cost should be negligible.
I'm suspicious about PlainModuleInitLabel and the Windows stuff too,
but I don't know what it does / can't test it (respectively) so I'll
leave those alone for now.
Hopefully out-of-process TH will save us from these hacks some day.
The test is an adaptation of T8696. It's a bit more awkward since
I couldn't think of a way to get cross-module tickbox references
without optimizations (inlining), but ghci doesn't permit -O for
some reason.
Test Plan: harbormaster; validate
Reviewers: austin
Reviewed By: austin
Subscribers: carter, thomie
Differential Revision: https://phabricator.haskell.org/D583
GHC Trac Issues: #9762
Conflicts:
testsuite/tests/ghci/scripts/all.T
Diffstat (limited to 'compiler/cmm')
| -rw-r--r-- | compiler/cmm/CLabel.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs index 603f2130e0..ebf902f149 100644 --- a/compiler/cmm/CLabel.hs +++ b/compiler/cmm/CLabel.hs @@ -897,7 +897,7 @@ labelDynamic dflags this_pkg this_mod lbl = PlainModuleInitLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageKey m) - HpcTicksLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageKey m) + HpcTicksLabel m -> not (gopt Opt_Static dflags) && this_mod /= m -- Note that DynamicLinkerLabels do NOT require dynamic linking themselves. _ -> False |