summaryrefslogtreecommitdiff
path: root/compiler/vectorise
diff options
context:
space:
mode:
authorManuel M T Chakravarty <chak@cse.unsw.edu.au>2013-02-06 11:00:39 +1100
committerManuel M T Chakravarty <chak@cse.unsw.edu.au>2013-02-06 11:00:39 +1100
commit8a690840c01152c8bf59cea1761d6e2eb26d9ff9 (patch)
tree5cd658afde02c6585798a737799336001f07ae13 /compiler/vectorise
parentfac50f929ad6e432d5dd1ffa6f298631c627a54e (diff)
downloadhaskell-8a690840c01152c8bf59cea1761d6e2eb26d9ff9.tar.gz
Vectoriser: merge fix
Diffstat (limited to 'compiler/vectorise')
-rw-r--r--compiler/vectorise/Vectorise/Monad.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/vectorise/Vectorise/Monad.hs b/compiler/vectorise/Vectorise/Monad.hs
index e9078ab850..04a0bf24de 100644
--- a/compiler/vectorise/Vectorise/Monad.hs
+++ b/compiler/vectorise/Vectorise/Monad.hs
@@ -92,7 +92,7 @@ initV hsc_env guts info thing_inside
; let genv = extendImportedVarsEnv builtin_vars
. setPAFunsEnv builtin_pas
. setPRFunsEnv builtin_prs
- $ initGlobalEnv (dopt Opt_VectorisationAvoidance dflags)
+ $ initGlobalEnv (gopt Opt_VectorisationAvoidance dflags)
info (mg_vect_decls guts) instEnvs famInstEnvs
-- perform vectorisation