From 0fd760c2967712adb2a924f4a78076548b54df66 Mon Sep 17 00:00:00 2001 From: simonmar Date: Tue, 2 Apr 2002 12:22:37 +0000 Subject: [PATCH 1/1] [project @ 2002-04-02 12:22:37 by simonmar] oops, accidentally committed some untested (and non-working) cleanups in the last commit. This commit fixes it up again. (fixes the ByteCodeGen panic in GHCi on the HEAD) --- ghc/compiler/ghci/ByteCodeGen.lhs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc/compiler/ghci/ByteCodeGen.lhs b/ghc/compiler/ghci/ByteCodeGen.lhs index 8c5ae8c..8b0a8a5 100644 --- a/ghc/compiler/ghci/ByteCodeGen.lhs +++ b/ghc/compiler/ghci/ByteCodeGen.lhs @@ -643,9 +643,12 @@ schemeT d s p app -- Case 2 | [arg1,arg2] <- args_r_to_l, - let isVoidRepAtom (_, AnnVar v) = VoidRep == typePrimRep (idType v) + let + isVoidRepAtom (_, AnnVar v) = typePrimRep (idType v) == VoidRep isVoidRepAtom (_, AnnNote n e) = isVoidRepAtom e - in isVoidRepAtom arg2 + isVoidRepAtom _ = False + in + isVoidRepAtom arg2 = --trace (if isSingleton args_r_to_l -- then "schemeT: unboxed singleton" -- else "schemeT: unboxed pair with Void first component") ( -- 1.7.10.4