From df54e4b621b1d2a8e30b01b3e93494a515d09f48 Mon Sep 17 00:00:00 2001 From: "dias@eecs.harvard.edu" Date: Wed, 26 Nov 2008 16:57:42 +0000 Subject: [PATCH] one more missing patch from new codegen path --- compiler/cmm/CmmExpr.hs | 2 ++ compiler/codeGen/StgCmmBind.hs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/cmm/CmmExpr.hs b/compiler/cmm/CmmExpr.hs index 6e09a6f..6c38c03 100644 --- a/compiler/cmm/CmmExpr.hs +++ b/compiler/cmm/CmmExpr.hs @@ -419,6 +419,8 @@ instance Ord GlobalReg where compare _ GCFun = GT compare BaseReg _ = LT compare _ BaseReg = GT + compare EagerBlackholeInfo _ = LT + compare _ EagerBlackholeInfo = GT -- convenient aliases spReg, hpReg, spLimReg, nodeReg :: CmmReg diff --git a/compiler/codeGen/StgCmmBind.hs b/compiler/codeGen/StgCmmBind.hs index ad1b3e2..e4960fc 100644 --- a/compiler/codeGen/StgCmmBind.hs +++ b/compiler/codeGen/StgCmmBind.hs @@ -597,7 +597,7 @@ link_caf :: ClosureInfo -- updated with the new value when available. The reason for all of this -- is that we only want to update dynamic heap objects, not static ones, -- so that generational GC is easier. -link_caf cl_info is_upd = do +link_caf cl_info _is_upd = do { -- Alloc black hole specifying CC_HDR(Node) as the cost centre ; let use_cc = costCentreFrom (CmmReg nodeReg) blame_cc = use_cc -- 1.7.10.4