From: simonpj <unknown>
Date: Tue, 30 Jul 2002 11:49:18 +0000 (+0000)
Subject: [project @ 2002-07-30 11:49:17 by simonpj]
X-Git-Tag: Approx_11550_changesets_converted~1788
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=5b016a3f9e10a7714453913a97273ca3d180d372

[project @ 2002-07-30 11:49:17 by simonpj]
Wibble to yestdays commit re module versioning
---

diff --git a/ghc/compiler/main/TidyPgm.lhs b/ghc/compiler/main/TidyPgm.lhs
index 8c57005..bacbee4 100644
--- a/ghc/compiler/main/TidyPgm.lhs
+++ b/ghc/compiler/main/TidyPgm.lhs
@@ -493,7 +493,7 @@ tidyTopBinder mod ext_ids cg_info_env rec_tidy_env rhs tidy_rhs
 
 tidyTopIdInfo tidy_env is_external idinfo unfold_info arity cg_info
   | opt_OmitInterfacePragmas	-- If the interface file has no pragma info
-  = vanillaIdInfo		-- then discard all info right here
+  = hasCafIdInfo		-- then discard all info right here
 	-- This is not so important for *this* module, but it's
 	-- vital for ghc --make:
 	--   subsequent compilations must not see (e.g.) the arity if
@@ -501,11 +501,16 @@ tidyTopIdInfo tidy_env is_external idinfo unfold_info arity cg_info
 	-- If they do, they'll exploit the arity; then the arity might
 	-- change, but the iface file doesn't change => recompilation
 	-- does not happen => disaster
+	--
+	-- This IdInfo will live long-term in the Id => need to make
+	-- conservative assumption about Caf-hood
 
   | not is_external	-- For internal Ids (not externally visible)
   = vanillaIdInfo	-- we only need enough info for code generation
 			-- Arity and strictness info are enough;
 			--	c.f. CoreTidy.tidyLetBndr
+	-- Use vanillaIdInfo (whose CafInfo is a panic) because we 
+	-- should not need the CafInfo
 	`setArityInfo`	       arity
 	`setAllStrictnessInfo` newStrictnessInfo idinfo
 
diff --git a/ghc/compiler/typecheck/TcIfaceSig.lhs b/ghc/compiler/typecheck/TcIfaceSig.lhs
index f83b337..e52c8d7 100644
--- a/ghc/compiler/typecheck/TcIfaceSig.lhs
+++ b/ghc/compiler/typecheck/TcIfaceSig.lhs
@@ -87,9 +87,9 @@ tcInterfaceSigs unf_env mod decls
 tcIdInfo unf_env in_scope_vars name ty info_ins
   = foldlTc tcPrag init_info info_ins 
   where
-    -- set the CgInfo to something sensible but uninformative before
-    -- we start, because the default CgInfo is a panic.
-    init_info = vanillaIdInfo `setCgInfo` vanillaCgInfo
+    -- Set the CgInfo to something sensible but uninformative before
+    -- we start; default assumption is that it has CAFs
+    init_info = hasCafIdInfo
 
     tcPrag info (HsNoCafRefs)   = returnTc (info `setCafInfo`	 NoCafRefs)