[commit: ghc] master: Incorrect type conversion in LLVM backend (#5785). (e86a7c7)

[David Terei]

Ian,

please merge this fix into 7.4.1.

http://hackage.haskell.org/trac/ghc/ticket/5785

Cheers,
David

On 17 January 2012 18:51, David Terei <davidterei at gmail.com> wrote:
> Repository : ssh://darcs.haskell.org//srv/darcs/ghc
>
> On branch  : master
>
> http://hackage.haskell.org/trac/ghc/changeset/e86a7c7c75df3377ce961dc240f75abc845847bf
>
>>---------------------------------------------------------------
>
> commit e86a7c7c75df3377ce961dc240f75abc845847bf
> Author: Ubuntu <davidt at davidt-vm-32.scs.stanford.edu>
> Date:   Wed Jan 18 01:22:35 2012 +0000
>
>    Incorrect type conversion in LLVM backend (#5785).
>
>>---------------------------------------------------------------
>
>  compiler/llvmGen/Llvm/Types.hs |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/compiler/llvmGen/Llvm/Types.hs b/compiler/llvmGen/Llvm/Types.hs
> index 07e53fb..35de40b 100644
> --- a/compiler/llvmGen/Llvm/Types.hs
> +++ b/compiler/llvmGen/Llvm/Types.hs
> @@ -7,6 +7,7 @@ module Llvm.Types where
>  #include "HsVersions.h"
>
>  import Data.Char
> +import Data.Int
>  import Data.List (intercalate)
>  import Numeric
>
> @@ -223,7 +224,9 @@ getPlainName (LMLitVar    x          ) = getLit x
>
>  -- | Print a literal value. No type.
>  getLit :: LlvmLit -> String
> -getLit (LMIntLit   i _       ) = show ((fromInteger i)::Int)
> +getLit (LMIntLit i (LMInt 32)) = show (fromInteger i :: Int32)
> +getLit (LMIntLit i (LMInt 64)) = show (fromInteger i :: Int64)
> +getLit (LMIntLit i _         ) = show (fromInteger i :: Int)
>  getLit (LMFloatLit r LMFloat ) = fToStr $ realToFrac r
>  getLit (LMFloatLit r LMDouble) = dToStr r
>  getLit f@(LMFloatLit _ _) = error $ "Can't print this float literal!" ++ show f
>
>
>
> _______________________________________________
> Cvs-ghc mailing list
> Cvs-ghc at haskell.org
> http://www.haskell.org/mailman/listinfo/cvs-ghc