From bd5354e31c98c489d58ec686dd87d0d2d5e4d622 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 4 Sep 2012 13:57:26 +0100 Subject: Fix -split-objs with the new code generator We need to make the SRT label external and unique when splitting, because it is shared amongst all the functions in the module. Also some SRT-related cleanup. --- compiler/codeGen/StgCmmEnv.hs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'compiler/codeGen/StgCmmEnv.hs') diff --git a/compiler/codeGen/StgCmmEnv.hs b/compiler/codeGen/StgCmmEnv.hs index 9f1f161d37..e4611237cc 100644 --- a/compiler/codeGen/StgCmmEnv.hs +++ b/compiler/codeGen/StgCmmEnv.hs @@ -180,15 +180,13 @@ cgLookupPanic :: Id -> FCode a cgLookupPanic id = do static_binds <- getStaticBinds local_binds <- getBinds - srt <- getSRTLabel - pprPanic "StgCmmEnv: variable not found" + pprPanic "StgCmmEnv: variable not found" (vcat [ppr id, ptext (sLit "static binds for:"), vcat [ ppr (cg_id info) | info <- varEnvElts static_binds ], ptext (sLit "local binds for:"), - vcat [ ppr (cg_id info) | info <- varEnvElts local_binds ], - ptext (sLit "SRT label") <+> ppr srt - ]) + vcat [ ppr (cg_id info) | info <- varEnvElts local_binds ] + ]) -------------------- -- cgit v1.2.1