diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-01-27 09:52:04 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-01-27 09:52:04 +0000 |
| commit | 1fdb39b5a648bac2a7c68ae8f69b074e39b0ea2e (patch) | |
| tree | 85540a3b21a2749b02b843a673e82166a78e648a /compiler | |
| parent | 46a772f8efb7aa9d350227e8fd5d5809757c3f1e (diff) | |
| download | haskell-1fdb39b5a648bac2a7c68ae8f69b074e39b0ea2e.tar.gz | |
Don't call computeSRTs when -fnew-codegen is on
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/codeGen/StgCmmUtils.hs | 2 | ||||
| -rw-r--r-- | 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 93a8bf317b..391dc163f1 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 8ade2d5f10..b5b55fc291 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) |