From 95cd90edee9103561360a1613528421d7e638348 Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Thu, 2 Feb 2017 08:29:18 +0100
Subject: [PATCH] Bug 1329150 - Remove ENABLE_ARM_LR_SAVING and its code. 
 r=mstange.

--HG--
extra : rebase_source : 14c459cbfa061a885221d2d89a98f98d721679c2
---
 tools/profiler/core/Sampler.cpp       | 5 -----
 tools/profiler/core/platform-linux.cc | 4 ----
 tools/profiler/core/platform.h        | 5 -----
 3 files changed, 14 deletions(-)

diff --git a/tools/profiler/core/Sampler.cpp b/tools/profiler/core/Sampler.cpp
index 8b7fc245e1f5..1d0bebe535a8 100644
--- a/tools/profiler/core/Sampler.cpp
+++ b/tools/profiler/core/Sampler.cpp
@@ -881,9 +881,7 @@ mergeStacksIntoProfile(ThreadInfo& aInfo, TickSample* aSample,
       JS::ProfilingFrameIterator::RegisterState registerState;
       registerState.pc = aSample->pc;
       registerState.sp = aSample->sp;
-#ifdef ENABLE_ARM_LR_SAVING
       registerState.lr = aSample->lr;
-#endif
 
       JS::ProfilingFrameIterator jsIter(pseudoStack->mContext,
                                         registerState,
@@ -1278,9 +1276,6 @@ doSampleStackTrace(ThreadInfo& aInfo, TickSample* aSample,
 #ifdef ENABLE_LEAF_DATA
   if (aSample && aAddLeafAddresses) {
     aInfo.addTag(ProfileEntry('l', (void*)aSample->pc));
-#ifdef ENABLE_ARM_LR_SAVING
-    aInfo.addTag(ProfileEntry('L', (void*)aSample->lr));
-#endif
   }
 #endif
 }
diff --git a/tools/profiler/core/platform-linux.cc b/tools/profiler/core/platform-linux.cc
index e6ebd49b1656..cde64c1f2cc3 100644
--- a/tools/profiler/core/platform-linux.cc
+++ b/tools/profiler/core/platform-linux.cc
@@ -203,17 +203,13 @@ static void SetSampleContext(TickSample* sample, void* context)
   sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]);
   sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]);
   sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]);
-#ifdef ENABLE_ARM_LR_SAVING
   sample->lr = reinterpret_cast<Address>(mcontext.gregs[R14]);
-#endif
 #else
   sample->pc = reinterpret_cast<Address>(mcontext.arm_pc);
   sample->sp = reinterpret_cast<Address>(mcontext.arm_sp);
   sample->fp = reinterpret_cast<Address>(mcontext.arm_fp);
-#ifdef ENABLE_ARM_LR_SAVING
   sample->lr = reinterpret_cast<Address>(mcontext.arm_lr);
 #endif
-#endif
 #elif V8_HOST_ARCH_MIPS
   // Implement this on MIPS.
   UNIMPLEMENTED();
diff --git a/tools/profiler/core/platform.h b/tools/profiler/core/platform.h
index dc864977292a..eb909a295e53 100644
--- a/tools/profiler/core/platform.h
+++ b/tools/profiler/core/platform.h
@@ -80,7 +80,6 @@ bool profiler_verbose();
 #ifdef ANDROID
 # if defined(__arm__) || defined(__thumb__)
 #  define ENABLE_LEAF_DATA
-#  define ENABLE_ARM_LR_SAVING
 # endif
 # define LOG(text) \
     do { if (profiler_verbose()) \
@@ -201,9 +200,7 @@ class TickSample {
       : pc(NULL)
       , sp(NULL)
       , fp(NULL)
-#ifdef ENABLE_ARM_LR_SAVING
       , lr(NULL)
-#endif
       , context(NULL)
       , isSamplingCurrentThread(false)
       , threadInfo(nullptr)
@@ -216,9 +213,7 @@ class TickSample {
   Address pc;  // Instruction pointer.
   Address sp;  // Stack pointer.
   Address fp;  // Frame pointer.
-#ifdef ENABLE_ARM_LR_SAVING
   Address lr;  // ARM link register
-#endif
   void*   context;   // The context from the signal handler, if available. On
                      // Win32 this may contain the windows thread context.
   bool    isSamplingCurrentThread;