commit a0dcbfbf383646a1f31542237927480a898acba0
author Lei Zhang <thestig@chromium.org> Tue Apr 30 17:14:07 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Apr 30 17:14:07 2019 +0000
tree d26e6e91ff521ef498784bae01a9a0b199ec7e7f
parent e4cdac596d7baef7d38e828816bbcecbe80bf8cd

Get rid of NEVER_INLINE in core/fxcrt/fx_system.h.

It is a repeat of NOINLINE from third_party/base/compiler_specific.h.

Change-Id: I5de7c46e0d5374705719cb971b8ac04c9df9f234
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/53730
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxcrt/fx_memory.cpp

diff --git a/core/fxcrt/fx_memory.cpp b/core/fxcrt/fx_memory.cpp
index 8c50f23..b573420 100644
--- a/core/fxcrt/fx_memory.cpp
+++ b/core/fxcrt/fx_memory.cpp
@@ -58,7 +58,7 @@
   pdfium::base::PartitionFree(pointer);
 }
 
-NEVER_INLINE void FX_OutOfMemoryTerminate() {
+NOINLINE void FX_OutOfMemoryTerminate() {
   // Convince the linker this should not be folded with similar functions using
   // Identical Code Folding.
   static int make_this_function_aliased = 0xbd;

core/fxcrt/fx_memory.h

diff --git a/core/fxcrt/fx_memory.h b/core/fxcrt/fx_memory.h
index 1e12847..cf08606 100644
--- a/core/fxcrt/fx_memory.h
+++ b/core/fxcrt/fx_memory.h
@@ -8,6 +8,7 @@
 #define CORE_FXCRT_FX_MEMORY_H_
 
 #include "core/fxcrt/fx_system.h"
+#include "third_party/base/compiler_specific.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,7 +36,7 @@
 pdfium::base::PartitionAllocatorGeneric& GetStringPartitionAllocator();
 
 void FXMEM_InitializePartitionAlloc();
-NEVER_INLINE void FX_OutOfMemoryTerminate();
+NOINLINE void FX_OutOfMemoryTerminate();
 
 inline void* FX_SafeAlloc(size_t num_members, size_t member_size) {
   FX_SAFE_SIZE_T total = member_size;

core/fxcrt/fx_system.h

diff --git a/core/fxcrt/fx_system.h b/core/fxcrt/fx_system.h
index f07246d..47084b8 100644
--- a/core/fxcrt/fx_system.h
+++ b/core/fxcrt/fx_system.h
@@ -248,12 +248,4 @@
 
 #endif  // _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
 
-// Prevent a function from ever being inlined, typically because we'd
-// like it to appear in stack traces.
-#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-#define NEVER_INLINE __declspec(noinline)
-#else  // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-#define NEVER_INLINE __attribute__((__noinline__))
-#endif  // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-
 #endif  // CORE_FXCRT_FX_SYSTEM_H_