diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2015-08-02 10:26:59 +0200 |
|---|---|---|
| committer | Alan Zimmerman <alan.zimm@gmail.com> | 2015-08-02 10:26:59 +0200 |
| commit | 15dd7007275a5dcdae2c9f104773eceaa56590dc (patch) | |
| tree | 9fe88a05942e8dc024e52d7f56830be3dae4899b /compiler/deSugar/DsExpr.hs | |
| parent | 75504f300d4db33ff66cc1a572d473bdb23b6a42 (diff) | |
| download | haskell-15dd7007275a5dcdae2c9f104773eceaa56590dc.tar.gz | |
Replace (SourceText,FastString) with StringLiteral data type
Summary:
Phab:D907 introduced SourceText for a number of data types, by replacing
FastString with (SourceText,FastString). Since this has an Outputable
instance, no warnings are generated when ppr is called on it, but
unexpected output is generated. See Phab:D1096 for an example of this.
Replace the (SourceText,FastString) tuples with a new data type,
```lang=hs
data StringLiteral = StringLiteral SourceText FastString
```
Update haddock submodule accordingly
Test Plan: ./validate
Reviewers: hvr, austin, rwbarton, trofi, bgamari
Reviewed By: trofi, bgamari
Subscribers: thomie, trofi, rwbarton, mpickering
Differential Revision: https://phabricator.haskell.org/D1101
GHC Trac Issues: #10692
Diffstat (limited to 'compiler/deSugar/DsExpr.hs')
| -rw-r--r-- | compiler/deSugar/DsExpr.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/deSugar/DsExpr.hs b/compiler/deSugar/DsExpr.hs index a6cb98d372..433a13ee37 100644 --- a/compiler/deSugar/DsExpr.hs +++ b/compiler/deSugar/DsExpr.hs @@ -302,7 +302,7 @@ dsExpr (HsSCC _ cc expr@(L loc _)) = do mod_name <- getModule count <- goptM Opt_ProfCountEntries uniq <- newUnique - Tick (ProfNote (mkUserCC (snd cc) mod_name loc uniq) count True) + Tick (ProfNote (mkUserCC (sl_fs cc) mod_name loc uniq) count True) <$> dsLExpr expr else dsLExpr expr |