summaryrefslogtreecommitdiff
path: root/rts/Linker.c
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2016-06-29 21:48:43 +0100
committerSimon Marlow <marlowsd@gmail.com>2016-07-01 13:20:04 +0100
commitee8d1facb20ab579c44bf4cd7d5fd807d547b6ad (patch)
treea479019d20198ab994467121cfae487b69fab99f /rts/Linker.c
parent6ba4197e006b6d6bc2657141d4c10c91bd806cb3 (diff)
downloadhaskell-ee8d1facb20ab579c44bf4cd7d5fd807d547b6ad.tar.gz
Remove unused oc->isImportLib (#12230)
Summary: This field is never set, but it was being tested and used to decide whether to resolve an object or not. This caused non-deterministic crashes when using the RTS linker (see #12230). I suspect this is not the correct fix, but putting it up so that Phyx can tell us what the right fix should be. Test Plan: validate Reviewers: austin, Phyx, bgamari, erikd Subscribers: erikd, thomie, ezyang Differential Revision: https://phabricator.haskell.org/D2371 GHC Trac Issues: #12230
Diffstat (limited to 'rts/Linker.c')
-rw-r--r--rts/Linker.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/rts/Linker.c b/rts/Linker.c
index f7ac748b20..b41bc1a641 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -1703,9 +1703,7 @@ void freeObjectCode (ObjectCode *oc)
* Sets the initial status of a fresh ObjectCode
*/
static void setOcInitialStatus(ObjectCode* oc) {
- if (oc->isImportLib == HS_BOOL_TRUE) {
- oc->status = OBJECT_DONT_RESOLVE;
- } else if (oc->archiveMemberName == NULL) {
+ if (oc->archiveMemberName == NULL) {
oc->status = OBJECT_NEEDED;
} else {
oc->status = OBJECT_LOADED;