diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2013-01-25 13:26:18 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2013-01-25 13:26:18 +0000 |
| commit | 0ab8cc19bc73f19cc91daea2b649faa7960bcf73 (patch) | |
| tree | ec5495074a9c3869e364135869b06e9a754db06b /compiler/vectorise | |
| parent | e3426665b056ef9dcaa48722e2e33f260f055727 (diff) | |
| parent | a47ee23a82a669808569b3865383bf932b67fa95 (diff) | |
| download | haskell-0ab8cc19bc73f19cc91daea2b649faa7960bcf73.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Conflicts:
compiler/basicTypes/DataCon.lhs
Diffstat (limited to 'compiler/vectorise')
| -rw-r--r-- | compiler/vectorise/Vectorise/Generic/PData.hs | 1 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Type/TyConDecl.hs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/compiler/vectorise/Vectorise/Generic/PData.hs b/compiler/vectorise/Vectorise/Generic/PData.hs index 295a4805a6..cbedf8d8e0 100644 --- a/compiler/vectorise/Vectorise/Generic/PData.hs +++ b/compiler/vectorise/Vectorise/Generic/PData.hs @@ -54,6 +54,7 @@ buildDataFamInst name' fam_tc vect_tc rhs [] -- no stupid theta rhs rec_flag -- FIXME: is this ok? + False -- Not promotable False -- not GADT syntax (FamInstTyCon ax fam_tc pat_tys) ; return fam_inst } diff --git a/compiler/vectorise/Vectorise/Type/TyConDecl.hs b/compiler/vectorise/Vectorise/Type/TyConDecl.hs index d1c5ca53b1..588cd39ec0 100644 --- a/compiler/vectorise/Vectorise/Type/TyConDecl.hs +++ b/compiler/vectorise/Vectorise/Type/TyConDecl.hs @@ -104,6 +104,7 @@ vectTyConDecl tycon name' [] -- no stupid theta rhs' -- new constructor defs rec_flag -- whether recursive + False -- Not promotable gadt_flag -- whether in GADT syntax NoParentTyCon } |