Bug 563195: Fix -Wshadow warnings in public SPS headers. r=BenWa
authorL. David Baron <dbaron@dbaron.org>
Sun, 17 Feb 2013 22:56:32 -0800
changeset 122208 4fa2028f2e3c8b926018621b8efcf5eb5facb09b
parent 122207 2b8d67b35d8292c9363bd80ed06a1c6542db4e3a
child 122209 ff75b06e2330e7586556bdea50c31e27ff550a55
push id24322
push userdbaron@mozilla.com
push dateMon, 18 Feb 2013 08:55:11 +0000
treeherdermozilla-central@0acbd06d48a9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBenWa
bugs563195
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 563195: Fix -Wshadow warnings in public SPS headers. r=BenWa
tools/profiler/sps_sampler.h
--- a/tools/profiler/sps_sampler.h
+++ b/tools/profiler/sps_sampler.h
@@ -252,28 +252,28 @@ private:
 class StackEntry : public js::ProfileEntry
 {
 public:
 
   bool isCopyLabel() volatile {
     return !((uintptr_t)stackAddress() & 0x1);
   }
 
-  void setStackAddressCopy(void *sp, bool copy) volatile {
+  void setStackAddressCopy(void *sparg, bool copy) volatile {
     // Tagged pointer. Less significant bit used to track if mLabel needs a
     // copy. Note that we don't need the last bit of the stack address for
     // proper ordering. This is optimized for encoding within the JS engine's
     // instrumentation, so we do the extra work here of encoding a bit.
     // Last bit 1 = Don't copy, Last bit 0 = Copy.
     if (copy) {
       setStackAddress(reinterpret_cast<void*>(
-                        reinterpret_cast<uintptr_t>(sp) & ~0x1));
+                        reinterpret_cast<uintptr_t>(sparg) & ~0x1));
     } else {
       setStackAddress(reinterpret_cast<void*>(
-                        reinterpret_cast<uintptr_t>(sp) | 0x1));
+                        reinterpret_cast<uintptr_t>(sparg) | 0x1));
     }
   }
 };
 
 // the SamplerStack members are read by signal
 // handlers, so the mutation of them needs to be signal-safe.
 struct ProfileStack
 {