From 3e5d3e6733517cc1fdd81fc9eb445c8f52410d51 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Tue, 15 Feb 2022 22:36:23 +0000 Subject: [PATCH] Cast parameters to makestack to uintptr_t which is not always the same as unsigned long. --- debian/changelog | 2 ++ .../telemetry/tests/gtest/TestCombinedStacks.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f64d046e3a9..a86750a63b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ firefox-esr (91.6.0esr-1~deb10u1+rpi1) buster-staging; urgency=medium [changes introduced in 91.6.0esr-1~deb10u1+rpi1 by Peter Michael Green] * Build swgl with clang rather than gcc to avoid internal compiler error. + * Cast parameters to makestack to uintptr_t which is not always the same + as unsigned long. -- Peter Michael Green Tue, 15 Feb 2022 04:45:41 +0000 diff --git a/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp b/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp index 3e21c7378c3..c7815bf2fa6 100644 --- a/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp +++ b/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp @@ -87,10 +87,10 @@ TEST(CombinedStacks, Combine) // 02 modZ+2000 // 03 base+4000 const ProcessedStack testStacks[] = { - MakeStack(moduleSet1, {100ul, 200ul, 300ul}), - MakeStack(moduleSet1, {1000ul, 2000ul, 3000ul}), - MakeStack(moduleSet2, {100ul, 200ul, 300ul, 400ul}), - MakeStack(moduleSet2, {1000ul, 2000ul, 3000ul, 4000ul}), + MakeStack(moduleSet1, {(uintptr_t)100ul, (uintptr_t)200ul, (uintptr_t)300ul}), + MakeStack(moduleSet1, {(uintptr_t)1000ul, (uintptr_t)2000ul, (uintptr_t)3000ul}), + MakeStack(moduleSet2, {(uintptr_t)100ul, (uintptr_t)200ul, (uintptr_t)300ul, (uintptr_t)400ul}), + MakeStack(moduleSet2, {(uintptr_t)1000ul, (uintptr_t)2000ul, (uintptr_t)3000ul, (uintptr_t)4000ul}), }; // combined1 <-- testStacks[0] + testStacks[1] -- 2.30.2