diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-11-28 16:32:50 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-11-29 09:12:54 +0000 |
| commit | cbe2416808d2592429830b5d0c202cdee80c36d3 (patch) | |
| tree | 212db87e23980f97c116d313a462ae897a47b68d /compiler/codeGen/CgForeignCall.hs | |
| parent | 7d13e50487eb7f80be9a8b330ef65e07138b27ef (diff) | |
| download | haskell-cbe2416808d2592429830b5d0c202cdee80c36d3.tar.gz | |
Get rid of the "safety" field of CmmCall (OldCmm)
This field was doing nothing. I think it originally appeared in a
very old incarnation of the new code generator.
Diffstat (limited to 'compiler/codeGen/CgForeignCall.hs')
| -rw-r--r-- | compiler/codeGen/CgForeignCall.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs index d96e9f8cfc..7d67132fcf 100644 --- a/compiler/codeGen/CgForeignCall.hs +++ b/compiler/codeGen/CgForeignCall.hs @@ -127,7 +127,7 @@ emitForeignCall' safety results target args vols _srt ret let (caller_save, caller_load) = callerSaveVolatileRegs vols let caller_load' = if ret == CmmNeverReturns then [] else caller_load stmtsC caller_save - stmtC (CmmCall target results temp_args CmmUnsafe ret) + stmtC (CmmCall target results temp_args ret) stmtsC caller_load' | otherwise = do @@ -149,12 +149,12 @@ emitForeignCall' safety results target args vols _srt ret [ CmmHinted id AddrHint ] [ CmmHinted (CmmReg (CmmGlobal BaseReg)) AddrHint , CmmHinted (CmmLit (CmmInt (fromIntegral (fromEnum (playInterruptible safety))) wordWidth)) NoHint] - CmmUnsafe ret) - stmtC (CmmCall temp_target results temp_args CmmUnsafe ret) + ret) + stmtC (CmmCall temp_target results temp_args ret) stmtC (CmmCall (CmmCallee resumeThread CCallConv) [ CmmHinted new_base AddrHint ] [ CmmHinted (CmmReg (CmmLocal id)) AddrHint ] - CmmUnsafe ret) + ret) -- Assign the result to BaseReg: we -- might now have a different Capability! stmtC (CmmAssign (CmmGlobal BaseReg) (CmmReg (CmmLocal new_base))) |