Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1244006 - Use const instead of MOZ_CONSTEXPR to avoid startup crash; r=dbaron

Browse Source 
PGO builds on Visual Studio 2015 Update 1 did not take kindly to
MOZ_CONSTEXPR in this file, causing a startup crash (for reasons
I can't explain). Switching to literal "const" makes the crash
go away.

MozReview-Commit-ID: K1A43NIa6lG

--HG--
extra : rebase_source : 16c57ae79cb642b5d2945425144c726c119371b4
This commit is contained in:
Gregory Szorc 2016-02-29 18:20:07 -08:00
parent 077332385a
commit 57bde8258a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout/generic/nsIFrame.h
View File

@ -850,7 +850,8 @@ public:
#define NS_DECLARE_FRAME_PROPERTY_WITH_DTOR(prop, type, dtor) \
static const mozilla::FramePropertyDescriptor<type>* prop() { \
static MOZ_CONSTEXPR auto descriptor = \
/* Use of MOZ_CONSTEXPR caused startup crashes with MSVC2015u1 PGO. */\
static const auto descriptor = \
mozilla::FramePropertyDescriptor<type>::NewWithDestructor<dtor>(); \
return &descriptor; \
}
@ -858,14 +859,16 @@ public:
// Don't use this unless you really know what you're doing!
#define NS_DECLARE_FRAME_PROPERTY_WITH_FRAME_IN_DTOR(prop, type, dtor) \
static const mozilla::FramePropertyDescriptor<type>* prop() { \
static MOZ_CONSTEXPR auto descriptor = mozilla:: \
/* Use of MOZ_CONSTEXPR caused startup crashes with MSVC2015u1 PGO. */\
static const auto descriptor = mozilla:: \
FramePropertyDescriptor<type>::NewWithDestructorWithFrame<dtor>(); \
return &descriptor; \
}
#define NS_DECLARE_FRAME_PROPERTY_WITHOUT_DTOR(prop, type) \
static const mozilla::FramePropertyDescriptor<type>* prop() { \
static MOZ_CONSTEXPR auto descriptor = \
/* Use of MOZ_CONSTEXPR caused startup crashes with MSVC2015u1 PGO. */\
static const auto descriptor = \
mozilla::FramePropertyDescriptor<type>::NewWithoutDestructor(); \
return &descriptor; \
}