Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6784dddc7f16e73382d1855962f93cf4a712a496

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

commit 6784dddc7f16e73382d1855962f93cf4a712a496
Author: Ian Lynagh <i...@well-typed.com>
Date:   Fri Oct 5 00:40:50 2012 +0100

    Make adjust_ul handle BCOs
    
    We never ran into this before, because replace_osuf was almost always
    False (i.e. we were almost always using the vanilla way when using
    bytecode, so adjust_ul wasn't needed). Now that we can have the dynamic
    way on by default many tests were failing because of it.

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

 compiler/ghci/Linker.lhs |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index 23e0474..8f572e8 100644
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -647,7 +647,9 @@ getLinkDeps hsc_env hpt pls replace_osuf span mods
                                       ptext (sLit "cannot find normal object 
file ")
                                             <> quotes (text new_file) $$ 
while_linking_expr
                                else return (DotO new_file)
-            adjust_ul _ = panic "adjust_ul"
+            adjust_ul (DotA fp) = panic ("adjust_ul DotA " ++ show fp)
+            adjust_ul (DotDLL fp) = panic ("adjust_ul DotDLL " ++ show fp)
+            adjust_ul l@(BCOs {}) = return l
 \end{code}
 
 



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to