X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FcodeGen%2FCgForeignCall.hs;h=e56189ae11b88948cde344d050f9f66c7bce9d5a;hb=174c7f292b3c18c9cc44c21bd07111f351e3913c;hp=155e30205c1cc281563498a6eee246c791eaf806;hpb=8f94d42a1d32f3c4747e1ad8bb846076d0b59b78;p=ghc-hetmet.git diff --git a/ghc/compiler/codeGen/CgForeignCall.hs b/ghc/compiler/codeGen/CgForeignCall.hs index 155e302..e56189a 100644 --- a/ghc/compiler/codeGen/CgForeignCall.hs +++ b/ghc/compiler/codeGen/CgForeignCall.hs @@ -32,7 +32,7 @@ import MachOp import SMRep import ForeignCall import Constants -import StaticFlags ( opt_SccProfilingOn, opt_SMP ) +import StaticFlags ( opt_SccProfilingOn ) import Outputable import Monad ( when ) @@ -85,11 +85,10 @@ emitForeignCall results (CCall (CCallSpec target cconv safety)) args live ) stmtC (the_call vols) stmtC (CmmCall (CmmForeignCall resumeThread CCallConv) - (if opt_SMP then [(CmmGlobal BaseReg, PtrHint)] else []) - -- Assign the result to BaseReg: we might now have - -- a different Capability! Small optimisation: - -- only do this in SMP mode, where there are >1 - -- Capabilities. + [ (CmmGlobal BaseReg, PtrHint) ] + -- Assign the result to BaseReg: we + -- might now have a different + -- Capability! [ (CmmReg id, PtrHint) ] (Just vols) )