From: Michael Karcher <debian@mkarcher.dialup.fu-berlin.de>
Date: Wed, 31 Jan 2018 23:04:36 +0000 (+0100)
Subject: Bug 1434726 - Early startup crash on Linux sparc64 in HashIIDPtrKey
X-Git-Tag: archive/raspbian/1%60.5.1-1+rpi1~1^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=017d13776d3ab6e809829779d0e15e2e312df9eb;p=thunderbird.git

Bug 1434726 - Early startup crash on Linux sparc64 in HashIIDPtrKey

Origin: not yet exist
Bug-Debian: not yet exist
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1434726
Applied-Upstream: TBD

Gbp-Pq: Topic porting-sparc64
Gbp-Pq: Name Bug-1434726-Early-startup-crash-on-Linux-sparc64-in-HashI.patch
---

diff --git a/js/xpconnect/src/XPCMaps.cpp b/js/xpconnect/src/XPCMaps.cpp
index 5abdcf1658..98e126fb2e 100644
--- a/js/xpconnect/src/XPCMaps.cpp
+++ b/js/xpconnect/src/XPCMaps.cpp
@@ -21,7 +21,7 @@ using namespace mozilla;
 // nsID, not the hash of the pointer to the nsID.
 
 static PLDHashNumber HashIIDPtrKey(const void* key) {
-  return HashGeneric(*((uintptr_t*)key));
+  return HashGeneric(((nsID*)key)->m0);
 }
 
 static bool MatchIIDPtrKey(const PLDHashEntryHdr* entry, const void* key) {