X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmParse.y;h=2cf1d1d821ab94dc71e0d78d50fb196e67d1aff7;hb=c6eadadbefe2ec5709e9d31893f79c4ff78754b4;hp=da80702aa34fc923fc4bffb8a318b96a7654b561;hpb=b44b0befe2b60cc9c4e4f8313bbb8b6207ad047c;p=ghc-hetmet.git diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index da80702..2cf1d1d 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -210,7 +210,7 @@ cmmproc :: { ExtCode } $6; return (info_lbl, info, live, formals, frame, gc_block) } blks <- code (cgStmtsToBlocks stmts) - code (emitInfoTableAndCode info_lbl (CmmInfo Nothing frame info) formals blks) } + code (emitInfoTableAndCode info_lbl (CmmInfo gc_block frame info) formals blks) } | info maybe_formals ';' { do (info_lbl, info, live) <- $1; @@ -866,6 +866,7 @@ foreignCall conv_string results_code expr_code args_code vols safety results <- sequence results_code expr <- expr_code args <- sequence args_code + --code (stmtC (CmmCall (CmmForeignCall expr convention) results args safety)) case convention of -- Temporary hack so at least some functions are CmmSafe CmmCallConv -> code (stmtC (CmmCall (CmmForeignCall expr convention) results args safety))