Bug 839338 - ASan alloc/dealloc mismatch in _M_create_nodes/_M_destroy_nodes. r=waldo.
authorRafael Ávila de Espíndola <respindola@mozilla.org>
Tue, 12 Feb 2013 08:30:16 -0500
changeset 121591 8e1bef2ab93e879781d0552a219f42730ba6bdc2
parent 121590 cccb528b3584316278b40dbb3da30c051e36b7ed
child 121592 d3b021e316161ecc8642bc538e04f2f3d766ec62
push id22818
push userrespindola@mozilla.com
push dateTue, 12 Feb 2013 13:31:01 +0000
treeherdermozilla-inbound@8e1bef2ab93e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswaldo
bugs839338
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 839338 - ASan alloc/dealloc mismatch in _M_create_nodes/_M_destroy_nodes. r=waldo.
memory/mozalloc/mozalloc.h
mfbt/Attributes.h
--- a/memory/mozalloc/mozalloc.h
+++ b/memory/mozalloc/mozalloc.h
@@ -17,16 +17,17 @@
 #if defined(__cplusplus)
 #  include <new>
 #endif
 #include "xpcom-config.h"
 
 #if defined(__cplusplus)
 #include "mozilla/fallible.h"
 #endif
+#include "mozilla/Attributes.h"
 
 #define MOZALLOC_HAVE_XMALLOC
 
 #if defined(MOZALLOC_EXPORT)
 /* do nothing: it's been defined to __declspec(dllexport) by
  * mozalloc*.cpp on platforms where that's required. */
 #elif defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
 #  define MOZALLOC_EXPORT __declspec(dllimport)
--- a/mfbt/Attributes.h
+++ b/mfbt/Attributes.h
@@ -28,19 +28,17 @@
 
 /*
  * MOZ_ALWAYS_INLINE is a macro which expands to tell the compiler that the
  * method decorated with it must be inlined, even if the compiler thinks
  * otherwise.  This is only a (much) stronger version of the MOZ_INLINE hint:
  * compilers are not guaranteed to respect it (although they're much more likely
  * to do so).
  */
-#if defined(DEBUG)
-#  define MOZ_ALWAYS_INLINE     MOZ_INLINE
-#elif defined(_MSC_VER)
+#if defined(_MSC_VER)
 #  define MOZ_ALWAYS_INLINE     __forceinline
 #elif defined(__GNUC__)
 #  define MOZ_ALWAYS_INLINE     __attribute__((always_inline)) MOZ_INLINE
 #else
 #  define MOZ_ALWAYS_INLINE     MOZ_INLINE
 #endif
 
 /*