summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorReid Barton <rwbarton@gmail.com>2016-02-01 09:43:48 -0500
committerReid Barton <rwbarton@gmail.com>2016-02-01 10:30:57 -0500
commit73293109645efe42bf3fdf3335f4ab7cef39001b (patch)
tree20ed110d14aaca45f8ceddc443234170d9b42d78 /rts
parent02e3ce0bc65f586376c3d2ecab498a4c5a3f6a54 (diff)
downloadhaskell-73293109645efe42bf3fdf3335f4ab7cef39001b.tar.gz
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
Diffstat (limited to 'rts')
-rw-r--r--rts/Linker.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/rts/Linker.c b/rts/Linker.c
index 29bd5d8b47..c225ab621c 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
);