[commit: ghc] newcg: Don't call computeSRTs when -fnew-codegen is on (1fdb39b)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : newcg

http://hackage.haskell.org/trac/ghc/changeset/1fdb39b5a648bac2a7c68ae8f69b074e39b0ea2e

>---------------------------------------------------------------

commit 1fdb39b5a648bac2a7c68ae8f69b074e39b0ea2e
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Fri Jan 27 09:52:04 2012 +0000

    Don't call computeSRTs when -fnew-codegen is on

>---------------------------------------------------------------

 compiler/codeGen/StgCmmUtils.hs |    2 +-
 compiler/simplStg/SimplStg.lhs  |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/codeGen/StgCmmUtils.hs b/compiler/codeGen/StgCmmUtils.hs
index 93a8bf3..391dc16 100644
--- a/compiler/codeGen/StgCmmUtils.hs
+++ b/compiler/codeGen/StgCmmUtils.hs
@@ -816,7 +816,7 @@ assignTemp' e
 -- the nested bindings via the monad.
 
 getSRTInfo :: SRT -> FCode C_SRT
-getSRTInfo (SRTEntries {}) = panic "getSRTInfo"
+getSRTInfo (SRTEntries {}) = return NoC_SRT --panic "getSRTInfo"
 
 getSRTInfo (SRT off len bmp)
   | len > hALF_WORD_SIZE_IN_BITS || bmp == [fromIntegral srt_escape]
diff --git a/compiler/simplStg/SimplStg.lhs b/compiler/simplStg/SimplStg.lhs
index 8ade2d5..b5b55fc 100644
--- a/compiler/simplStg/SimplStg.lhs
+++ b/compiler/simplStg/SimplStg.lhs
@@ -52,7 +52,9 @@ stg2stg dflags module_name binds
 	; (processed_binds, _, cost_centres) 
 		<- foldl_mn do_stg_pass (binds', us', ccs) (getStgToDo dflags)
 
-	; let srt_binds = computeSRTs processed_binds
+        ; let srt_binds
+               | dopt Opt_TryNewCodeGen dflags = zip processed_binds (repeat [])
+               | otherwise = computeSRTs processed_binds
 
 	; dumpIfSet_dyn dflags Opt_D_dump_stg "STG syntax:" 
 	     		(pprStgBindingsWithSRTs srt_binds)