diff options
| author | Austin Seipp <austin@well-typed.com> | 2015-05-14 10:55:03 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2015-05-14 10:55:03 -0500 |
| commit | 3cf8ecdc70cb295a2b9606080a1c7b5fa8eb16f4 (patch) | |
| tree | e7989a081754885163e9dc20a6545820ebeab532 /compiler/vectorise | |
| parent | 04a484eafc9eb9f8774b4bdd41a5dc6c9f640daf (diff) | |
| download | haskell-3cf8ecdc70cb295a2b9606080a1c7b5fa8eb16f4.tar.gz | |
Revert multiple commits
This reverts multiple commits from Simon:
- 04a484eafc9eb9f8774b4bdd41a5dc6c9f640daf Test Trac #10359
- a9ccd37add8315e061c02e5bf26c08f05fad9ac9 Test Trac #10403
- c0aae6f699cbd222d826d0b8d78d6cb3f682079e Test Trac #10248
- eb6ca851f553262efe0824b8dcbe64952de4963d Make the "matchable-given" check happen first
- ca173aa30467a0b1023682d573fcd94244d85c50 Add a case to checkValidTyCon
- 51cbad15f86fca1d1b0e777199eb1079a1b64d74 Update haddock submodule
- 6e1174da5b8e0b296f5bfc8b39904300d04eb5b7 Separate transCloVarSet from fixVarSet
- a8493e03b89f3b3bfcdb6005795de050501f5c29 Fix imports in HscMain (stage2)
- a154944bf07b2e13175519bafebd5a03926bf105 Two wibbles to fix the build
- 5910a1bc8142b4e56a19abea104263d7bb5c5d3f Change in capitalisation of error msg
- 130e93aab220bdf14d08028771f83df210da340b Refactor tuple constraints
- 8da785d59f5989b9a9df06386d5bd13f65435bc0 Delete commented-out line
These break the build by causing Haddock to fail mysteriously when
trying to examine GHC.Prim it seems.
Diffstat (limited to 'compiler/vectorise')
| -rw-r--r-- | compiler/vectorise/Vectorise/Builtins/Base.hs | 2 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Builtins/Initialise.hs | 2 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Utils/Closure.hs | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/compiler/vectorise/Vectorise/Builtins/Base.hs b/compiler/vectorise/Vectorise/Builtins/Base.hs index d5bbd65ee9..bcd85cb100 100644 --- a/compiler/vectorise/Vectorise/Builtins/Base.hs +++ b/compiler/vectorise/Vectorise/Builtins/Base.hs @@ -141,7 +141,7 @@ sumTyCon = indexBuiltin "sumTyCon" sumTyCons prodTyCon :: Int -> Builtins -> TyCon prodTyCon n _ | n >= 2 && n <= mAX_DPH_PROD - = tupleTyCon Boxed n + = tupleTyCon BoxedTuple n | otherwise = pprPanic "prodTyCon" (ppr n) diff --git a/compiler/vectorise/Vectorise/Builtins/Initialise.hs b/compiler/vectorise/Vectorise/Builtins/Initialise.hs index ee7cf9c2b5..6770103d3b 100644 --- a/compiler/vectorise/Vectorise/Builtins/Initialise.hs +++ b/compiler/vectorise/Vectorise/Builtins/Initialise.hs @@ -192,7 +192,7 @@ initBuiltinVars (Builtins { }) preludeDataCons = [mk_tup n (mkFastString $ "tup" ++ show n) | n <- [2..5]] where - mk_tup n name = (tupleDataCon Boxed n, name) + mk_tup n name = (tupleCon BoxedTuple n, name) -- Auxilliary look up functions ----------------------------------------------- diff --git a/compiler/vectorise/Vectorise/Utils/Closure.hs b/compiler/vectorise/Vectorise/Utils/Closure.hs index 335b34b909..0a918f84e9 100644 --- a/compiler/vectorise/Vectorise/Utils/Closure.hs +++ b/compiler/vectorise/Vectorise/Utils/Closure.hs @@ -22,7 +22,7 @@ import TyCon import DataCon import MkId import TysWiredIn -import BasicTypes( Boxity(..) ) +import BasicTypes( TupleSort(..) ) import FastString @@ -128,13 +128,13 @@ buildEnv [] void <- builtin voidVar pvoid <- builtin pvoidVar return (ty, vVar (void, pvoid), \_ body -> body) -buildEnv [v] +buildEnv [v] = return (vVarType v, vVar v, \env body -> vLet (vNonRec v env) body) buildEnv vs = do (lenv_tc, lenv_tyargs) <- pdataReprTyCon ty - let venv_con = tupleDataCon Boxed (length vs) + let venv_con = tupleCon BoxedTuple (length vs) [lenv_con] = tyConDataCons lenv_tc venv = mkCoreTup (map Var vvs) |