From f874c436d0165b7d07f63d529c7bef1cf6de0577 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Thu, 6 Oct 2011 13:15:51 +0900
Subject: [PATCH] Bug 690668 - TEST-UNEXPECTED-FAIL |
 c:\talos-slave\test\build\xpcshell\tests\toolkit\components\passwordmgr\test\unit\test_storage_legacy_2.js
 | test failed (with xpcshell return code: 0), see following log:. r=bsmedberg

---
 xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64.cpp b/xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64.cpp
index bb921ca04763..9d80975a4bed 100644
--- a/xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64.cpp
+++ b/xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64.cpp
@@ -176,7 +176,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex, PRUint64* args,
 
         case nsXPTType::T_BOOL:
            if (iCount < PARAM_GPR_COUNT)
-              dp->val.b  = (bool)gprData[iCount++];
+              // We need cast to PRUint8 to remove garbage on upper 56-bit
+              // at first.
+              dp->val.b  = (bool)(PRUint8)gprData[iCount++];
            else
               dp->val.b  = *((bool*)ap++);
            break;