[commit: ghc] master: Remove (now bogus) assert. (83e23c1)

git at git.haskell.org git at git.haskell.org
Mon Sep 21 22:44:12 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/83e23c1a4cce36de68c3c8323d27f24182b33f34/ghc

>---------------------------------------------------------------

commit 83e23c1a4cce36de68c3c8323d27f24182b33f34
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Mon Sep 21 15:46:09 2015 -0700

    Remove (now bogus) assert.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>


>---------------------------------------------------------------

83e23c1a4cce36de68c3c8323d27f24182b33f34
 compiler/main/GhcMake.hs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
index cc112da..3d29b1d 100644
--- a/compiler/main/GhcMake.hs
+++ b/compiler/main/GhcMake.hs
@@ -162,9 +162,12 @@ load how_much = do
     -- (see msDeps)
     let all_home_mods = [ms_mod_name s
                         | s <- mod_graph, not (isBootSummary s)]
-        bad_boot_mods = [s        | s <- mod_graph, isBootSummary s,
-                                    not (ms_mod_name s `elem` all_home_mods)]
-    ASSERT( null bad_boot_mods ) return ()
+    -- TODO: Figure out what the correct form of this assert is. It's violated
+    -- when you have HsBootMerge nodes in the graph: then you'll have hs-boot
+    -- files without corresponding hs files.
+    --  bad_boot_mods = [s        | s <- mod_graph, isBootSummary s,
+    --                              not (ms_mod_name s `elem` all_home_mods)]
+    -- ASSERT( null bad_boot_mods ) return ()
 
     -- check that the module given in HowMuch actually exists, otherwise
     -- topSortModuleGraph will bomb later.



More information about the ghc-commits mailing list