Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/b215384ba29f2ab85bf4655881fb78ff1161c975 >--------------------------------------------------------------- commit b215384ba29f2ab85bf4655881fb78ff1161c975 Author: Simon Peyton Jones <[email protected]> Date: Thu Sep 15 09:11:18 2011 +0100 Hack: add noCafIdInfo to shiftIntegerL and friends It's a hack becuase we have no good reason to be sure that these functions don't have any CAFs. We're working on something better, but this should fix the build (Trac #5485) >--------------------------------------------------------------- compiler/basicTypes/MkId.lhs | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/compiler/basicTypes/MkId.lhs b/compiler/basicTypes/MkId.lhs index 4c3a84f..c8e5ab6 100644 --- a/compiler/basicTypes/MkId.lhs +++ b/compiler/basicTypes/MkId.lhs @@ -1074,18 +1074,21 @@ digitsSomeId = mkVanillaGlobal digitsSomeDataConName (mkFunTy digitsTy digitsTy)) shiftLIntegerId :: Id -shiftLIntegerId = mkVanillaGlobal shiftLIntegerName - (mkFunTy integerTy - (mkFunTy intPrimTy integerTy)) +shiftLIntegerId = mkVanillaGlobalWithInfo shiftLIntegerName + (mkFunTy integerTy (mkFunTy intPrimTy integerTy)) + noCafIdInfo +-- ToDo: we should not really be relying on noCafInfo here. +-- What if it's wrong?! negateIntegerId :: Id -negateIntegerId = mkVanillaGlobal negateIntegerName - (mkFunTy integerTy integerTy) +negateIntegerId = mkVanillaGlobalWithInfo negateIntegerName + (mkFunTy integerTy integerTy) + noCafIdInfo orIntegerId :: Id -orIntegerId = mkVanillaGlobal orIntegerName - (mkFunTy integerTy - (mkFunTy integerTy integerTy)) +orIntegerId = mkVanillaGlobalWithInfo orIntegerName + (mkFunTy integerTy (mkFunTy integerTy integerTy)) + noCafIdInfo \end{code} _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
