Revert of Move GetProgramCounter in FROM_HERE to a common function

base/location.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(COMPILER_MSVC)
 #include <intrin.h>
 #endif
 
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 
 namespace tracked_objects {
-namespace {
-
-#if defined(COMPILER_MSVC)
-__forceinline
-#elif defined(COMPILER_GCC) && !defined(OS_NACL)
-__attribute__((always_inline))
-inline
-#endif
-const void* GetReturnAddress() {
-#if defined(COMPILER_MSVC)
-  return _ReturnAddress();
-#elif defined(COMPILER_GCC) && !defined(OS_NACL)
-  return __builtin_extract_return_addr(__builtin_return_address(0));
-#else
-  return nullptr;
-#endif
-}
-
-}  // namespace
 
 Location::Location(const char* function_name,
                    const char* file_name,
                    int line_number,
                    const void* program_counter)
     : function_name_(function_name),
       file_name_(file_name),
       line_number_(line_number),
       program_counter_(program_counter) {
 }
 
 Location::Location()
     : function_name_("Unknown"),
       file_name_("Unknown"),
       line_number_(-1),
       program_counter_(NULL) {
 }
 
 Location::Location(const Location& other)
     : function_name_(other.function_name_),
       file_name_(other.file_name_),
       line_number_(other.line_number_),
       program_counter_(other.program_counter_) {
 }
 
-// static
-#if defined(COMPILER_MSVC)
-__declspec(noinline)
-#endif
-Location Location::CreateForCurrentProgramCounter(
-      const char* function_name,
-      const char* file_name,
-      int line_number) {
-  const void* program_counter = GetReturnAddress();
-  return Location(function_name, file_name, line_number, program_counter);
-}
-
 std::string Location::ToString() const {
   return std::string(function_name_) + "@" + file_name_ + ":" +
       base::IntToString(line_number_);
 }
 
 void Location::Write(bool display_filename, bool display_function_name,
                      std::string* output) const {
   base::StringAppendF(output, "%s[%d] ",
       display_filename ? file_name_ : "line",
       line_number_);
@@ skipping 36 matching lines @@
 }
 
 LocationSnapshot::~LocationSnapshot() {
 }
 
 //------------------------------------------------------------------------------
 #if defined(COMPILER_MSVC)
 __declspec(noinline)
 #endif
 BASE_EXPORT const void* GetProgramCounter() {
-  return GetReturnAddress();
+#if defined(COMPILER_MSVC)
+  return _ReturnAddress();
+#elif defined(COMPILER_GCC) && !defined(OS_NACL)
+  return __builtin_extract_return_addr(__builtin_return_address(0));
+#else
+  return NULL;
+#endif
 }
 
 }  // namespace tracked_objects