diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-09-12 14:50:40 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-09-12 14:52:06 -0400 |
| commit | dca6eda3f7e03ae54cf1384b466927840d01aaca (patch) | |
| tree | 2129781ee9550d5bb5f0d26865ecf46298d31a6e | |
| parent | 867534750bcf66f6243f0b7d2d9ec11fa1defd04 (diff) | |
| download | haskell-wip/T17187.tar.gz | |
Rename GHC.StgToCmm.Con -> GHC.StgToCmm.DataConwip/T17187
Incredibly, Windows disallows the manipulation of any file matching
Con(\..*)?. The `GHC.StgToCmm.Con` was introduced in the renamings in
447864a9, breaking the Windows build. Work around this by renaming it to
`GHC.StgToCmm.DataCon`
Fixes #17187.
| -rw-r--r-- | compiler/GHC/StgToCmm.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/StgToCmm/Bind.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/StgToCmm/DataCon.hs (renamed from compiler/GHC/StgToCmm/Con.hs) | 4 | ||||
| -rw-r--r-- | compiler/GHC/StgToCmm/Expr.hs | 2 | ||||
| -rw-r--r-- | compiler/ghc.cabal.in | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/compiler/GHC/StgToCmm.hs b/compiler/GHC/StgToCmm.hs index c7ee604692..23d6ceeaa6 100644 --- a/compiler/GHC/StgToCmm.hs +++ b/compiler/GHC/StgToCmm.hs @@ -19,7 +19,7 @@ import GHC.StgToCmm.Prof (initCostCentres, ldvEnter) import GHC.StgToCmm.Monad import GHC.StgToCmm.Env import GHC.StgToCmm.Bind -import GHC.StgToCmm.Con +import GHC.StgToCmm.DataCon import GHC.StgToCmm.Layout import GHC.StgToCmm.Utils import GHC.StgToCmm.Closure diff --git a/compiler/GHC/StgToCmm/Bind.hs b/compiler/GHC/StgToCmm/Bind.hs index bfe9255783..44316cacb0 100644 --- a/compiler/GHC/StgToCmm/Bind.hs +++ b/compiler/GHC/StgToCmm/Bind.hs @@ -18,7 +18,7 @@ import GhcPrelude hiding ((<*>)) import GHC.StgToCmm.Expr import GHC.StgToCmm.Monad import GHC.StgToCmm.Env -import GHC.StgToCmm.Con +import GHC.StgToCmm.DataCon import GHC.StgToCmm.Heap import GHC.StgToCmm.Prof (ldvEnterClosure, enterCostCentreFun, enterCostCentreThunk, initUpdFrameProf) diff --git a/compiler/GHC/StgToCmm/Con.hs b/compiler/GHC/StgToCmm/DataCon.hs index 08508fbecc..c7ad444e41 100644 --- a/compiler/GHC/StgToCmm/Con.hs +++ b/compiler/GHC/StgToCmm/DataCon.hs @@ -11,7 +11,7 @@ -- ----------------------------------------------------------------------------- -module GHC.StgToCmm.Con ( +module GHC.StgToCmm.DataCon ( cgTopRhsCon, buildDynCon, bindConArgs ) where @@ -89,7 +89,7 @@ cgTopRhsCon dflags id con args = amode <- getArgAmode arg case amode of CmmLit lit -> return lit - _ -> panic "GHC.StgToCmm.Con.cgTopRhsCon" + _ -> panic "GHC.StgToCmm.DataCon.cgTopRhsCon" nonptr_wds = tot_wds - ptr_wds diff --git a/compiler/GHC/StgToCmm/Expr.hs b/compiler/GHC/StgToCmm/Expr.hs index a8661d9de0..f2f549259b 100644 --- a/compiler/GHC/StgToCmm/Expr.hs +++ b/compiler/GHC/StgToCmm/Expr.hs @@ -19,7 +19,7 @@ import {-# SOURCE #-} GHC.StgToCmm.Bind ( cgBind ) import GHC.StgToCmm.Monad import GHC.StgToCmm.Heap import GHC.StgToCmm.Env -import GHC.StgToCmm.Con +import GHC.StgToCmm.DataCon import GHC.StgToCmm.Prof (saveCurrentCostCentre, restoreCurrentCostCentre, emitSetCCC) import GHC.StgToCmm.Layout import GHC.StgToCmm.Prim diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index cf1d127fba..7946e233c4 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -303,7 +303,7 @@ Library GHC.StgToCmm GHC.StgToCmm.Bind GHC.StgToCmm.Closure - GHC.StgToCmm.Con + GHC.StgToCmm.DataCon GHC.StgToCmm.Env GHC.StgToCmm.Expr GHC.StgToCmm.Foreign |