From a3f306d5e73bf559ada237697bbbed46b623c874 Mon Sep 17 00:00:00 2001 From: panne Date: Mon, 29 Apr 2002 18:42:04 +0000 Subject: [PATCH] [project @ 2002-04-29 18:42:03 by panne] (F)SLIT fixes, continued... --- ghc/compiler/ghci/ByteCodeGen.lhs | 4 +--- ghc/compiler/ghci/ByteCodeLink.lhs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ghc/compiler/ghci/ByteCodeGen.lhs b/ghc/compiler/ghci/ByteCodeGen.lhs index 56f64fc..3fc5433 100644 --- a/ghc/compiler/ghci/ByteCodeGen.lhs +++ b/ghc/compiler/ghci/ByteCodeGen.lhs @@ -42,7 +42,7 @@ import PrimRep ( isFollowableRep ) import CmdLineOpts ( DynFlags, DynFlag(..) ) import ErrUtils ( showPass, dumpIfSet_dyn ) import Unique ( mkPseudoUnique3 ) -import FastString ( FastString(..) ) +import FastString ( FastString(..), unpackFS ) import Panic ( GhcException(..) ) import PprType ( pprType ) import SMRep ( arrWordsHdrSize, arrPtrsHdrSize ) @@ -1192,8 +1192,6 @@ pushAtom False d p (AnnLit lit) pushStr s = let getMallocvilleAddr = case s of - CharStr s i -> returnBc (Ptr s) - FastString _ l ba -> -- sigh, a string in the heap is no good to us. -- We need a static C pointer, since the type of diff --git a/ghc/compiler/ghci/ByteCodeLink.lhs b/ghc/compiler/ghci/ByteCodeLink.lhs index 04e8433..a1132ee 100644 --- a/ghc/compiler/ghci/ByteCodeLink.lhs +++ b/ghc/compiler/ghci/ByteCodeLink.lhs @@ -28,7 +28,7 @@ import PrimRep ( PrimRep(..) ) import Constants ( wORD_SIZE ) import Module ( ModuleName, moduleName, moduleNameFS ) import Linker ( lookupSymbol ) -import FastString ( FastString(..) ) +import FastString ( FastString(..), unpackFS ) import ByteCodeInstr ( BCInstr(..), ProtoBCO(..) ) import ByteCodeItbls ( ItblEnv, ItblPtr ) import FiniteMap -- 1.7.10.4