Bug 1498676 - Revert the __try/__except mapping (part of Bug 1431803) for MinGW from the sandbox code r=bobowen
authorTom Ritter <tom@mozilla.com>
Fri, 12 Oct 2018 13:15:33 -0500
changeset 499785 b705d158c204ff95d5266579de576eaa190988a0
parent 499784 c0b3c3c948fde682b37efa237235248aeb1f7ec2
child 499786 4a46dbac24340804b026adcc919c61081673e5be
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbobowen
bugs1498676, 1431803
milestone64.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 1498676 - Revert the __try/__except mapping (part of Bug 1431803) for MinGW from the sandbox code r=bobowen This is no longer necessary, and in fact breaks the sandbox compilation, because code inside the transformed-else blocks is only valid inside an __except block
mozilla-config.h.in
--- a/mozilla-config.h.in
+++ b/mozilla-config.h.in
@@ -40,22 +40,11 @@
 /*
  * Force-include sdkdecls.h for building the chromium sandbox code.
  *
  * CHROMIUM_SANDBOX_BUILD is defined in security/sandbox/moz.build.
  * Note that this include path relies on the LOCAL_INCLUDES in that file.
  */
 #if defined(CHROMIUM_SANDBOX_BUILD) && defined(XP_WIN)
 #include "base/win/sdkdecls.h"
-
-#ifdef __MINGW32__
-/*
- * MinGW doesn't support __try / __except. There are a few mechanisms available
- * to hack around it and pseudo-support it, but these are untested in Firefox.
- * What is tested (and works) is replacing them with if(true) and else.
- */
-#define __try if(true)
-#define __except(x) else
-
-#endif /* __MINGW32__ */
 #endif /* defined(CHROMIUM_SANDBOX_BUILD) && defined(XP_WIN) */
 
 #endif /* MOZILLA_CONFIG_H */