Backed out 3 changesets (bug 1484184, bug 1484190, bug 1484191) for b…

…ustages on test_toolchain_configure.py. CLOSED TREE Backed out changeset dca5444170e0 (bug 1484190) Backed out changeset 1ef81d07bc5b (bug 1484184) Backed out changeset 2a42fd4df1bb (bug 1484191)
iaxat · Aug 20, 2018 · 1729400 · 1729400
1 parent 5131150
commit 1729400
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 17 deletions.
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
@@ -933,19 +933,19 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None,
                 raise FatalCheckError(
                     'This version (%s) of the MSVC compiler is not '
                     'supported.\n'
-                    'You must install Visual C++ 2017 Update 6 or '
-                    'Update 8 or later in order to build.\n'
+                    'You must install Visual C++ 2017 Update 6 in '
+                    'order to build.\n'
                     'See https://developer.mozilla.org/en/'
                     'Windows_Build_Prerequisites' % info.version)
 
             # MSVC version 15.7 and the previews for 15.8, at least,
             # can't build Firefox.
-            if info.version >= '19.14.0' and info.version < '19.15.0':
+            if info.version >= '19.14.0':
                 raise FatalCheckError(
                     'This version (%s) of the MSVC compiler is not '
                     'supported due to compiler bugs.\n'
-                    'You must install Visual C++ 2017 Update 6 or '
-                    'Update 8 or later in order to build.\n'
+                    'You must install Visual C++ 2017 Update 6 in '
+                    'order to build.\n'
                     'See https://developer.mozilla.org/en/'
                     'Windows_Build_Prerequisites' % info.version)
 

diff --git a/dom/base/test/gtest/TestMimeType.cpp b/dom/base/test/gtest/TestMimeType.cpp
@@ -212,10 +212,6 @@ TEST(MimeType, DuplicateParameter2)
     "Duplicate parameter #2";
 }
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4819)
-#endif
 TEST(MimeType, NonAlphanumericParametersAreQuoted)
 {
   const auto in = NS_LITERAL_STRING("text/html;test=\x00FF\\;charset=gbk");
@@ -226,9 +222,6 @@ TEST(MimeType, NonAlphanumericParametersAreQuoted)
   ASSERT_TRUE(out.Equals(NS_LITERAL_STRING("text/html;test=\"\x00FF\\\\\";charset=gbk"))) <<
     "Non-alphanumeric parameters are quoted";
 }
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 TEST(MimeType, ParameterQuotedIfHasLeadingWhitespace1)
 {

diff --git a/memory/mozalloc/moz.build b/memory/mozalloc/moz.build
@@ -16,9 +16,10 @@ if CONFIG['WRAP_STL_INCLUDES']:
         EXPORTS.mozilla += ['throw_gcc.h']
     elif CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
         DEFINES['_HAS_EXCEPTIONS'] = 0
-        SOURCES += [
-            'msvc_raise_wrappers.cpp',
-        ]
+        if CONFIG['MOZ_MSVC_STL_WRAP_RAISE']:
+            SOURCES += [
+                'msvc_raise_wrappers.cpp',
+            ]
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     # Keep this file separate to avoid #include'ing windows.h everywhere.

diff --git a/old-configure.in b/old-configure.in
@@ -281,8 +281,35 @@ case "$target" in
 
         unset _MSVC_VER_FILTER
 
-        WRAP_STL_INCLUDES=1
-        STL_FLAGS="-I${DIST}/stl_wrappers"
+        AC_CACHE_CHECK(for overridable _RAISE,
+                       ac_cv_have__RAISE,
+            [
+                AC_LANG_SAVE
+                AC_LANG_CPLUSPLUS
+                _SAVE_CXXFLAGS="$CXXFLAGS"
+                CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0"
+                AC_TRY_COMPILE([#include <xstddef>
+                                #undef _RAISE
+                                #define _RAISE(x) externallyDefinedFunction((x).what())
+                                #include <vector>
+                               ],
+                               [std::vector<int> v; return v.at(1);],
+                               ac_cv_have__RAISE="no",
+                               ac_cv_have__RAISE="yes")
+                CXXFLAGS="$_SAVE_CXXFLAGS"
+                AC_LANG_RESTORE
+            ])
+        if test "$ac_cv_have__RAISE" = "yes"; then
+            WRAP_STL_INCLUDES=1
+            MOZ_MSVC_STL_WRAP_RAISE=1
+            AC_DEFINE(MOZ_MSVC_STL_WRAP_RAISE)
+        else
+            AC_MSG_ERROR([Gecko exception wrapping doesn't understand your your MSVC/SDK.  Please file a bug describing this error and your build configuration.])
+        fi
+
+        if test "$WRAP_STL_INCLUDES" = "1"; then
+            STL_FLAGS="-I${DIST}/stl_wrappers"
+        fi
         CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
         CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0"
     else
@@ -368,6 +395,7 @@ AC_SUBST(GNU_CXX)
 
 AC_SUBST_LIST(STL_FLAGS)
 AC_SUBST(WRAP_STL_INCLUDES)
+AC_SUBST(MOZ_MSVC_STL_WRAP_RAISE)
 
 dnl ========================================================
 dnl Checks for programs.