Commit fdc19e64 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

parents 85ae01ba 209e3750
...@@ -361,18 +361,18 @@ vectTopRhs recFs var expr ...@@ -361,18 +361,18 @@ vectTopRhs recFs var expr
rhs _globalScalar _isDFun (Just (_, expr')) -- Case (1) rhs _globalScalar _isDFun (Just (_, expr')) -- Case (1)
= return (inlineMe, False, expr') = return (inlineMe, False, expr')
rhs True False Nothing -- Case (2) rhs True False Nothing -- Case (2)
= do { expr' <- vectScalarFun recFs expr = do { expr' <- vectScalarFun expr
; return (inlineMe, True, vectorised expr') ; return (inlineMe, True, vectorised expr')
} }
rhs True True Nothing -- Case (3) rhs True True Nothing -- Case (3)
= do { expr' <- vectScalarDFun var recFs = do { expr' <- vectScalarDFun var
; return (DontInline, True, expr') ; return (DontInline, True, expr')
} }
rhs False False Nothing -- Case (4) — not a dfun rhs False False Nothing -- Case (4) — not a dfun
= do { let exprFvs = freeVars expr = do { let exprFvs = freeVars expr
; (inline, isScalar, vexpr) ; (inline, isScalar, vexpr)
<- inBind var $ <- inBind var $
vectPolyExpr (isStrongLoopBreaker $ idOccInfo var) recFs exprFvs vectPolyExpr (isStrongLoopBreaker $ idOccInfo var) recFs exprFvs Nothing
; return (inline, isScalar, vectorised vexpr) ; return (inline, isScalar, vectorised vexpr)
} }
rhs False True Nothing -- Case (4) — is a dfun rhs False True Nothing -- Case (4) — is a dfun
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment