diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-20 16:03:50 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-20 16:28:42 -0700 |
| commit | d5d6fb340410727345a7b5a47bcf83e7847ea4a3 (patch) | |
| tree | 88b880020f9a51b694d9bf23e546db3a7b8377e6 /compiler/codeGen | |
| parent | a3860fc4e253ecb4854e86aed78c56e72f318840 (diff) | |
| download | haskell-d5d6fb340410727345a7b5a47bcf83e7847ea4a3.tar.gz | |
Revert "Place static closures in their own section."
This reverts commit b23ba2a7d612c6b466521399b33fe9aacf5c4f75.
Conflicts:
compiler/cmm/PprCmmDecl.hs
compiler/nativeGen/PPC/Ppr.hs
compiler/nativeGen/SPARC/Ppr.hs
compiler/nativeGen/X86/Ppr.hs
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/StgCmmBind.hs | 4 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmCon.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmUtils.hs | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/compiler/codeGen/StgCmmBind.hs b/compiler/codeGen/StgCmmBind.hs index a253b11751..444112f967 100644 --- a/compiler/codeGen/StgCmmBind.hs +++ b/compiler/codeGen/StgCmmBind.hs @@ -98,7 +98,7 @@ cgTopRhsClosure dflags rec id ccs _ upd_flag args body = let closure_rep = mkStaticClosureFields dflags indStaticInfoTable ccs MayHaveCafRefs [unLit (idInfoToAmode cg_info)] - emitStaticClosure closure_label closure_rep + emitDataLits closure_label closure_rep return () gen_code dflags lf_info closure_label @@ -113,7 +113,7 @@ cgTopRhsClosure dflags rec id ccs _ upd_flag args body = closure_rep = mkStaticClosureFields dflags info_tbl ccs caffy [] -- BUILD THE OBJECT, AND GENERATE INFO TABLE (IF NECESSARY) - ; emitStaticClosure closure_label closure_rep + ; emitDataLits closure_label closure_rep ; let fv_details :: [(NonVoid Id, VirtualHpOffset)] (_, _, fv_details) = mkVirtHeapOffsets dflags (isLFThunk lf_info) (addIdReps []) diff --git a/compiler/codeGen/StgCmmCon.hs b/compiler/codeGen/StgCmmCon.hs index 93bfaf0dd2..edd064848f 100644 --- a/compiler/codeGen/StgCmmCon.hs +++ b/compiler/codeGen/StgCmmCon.hs @@ -101,7 +101,7 @@ cgTopRhsCon dflags id con args = payload -- BUILD THE OBJECT - ; emitStaticClosure closure_label closure_rep + ; emitDataLits closure_label closure_rep ; return () } diff --git a/compiler/codeGen/StgCmmUtils.hs b/compiler/codeGen/StgCmmUtils.hs index 8b3616f2f0..d47a01661a 100644 --- a/compiler/codeGen/StgCmmUtils.hs +++ b/compiler/codeGen/StgCmmUtils.hs @@ -12,7 +12,6 @@ module StgCmmUtils ( cgLit, mkSimpleLit, emitDataLits, mkDataLits, emitRODataLits, mkRODataLits, - emitStaticClosure, emitRtsCall, emitRtsCallWithResult, emitRtsCallGen, assignTemp, newTemp, @@ -321,11 +320,6 @@ emitRODataLits :: CLabel -> [CmmLit] -> FCode () -- Emit a read-only data block emitRODataLits lbl lits = emitDecl (mkRODataLits lbl lits) -emitStaticClosure :: CLabel -> [CmmLit] -> FCode () --- Emit a static closure data block, which is only used at startup time. --- Eventually make this READ ONLY(?) -emitStaticClosure lbl lits = emitDecl (mkDataLits StaticClosures lbl lits) - newStringCLit :: String -> FCode CmmLit -- Make a global definition for the string, -- and return its label |