[commit: ghc] ghc-8.0: Fix runtime linker error message when old symbol had no owner (38230e2)

[git at git.haskell.org]

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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/38230e2d4877e9eafcf0c1f8b5dc8bb531dfa348/ghc

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

commit 38230e2d4877e9eafcf0c1f8b5dc8bb531dfa348
Author: Reid Barton <rwbarton at gmail.com>
Date:   Mon Feb 1 09:43:48 2016 -0500

    Fix runtime linker error message when old symbol had no owner
    
    Test Plan: Actually run validate. This fixes test linker_error3.
    
    Reviewers: austin, erikd, bgamari
    
    Reviewed By: erikd, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1874
    
    (cherry picked from commit 73293109645efe42bf3fdf3335f4ab7cef39001b)


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

38230e2d4877e9eafcf0c1f8b5dc8bb531dfa348
 rts/Linker.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rts/Linker.c b/rts/Linker.c
index 29bd5d8..c225ab6 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -439,6 +439,7 @@ static int ghciInsertSymbolTable(
       "     loaded twice.\n",
       (char*)key,
       obj_name,
+      pinfo->owner == NULL ? "(GHCi built-in symbols)" :
       pinfo->owner->archiveMemberName ? pinfo->owner->archiveMemberName
       : pinfo->owner->fileName
    );