diff options
| author | David Terei <davidterei@gmail.com> | 2013-06-18 16:28:42 -0700 |
|---|---|---|
| committer | David Terei <davidterei@gmail.com> | 2013-06-27 13:39:11 -0700 |
| commit | 280a7ec657ecfd759ad25f7a7d218c5988b12141 (patch) | |
| tree | 362378158e3630249a4817311e4848264be0ed64 /compiler/llvmGen/LlvmCodeGen/CodeGen.hs | |
| parent | a7798e95112409b6ec958e509dbdc46bc53cf5e4 (diff) | |
| download | haskell-280a7ec657ecfd759ad25f7a7d218c5988b12141.tar.gz | |
Rework LLVM metadata representation to be more accurate.
Diffstat (limited to 'compiler/llvmGen/LlvmCodeGen/CodeGen.hs')
| -rw-r--r-- | compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs index d7ddbdd027..d4bfaa3030 100644 --- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs +++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs @@ -1320,7 +1320,7 @@ genLoad_fast env e r n ty = case grt == ty' of -- were fine True -> do - (var, s3) <- doExpr ty' (MetaExpr meta $ Load ptr) + (var, s3) <- doExpr ty' (MExpr meta $ Load ptr) return (env, var, unitOL s1 `snocOL` s2 `snocOL` s3, []) @@ -1328,7 +1328,7 @@ genLoad_fast env e r n ty = False -> do let pty = pLift ty' (ptr', s3) <- doExpr pty $ Cast LM_Bitcast ptr pty - (var, s4) <- doExpr ty' (MetaExpr meta $ Load ptr') + (var, s4) <- doExpr ty' (MExpr meta $ Load ptr') return (env, var, unitOL s1 `snocOL` s2 `snocOL` s3 `snocOL` s4, []) @@ -1345,14 +1345,14 @@ genLoad_slow env e ty meta = do case getVarType iptr of LMPointer _ -> do (dvar, load) <- doExpr (cmmToLlvmType ty) - (MetaExpr meta $ Load iptr) + (MExpr meta $ Load iptr) return (env', dvar, stmts `snocOL` load, tops) i@(LMInt _) | i == llvmWord dflags -> do let pty = LMPointer $ cmmToLlvmType ty (ptr, cast) <- doExpr pty $ Cast LM_Inttoptr iptr pty (dvar, load) <- doExpr (cmmToLlvmType ty) - (MetaExpr meta $ Load ptr) + (MExpr meta $ Load ptr) return (env', dvar, stmts `snocOL` cast `snocOL` load, tops) other -> pprPanic "exprToVar: CmmLoad expression is not right type!" |