Use NOINLINE for thread watcher and browser thread identifier

chrome/browser/metrics/thread_watcher.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 "chrome/browser/metrics/thread_watcher.h"
 
 #include <math.h>  // ceil
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 // The following are unique function names for forcing the crash when a thread
 // is unresponsive. This makes it possible to tell from the callstack alone what
 // thread was unresponsive.
 //
 // We disable optimizations for this block of functions so the compiler doesn't
 // merge them all together.
 
 // TODO(eroman): What is the equivalent for other compilers?

[eroman, 2012/07/26 00:25:02]

While you are here, can you remove this comment?

[ramant (doing other things), 2012/07/26 00:28:41]

Done.

-#if defined(COMPILER_MSVC)
-#pragma optimize("", off)
+MSVC_DISABLE_OPTIMIZE()
 MSVC_PUSH_DISABLE_WARNING(4748)
-#endif
 
 int* NullPointer() {
   return reinterpret_cast<int*>(NULL);
 }
 
-void ThreadUnresponsive_UI() {
+NOINLINE void ThreadUnresponsive_UI() {
   *NullPointer() = __LINE__;
 }
 
-void ThreadUnresponsive_DB() {
+NOINLINE void ThreadUnresponsive_DB() {
   *NullPointer() = __LINE__;
 }
 
-void ThreadUnresponsive_WEBKIT() {
+NOINLINE void ThreadUnresponsive_WEBKIT() {
   *NullPointer() = __LINE__;
 }
 
-void ThreadUnresponsive_FILE() {
+NOINLINE void ThreadUnresponsive_FILE() {
   *NullPointer() = __LINE__;
 }
 
-void ThreadUnresponsive_FILE_USER_BLOCKING() {
+NOINLINE void ThreadUnresponsive_FILE_USER_BLOCKING() {
   *NullPointer() = __LINE__;
 }
 
-void ThreadUnresponsive_PROCESS_LAUNCHER() {
+NOINLINE void ThreadUnresponsive_PROCESS_LAUNCHER() {
   *NullPointer() = __LINE__;
 }
 
-void ThreadUnresponsive_CACHE() {
+NOINLINE void ThreadUnresponsive_CACHE() {
   *NullPointer() = __LINE__;
 }
 
-void ThreadUnresponsive_IO() {
+NOINLINE void ThreadUnresponsive_IO() {
   *NullPointer() = __LINE__;
 }
 
-#if defined(COMPILER_MSVC)
 MSVC_POP_WARNING()
-#pragma optimize("", on)
-#endif
+MSVC_ENABLE_OPTIMIZE();
 
 void CrashBecauseThreadWasUnresponsive(BrowserThread::ID thread_id) {
   base::debug::Alias(&thread_id);
 
   switch (thread_id) {
     case BrowserThread::UI:
       return ThreadUnresponsive_UI();
     case BrowserThread::DB:
       return ThreadUnresponsive_DB();
     case BrowserThread::WEBKIT_DEPRECATED:
@@ skipping 832 matching lines @@
 
 #if defined(OS_WIN)
   // On Windows XP, give twice the time for shutdown.
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     actual_duration *= 2;
 #endif
 
   shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
   shutdown_watchdog_->Arm();
 }