[commit: ghc] master: Fix runtime linker error message when old symbol had no owner (7329310)
git at git.haskell.org
git at git.haskell.org
Mon Feb 1 15:30:02 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/73293109645efe42bf3fdf3335f4ab7cef39001b/ghc
>---------------------------------------------------------------
commit 73293109645efe42bf3fdf3335f4ab7cef39001b
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
>---------------------------------------------------------------
73293109645efe42bf3fdf3335f4ab7cef39001b
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
);
More information about the ghc-commits
mailing list