summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2011-09-15 09:11:18 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2011-09-15 09:11:52 +0100
commitb215384ba29f2ab85bf4655881fb78ff1161c975 (patch)
tree5f4b5e3d0c5534dabc2790c55caf68689435bfd7
parent7bfc28d4a1c7c20714bfc11acc072e2f16927d80 (diff)
downloadhaskell-b215384ba29f2ab85bf4655881fb78ff1161c975.tar.gz
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)
-rw-r--r--compiler/basicTypes/MkId.lhs19
1 files changed, 11 insertions, 8 deletions
diff --git a/compiler/basicTypes/MkId.lhs b/compiler/basicTypes/MkId.lhs
index 4c3a84f815..c8e5ab69e0 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}