From 3c1b89ab88b2f349a698e9eb05d0e971a670f245 Mon Sep 17 00:00:00 2001
From: simonpj <unknown>
Date: Fri, 9 Jun 2000 07:32:31 +0000
Subject: [PATCH] [project @ 2000-06-09 07:32:31 by simonpj] In my commit of 24
May I got this boolean condition back to front:
tryWW non_rec fn_id rhs
| not (isNeverInlinePrag inline_prag)
= -- Don't split things that will never be inlined
The 'not' is obviously wrong! As a result virtually nothing
is being worker-wrapper'd
How this has survived for more than two weeks beats me.
---
ghc/compiler/basicTypes/OccName.lhs | 14 +-------------
ghc/compiler/hsSyn/HsTypes.lhs | 3 +++
ghc/compiler/stranal/WorkWrap.lhs | 2 +-
3 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/ghc/compiler/basicTypes/OccName.lhs b/ghc/compiler/basicTypes/OccName.lhs
index 98eb7c17dd30..76cbbb06c50c 100644
--- a/ghc/compiler/basicTypes/OccName.lhs
+++ b/ghc/compiler/basicTypes/OccName.lhs
@@ -66,19 +66,7 @@ type EncodedString = String -- Encoded form
pprEncodedFS :: EncodedFS -> SDoc
-pprEncodedFS fs
- = getPprStyle $ \ sty ->
- if userStyle sty then
- let
- s = decode (_UNPK_ fs)
- c = head s
- in
- if startsVarSym c || startsConSym c then
- parens (text s)
- else
- text s
- else
- ptext fs
+pprEncodedFS fs = ptext fs
\end{code}
%************************************************************************
diff --git a/ghc/compiler/hsSyn/HsTypes.lhs b/ghc/compiler/hsSyn/HsTypes.lhs
index a795a2f1ae1a..40d50f3935c8 100644
--- a/ghc/compiler/hsSyn/HsTypes.lhs
+++ b/ghc/compiler/hsSyn/HsTypes.lhs
@@ -145,6 +145,9 @@ replaceTyVarName (IfaceTyVar n k) n' = IfaceTyVar n' k
%* *
%************************************************************************
+NB: these types get printed into interface files, so
+ don't change the printing format lightly
+
\begin{code}
instance (Outputable name) => Outputable (HsType name) where
ppr ty = pprHsType ty
diff --git a/ghc/compiler/stranal/WorkWrap.lhs b/ghc/compiler/stranal/WorkWrap.lhs
index 15736354b063..87f560b57590 100644
--- a/ghc/compiler/stranal/WorkWrap.lhs
+++ b/ghc/compiler/stranal/WorkWrap.lhs
@@ -190,7 +190,7 @@ tryWW :: Bool -- True <=> a non-recursive binding
-- if two, then a worker and a
-- wrapper.
tryWW non_rec fn_id rhs
- | not (isNeverInlinePrag inline_prag)
+ | isNeverInlinePrag inline_prag
= -- Don't split things that will never be inlined
returnUs [ (fn_id, rhs) ]
--
GitLab