Cast parameters to makestack to uintptr_t which is not always the same as unsigned...

diff --git a/debian/changelog b/debian/changelog
index f64d046e3a9a9da5dbb03a2e5343be560bcaddf5..a86750a63b0dd3900543dc9a9b03431bf8a78fe9 100644 (file)
--- 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 <plugwash@raspbian.org>  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 3e21c7378c3044c877e753256e1162e51189a7f2..c7815bf2fa6b4c7c5c2682a5d90b83b80b786b18 100644 (file)
--- 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]