change dirty_MUT_VAR() to use recordMutableCap()

[ghc-hetmet.git] / ghc / compiler / codeGen / CgCallConv.hs

diff --git a/ghc/compiler/codeGen/CgCallConv.hs b/ghc/compiler/codeGen/CgCallConv.hs
index fa98f96..f5232a5 100644 (file)
--- a/ghc/compiler/codeGen/CgCallConv.hs
+++ b/ghc/compiler/codeGen/CgCallConv.hs
@@ -57,8 +57,8 @@ import Name           ( Name )
 import TyCon           ( TyCon, tyConFamilySize )
 import Bitmap          ( Bitmap, mAX_SMALL_BITMAP_SIZE, 
                          mkBitmap, intsToReverseBitmap )
-import Util            ( isn'tIn, sortLt )
-import CmdLineOpts     ( opt_Unregisterised )
+import Util            ( isn'tIn, sortLe )
+import StaticFlags     ( opt_Unregisterised )
 import FastString      ( LitString )
 import Outputable
 import DATA_BITS
@@ -108,6 +108,8 @@ argBits (PtrArg : args) = False : argBits args
 argBits (arg    : args) = take (cgRepSizeW arg) (repeat True) ++ argBits args
 
 stdPattern :: [CgRep] -> Maybe Int
+stdPattern []          = Just ARG_NONE -- just void args, probably
+
 stdPattern [PtrArg]    = Just ARG_P
 stdPattern [FloatArg]  = Just ARG_F
 stdPattern [DoubleArg] = Just ARG_D
@@ -350,7 +352,7 @@ buildContLiveness name live_slots
                -- (subtract one for the frame-header = return address).
        
                rel_slots :: [WordOff]
-               rel_slots = sortLt (<) 
+               rel_slots = sortLe (<=) 
                    [ start_sp - ofs  -- Get slots relative to top of frame
                    | ofs <- live_slots ]