Merge branch 'master' into 1769-take2

11 files changed, 140 insertions, 194 deletions

diff --git a/config/baseconfig.mk b/config/baseconfig.mk
index 47a12b16e4..a125466abf 100644
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -45,7 +45,7 @@ endif # WINNT
 ifndef INCLUDED_AUTOCONF_MK
 default::
 else
-TIERS := $(if $(MOZ_ARTIFACT_BUILDS),artifact )pre-export export $(if $(COMPILE_ENVIRONMENT),compile )misc libs tools
+TIERS := pre-export export $(if $(COMPILE_ENVIRONMENT),compile )misc libs tools
 endif
 
 # These defines are used to support the twin-topsrcdir model for comm-central.
diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py
index 4667a1a2ff..cb9e2418f2 100644
--- a/config/check_spidermonkey_style.py
+++ b/config/check_spidermonkey_style.py
@@ -86,12 +86,14 @@ included_inclnames_to_ignore = set([
     'unicode/ucol.h',           # ICU
     'unicode/udat.h',           # ICU
     'unicode/udatpg.h',         # ICU
+    'unicode/udisplaycontext.h',# ICU
     'unicode/uenum.h',          # ICU
     'unicode/uniset.h',         # ICU
-    'unicode/unorm.h',          # ICU
+    'unicode/unorm2.h',         # ICU
     'unicode/unum.h',           # ICU
     'unicode/unumsys.h',        # ICU
     'unicode/upluralrules.h',   # ICU
+    'unicode/ureldatefmt.h',    # ICU
     'unicode/ustring.h',        # ICU
     'unicode/utypes.h',         # ICU
     'vtune/VTuneWrapper.h'      # VTune
diff --git a/config/config.mk b/config/config.mk
index b71e65fc35..2d1ff365b1 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -377,8 +377,20 @@ endif # WINNT
 
 ifdef _MSC_VER
 ifeq ($(CPU_ARCH),x86_64)
-# set stack to 2MB on x64 build.  See bug 582910
-WIN32_EXE_LDFLAGS	+= -STACK:2097152
+# Normal operation on 64-bit Windows needs 2 MB of stack. (Bug 582910)
+# ASAN requires 6 MB of stack.
+# Setting the stack to 8 MB to match the capability of other systems
+# to deal with frame construction for unreasonably deep DOM trees
+# with worst-case styling. This uses address space unnecessarily for
+# non-main threads, but that should be tolerable on 64-bit systems.
+WIN32_EXE_LDFLAGS      += -STACK:8388608
+else
+# Since this setting affects the default stack size for non-main
+# threads, too, to avoid burning the address space, increase only
+# 512 KB over the default. Just enough to be able to deal with
+# reasonable styling applied to DOM trees whose depth is near what
+# Blink's HTML parser can output.
+WIN32_EXE_LDFLAGS      += -STACK:1572864
 endif
 endif
 
diff --git a/config/external/icu/common/sources.mozbuild b/config/external/icu/common/sources.mozbuild
index 562cd9133f..0bfb621150 100644
--- a/config/external/icu/common/sources.mozbuild
+++ b/config/external/icu/common/sources.mozbuild
@@ -4,26 +4,28 @@ SOURCES += [
    '/intl/icu/source/common/bmpset.cpp',
    '/intl/icu/source/common/brkeng.cpp',
    '/intl/icu/source/common/brkiter.cpp',
+   '/intl/icu/source/common/bytesinkutil.cpp',
    '/intl/icu/source/common/bytestream.cpp',
    '/intl/icu/source/common/bytestrie.cpp',
    '/intl/icu/source/common/bytestriebuilder.cpp',
    '/intl/icu/source/common/bytestrieiterator.cpp',
    '/intl/icu/source/common/caniter.cpp',
+   '/intl/icu/source/common/characterproperties.cpp',
    '/intl/icu/source/common/chariter.cpp',
    '/intl/icu/source/common/charstr.cpp',
-   '/intl/icu/source/common/cmemory.c',
+   '/intl/icu/source/common/cmemory.cpp',
    '/intl/icu/source/common/cstr.cpp',
-   '/intl/icu/source/common/cstring.c',
-   '/intl/icu/source/common/cwchar.c',
+   '/intl/icu/source/common/cstring.cpp',
+   '/intl/icu/source/common/cwchar.cpp',
    '/intl/icu/source/common/dictbe.cpp',
    '/intl/icu/source/common/dictionarydata.cpp',
    '/intl/icu/source/common/dtintrv.cpp',
+   '/intl/icu/source/common/edits.cpp',
    '/intl/icu/source/common/errorcode.cpp',
    '/intl/icu/source/common/filteredbrk.cpp',
    '/intl/icu/source/common/filterednormalizer2.cpp',
-   '/intl/icu/source/common/icudataver.c',
+   '/intl/icu/source/common/icudataver.cpp',
    '/intl/icu/source/common/icuplug.cpp',
-   '/intl/icu/source/common/listformatter.cpp',
    '/intl/icu/source/common/loadednormalizer2impl.cpp',
    '/intl/icu/source/common/locavailable.cpp',
    '/intl/icu/source/common/locbased.cpp',
@@ -31,7 +33,7 @@ SOURCES += [
    '/intl/icu/source/common/locdspnm.cpp',
    '/intl/icu/source/common/locid.cpp',
    '/intl/icu/source/common/loclikely.cpp',
-   '/intl/icu/source/common/locmap.c',
+   '/intl/icu/source/common/locmap.cpp',
    '/intl/icu/source/common/locresdata.cpp',
    '/intl/icu/source/common/locutil.cpp',
    '/intl/icu/source/common/messagepattern.cpp',
@@ -42,10 +44,11 @@ SOURCES += [
    '/intl/icu/source/common/patternprops.cpp',
    '/intl/icu/source/common/pluralmap.cpp',
    '/intl/icu/source/common/propname.cpp',
-   '/intl/icu/source/common/propsvec.c',
+   '/intl/icu/source/common/propsvec.cpp',
    '/intl/icu/source/common/punycode.cpp',
    '/intl/icu/source/common/putil.cpp',
    '/intl/icu/source/common/rbbi.cpp',
+   '/intl/icu/source/common/rbbi_cache.cpp',
    '/intl/icu/source/common/rbbidata.cpp',
    '/intl/icu/source/common/rbbinode.cpp',
    '/intl/icu/source/common/rbbirb.cpp',
@@ -67,68 +70,70 @@ SOURCES += [
    '/intl/icu/source/common/servslkf.cpp',
    '/intl/icu/source/common/sharedobject.cpp',
    '/intl/icu/source/common/simpleformatter.cpp',
+   '/intl/icu/source/common/static_unicode_sets.cpp',
    '/intl/icu/source/common/stringpiece.cpp',
    '/intl/icu/source/common/stringtriebuilder.cpp',
-   '/intl/icu/source/common/uarrsort.c',
-   '/intl/icu/source/common/ubidi.c',
-   '/intl/icu/source/common/ubidi_props.c',
-   '/intl/icu/source/common/ubidiln.c',
-   '/intl/icu/source/common/ubiditransform.c',
-   '/intl/icu/source/common/ubidiwrt.c',
+   '/intl/icu/source/common/uarrsort.cpp',
+   '/intl/icu/source/common/ubidi.cpp',
+   '/intl/icu/source/common/ubidi_props.cpp',
+   '/intl/icu/source/common/ubidiln.cpp',
+   '/intl/icu/source/common/ubiditransform.cpp',
+   '/intl/icu/source/common/ubidiwrt.cpp',
    '/intl/icu/source/common/ubrk.cpp',
    '/intl/icu/source/common/ucase.cpp',
    '/intl/icu/source/common/ucasemap.cpp',
    '/intl/icu/source/common/ucasemap_titlecase_brkiter.cpp',
-   '/intl/icu/source/common/ucat.c',
-   '/intl/icu/source/common/uchar.c',
+   '/intl/icu/source/common/ucat.cpp',
+   '/intl/icu/source/common/uchar.cpp',
    '/intl/icu/source/common/ucharstrie.cpp',
    '/intl/icu/source/common/ucharstriebuilder.cpp',
    '/intl/icu/source/common/ucharstrieiterator.cpp',
    '/intl/icu/source/common/uchriter.cpp',
    '/intl/icu/source/common/ucln_cmn.cpp',
-   '/intl/icu/source/common/ucmndata.c',
-   '/intl/icu/source/common/ucnv.c',
+   '/intl/icu/source/common/ucmndata.cpp',
+   '/intl/icu/source/common/ucnv.cpp',
    '/intl/icu/source/common/ucnv2022.cpp',
    '/intl/icu/source/common/ucnv_bld.cpp',
-   '/intl/icu/source/common/ucnv_cb.c',
-   '/intl/icu/source/common/ucnv_cnv.c',
-   '/intl/icu/source/common/ucnv_ct.c',
-   '/intl/icu/source/common/ucnv_err.c',
+   '/intl/icu/source/common/ucnv_cb.cpp',
+   '/intl/icu/source/common/ucnv_cnv.cpp',
+   '/intl/icu/source/common/ucnv_ct.cpp',
+   '/intl/icu/source/common/ucnv_err.cpp',
    '/intl/icu/source/common/ucnv_ext.cpp',
    '/intl/icu/source/common/ucnv_io.cpp',
-   '/intl/icu/source/common/ucnv_lmb.c',
-   '/intl/icu/source/common/ucnv_set.c',
-   '/intl/icu/source/common/ucnv_u16.c',
-   '/intl/icu/source/common/ucnv_u32.c',
-   '/intl/icu/source/common/ucnv_u7.c',
-   '/intl/icu/source/common/ucnv_u8.c',
+   '/intl/icu/source/common/ucnv_lmb.cpp',
+   '/intl/icu/source/common/ucnv_set.cpp',
+   '/intl/icu/source/common/ucnv_u16.cpp',
+   '/intl/icu/source/common/ucnv_u32.cpp',
+   '/intl/icu/source/common/ucnv_u7.cpp',
+   '/intl/icu/source/common/ucnv_u8.cpp',
    '/intl/icu/source/common/ucnvbocu.cpp',
-   '/intl/icu/source/common/ucnvdisp.c',
-   '/intl/icu/source/common/ucnvhz.c',
-   '/intl/icu/source/common/ucnvisci.c',
-   '/intl/icu/source/common/ucnvlat1.c',
+   '/intl/icu/source/common/ucnvdisp.cpp',
+   '/intl/icu/source/common/ucnvhz.cpp',
+   '/intl/icu/source/common/ucnvisci.cpp',
+   '/intl/icu/source/common/ucnvlat1.cpp',
    '/intl/icu/source/common/ucnvmbcs.cpp',
-   '/intl/icu/source/common/ucnvscsu.c',
+   '/intl/icu/source/common/ucnvscsu.cpp',
    '/intl/icu/source/common/ucnvsel.cpp',
    '/intl/icu/source/common/ucol_swp.cpp',
+   '/intl/icu/source/common/ucptrie.cpp',
    '/intl/icu/source/common/ucurr.cpp',
    '/intl/icu/source/common/udata.cpp',
-   '/intl/icu/source/common/udatamem.c',
-   '/intl/icu/source/common/udataswp.c',
-   '/intl/icu/source/common/uenum.c',
-   '/intl/icu/source/common/uhash.c',
+   '/intl/icu/source/common/udatamem.cpp',
+   '/intl/icu/source/common/udataswp.cpp',
+   '/intl/icu/source/common/uenum.cpp',
+   '/intl/icu/source/common/uhash.cpp',
    '/intl/icu/source/common/uhash_us.cpp',
    '/intl/icu/source/common/uidna.cpp',
    '/intl/icu/source/common/uinit.cpp',
-   '/intl/icu/source/common/uinvchar.c',
+   '/intl/icu/source/common/uinvchar.cpp',
    '/intl/icu/source/common/uiter.cpp',
-   '/intl/icu/source/common/ulist.c',
-   '/intl/icu/source/common/ulistformatter.cpp',
+   '/intl/icu/source/common/ulist.cpp',
    '/intl/icu/source/common/uloc.cpp',
    '/intl/icu/source/common/uloc_keytype.cpp',
-   '/intl/icu/source/common/uloc_tag.c',
-   '/intl/icu/source/common/umapfile.c',
-   '/intl/icu/source/common/umath.c',
+   '/intl/icu/source/common/uloc_tag.cpp',
+   '/intl/icu/source/common/umapfile.cpp',
+   '/intl/icu/source/common/umath.cpp',
+   '/intl/icu/source/common/umutablecptrie.cpp',
    '/intl/icu/source/common/umutex.cpp',
    '/intl/icu/source/common/unames.cpp',
    '/intl/icu/source/common/unifiedcache.cpp',
@@ -148,11 +153,11 @@ SOURCES += [
    '/intl/icu/source/common/unormcmp.cpp',
    '/intl/icu/source/common/uobject.cpp',
    '/intl/icu/source/common/uprops.cpp',
-   '/intl/icu/source/common/ures_cnv.c',
+   '/intl/icu/source/common/ures_cnv.cpp',
    '/intl/icu/source/common/uresbund.cpp',
    '/intl/icu/source/common/uresdata.cpp',
-   '/intl/icu/source/common/usc_impl.c',
-   '/intl/icu/source/common/uscript.c',
+   '/intl/icu/source/common/usc_impl.cpp',
+   '/intl/icu/source/common/uscript.cpp',
    '/intl/icu/source/common/uscript_props.cpp',
    '/intl/icu/source/common/uset.cpp',
    '/intl/icu/source/common/uset_props.cpp',
@@ -166,23 +171,24 @@ SOURCES += [
    '/intl/icu/source/common/ustrcase.cpp',
    '/intl/icu/source/common/ustrcase_locale.cpp',
    '/intl/icu/source/common/ustrenum.cpp',
-   '/intl/icu/source/common/ustrfmt.c',
+   '/intl/icu/source/common/ustrfmt.cpp',
    '/intl/icu/source/common/ustring.cpp',
    '/intl/icu/source/common/ustrtrns.cpp',
    '/intl/icu/source/common/utext.cpp',
-   '/intl/icu/source/common/utf_impl.c',
+   '/intl/icu/source/common/utf_impl.cpp',
    '/intl/icu/source/common/util.cpp',
    '/intl/icu/source/common/util_props.cpp',
-   '/intl/icu/source/common/utrace.c',
+   '/intl/icu/source/common/utrace.cpp',
    '/intl/icu/source/common/utrie.cpp',
    '/intl/icu/source/common/utrie2.cpp',
    '/intl/icu/source/common/utrie2_builder.cpp',
+   '/intl/icu/source/common/utrie_swap.cpp',
    '/intl/icu/source/common/uts46.cpp',
-   '/intl/icu/source/common/utypes.c',
+   '/intl/icu/source/common/utypes.cpp',
    '/intl/icu/source/common/uvector.cpp',
    '/intl/icu/source/common/uvectr32.cpp',
    '/intl/icu/source/common/uvectr64.cpp',
-   '/intl/icu/source/common/wintz.c',
+   '/intl/icu/source/common/wintz.cpp',
 ]
 
 EXPORTS.unicode += [
@@ -192,17 +198,19 @@ EXPORTS.unicode += [
    '/intl/icu/source/common/unicode/bytestrie.h',
    '/intl/icu/source/common/unicode/bytestriebuilder.h',
    '/intl/icu/source/common/unicode/caniter.h',
+   '/intl/icu/source/common/unicode/casemap.h',
+   '/intl/icu/source/common/unicode/char16ptr.h',
    '/intl/icu/source/common/unicode/chariter.h',
    '/intl/icu/source/common/unicode/dbbi.h',
    '/intl/icu/source/common/unicode/docmain.h',
    '/intl/icu/source/common/unicode/dtintrv.h',
+   '/intl/icu/source/common/unicode/edits.h',
    '/intl/icu/source/common/unicode/enumset.h',
    '/intl/icu/source/common/unicode/errorcode.h',
    '/intl/icu/source/common/unicode/filteredbrk.h',
    '/intl/icu/source/common/unicode/icudataver.h',
    '/intl/icu/source/common/unicode/icuplug.h',
    '/intl/icu/source/common/unicode/idna.h',
-   '/intl/icu/source/common/unicode/listformatter.h',
    '/intl/icu/source/common/unicode/localpointer.h',
    '/intl/icu/source/common/unicode/locdspnm.h',
    '/intl/icu/source/common/unicode/locid.h',
@@ -221,6 +229,7 @@ EXPORTS.unicode += [
    '/intl/icu/source/common/unicode/simpleformatter.h',
    '/intl/icu/source/common/unicode/std_string.h',
    '/intl/icu/source/common/unicode/strenum.h',
+   '/intl/icu/source/common/unicode/stringoptions.h',
    '/intl/icu/source/common/unicode/stringpiece.h',
    '/intl/icu/source/common/unicode/stringtriebuilder.h',
    '/intl/icu/source/common/unicode/symtable.h',
@@ -239,6 +248,8 @@ EXPORTS.unicode += [
    '/intl/icu/source/common/unicode/ucnv_err.h',
    '/intl/icu/source/common/unicode/ucnvsel.h',
    '/intl/icu/source/common/unicode/uconfig.h',
+   '/intl/icu/source/common/unicode/ucpmap.h',
+   '/intl/icu/source/common/unicode/ucptrie.h',
    '/intl/icu/source/common/unicode/ucurr.h',
    '/intl/icu/source/common/unicode/udata.h',
    '/intl/icu/source/common/unicode/udisplaycontext.h',
@@ -246,10 +257,10 @@ EXPORTS.unicode += [
    '/intl/icu/source/common/unicode/uidna.h',
    '/intl/icu/source/common/unicode/uiter.h',
    '/intl/icu/source/common/unicode/uldnames.h',
-   '/intl/icu/source/common/unicode/ulistformatter.h',
    '/intl/icu/source/common/unicode/uloc.h',
    '/intl/icu/source/common/unicode/umachine.h',
    '/intl/icu/source/common/unicode/umisc.h',
+   '/intl/icu/source/common/unicode/umutablecptrie.h',
    '/intl/icu/source/common/unicode/unifilt.h',
    '/intl/icu/source/common/unicode/unifunct.h',
    '/intl/icu/source/common/unicode/unimatch.h',
diff --git a/config/external/icu/data/icudt58l.dat b/config/external/icu/data/icudt63l.dat
index be985f57c5..326b3b854f 100644
--- a/config/external/icu/data/icudt58l.dat
+++ b/config/external/icu/data/icudt63l.dat
diff --git a/config/external/icu/defs.mozbuild b/config/external/icu/defs.mozbuild
index a6249783f4..165564cf32 100644
--- a/config/external/icu/defs.mozbuild
+++ b/config/external/icu/defs.mozbuild
@@ -14,7 +14,6 @@ DEFINES.update(
     UCONFIG_NO_LEGACY_CONVERSION = True,
     UCONFIG_NO_TRANSLITERATION = True,
     UCONFIG_NO_REGULAR_EXPRESSIONS = True,
-    UCONFIG_NO_BREAK_ITERATION = True,
 
     # We don't need to pass data to and from legacy char* APIs.
     U_CHARSET_IS_UTF8 = True,
diff --git a/config/external/icu/i18n/sources.mozbuild b/config/external/icu/i18n/sources.mozbuild
index 8bb6195451..1034faf6be 100644
--- a/config/external/icu/i18n/sources.mozbuild
+++ b/config/external/icu/i18n/sources.mozbuild
@@ -1,6 +1,5 @@
 # THIS FILE IS GENERATED BY /intl/icu_sources_data.py DO NOT EDIT
 SOURCES += [
-   '/intl/icu/source/i18n/affixpatternparser.cpp',
    '/intl/icu/source/i18n/alphaindex.cpp',
    '/intl/icu/source/i18n/anytrans.cpp',
    '/intl/icu/source/i18n/astro.cpp',
@@ -53,23 +52,22 @@ SOURCES += [
    '/intl/icu/source/i18n/datefmt.cpp',
    '/intl/icu/source/i18n/dayperiodrules.cpp',
    '/intl/icu/source/i18n/dcfmtsym.cpp',
-   '/intl/icu/source/i18n/decContext.c',
-   '/intl/icu/source/i18n/decfmtst.cpp',
-   '/intl/icu/source/i18n/decimalformatpattern.cpp',
+   '/intl/icu/source/i18n/decContext.cpp',
    '/intl/icu/source/i18n/decimfmt.cpp',
-   '/intl/icu/source/i18n/decimfmtimpl.cpp',
-   '/intl/icu/source/i18n/decNumber.c',
-   '/intl/icu/source/i18n/digitaffix.cpp',
-   '/intl/icu/source/i18n/digitaffixesandpadding.cpp',
-   '/intl/icu/source/i18n/digitformatter.cpp',
-   '/intl/icu/source/i18n/digitgrouping.cpp',
-   '/intl/icu/source/i18n/digitinterval.cpp',
-   '/intl/icu/source/i18n/digitlst.cpp',
+   '/intl/icu/source/i18n/decNumber.cpp',
+   '/intl/icu/source/i18n/double-conversion-bignum-dtoa.cpp',
+   '/intl/icu/source/i18n/double-conversion-bignum.cpp',
+   '/intl/icu/source/i18n/double-conversion-cached-powers.cpp',
+   '/intl/icu/source/i18n/double-conversion-diy-fp.cpp',
+   '/intl/icu/source/i18n/double-conversion-fast-dtoa.cpp',
+   '/intl/icu/source/i18n/double-conversion-strtod.cpp',
+   '/intl/icu/source/i18n/double-conversion.cpp',
    '/intl/icu/source/i18n/dtfmtsym.cpp',
    '/intl/icu/source/i18n/dtitvfmt.cpp',
    '/intl/icu/source/i18n/dtitvinf.cpp',
    '/intl/icu/source/i18n/dtptngen.cpp',
    '/intl/icu/source/i18n/dtrule.cpp',
+   '/intl/icu/source/i18n/erarules.cpp',
    '/intl/icu/source/i18n/esctrn.cpp',
    '/intl/icu/source/i18n/ethpccal.cpp',
    '/intl/icu/source/i18n/fmtable.cpp',
@@ -86,6 +84,7 @@ SOURCES += [
    '/intl/icu/source/i18n/inputext.cpp',
    '/intl/icu/source/i18n/islamcal.cpp',
    '/intl/icu/source/i18n/japancal.cpp',
+   '/intl/icu/source/i18n/listformatter.cpp',
    '/intl/icu/source/i18n/measfmt.cpp',
    '/intl/icu/source/i18n/measunit.cpp',
    '/intl/icu/source/i18n/measure.cpp',
@@ -95,15 +94,50 @@ SOURCES += [
    '/intl/icu/source/i18n/nfrule.cpp',
    '/intl/icu/source/i18n/nfsubs.cpp',
    '/intl/icu/source/i18n/nortrans.cpp',
+   '/intl/icu/source/i18n/nounit.cpp',
    '/intl/icu/source/i18n/nultrans.cpp',
+   '/intl/icu/source/i18n/number_affixutils.cpp',
+   '/intl/icu/source/i18n/number_asformat.cpp',
+   '/intl/icu/source/i18n/number_capi.cpp',
+   '/intl/icu/source/i18n/number_compact.cpp',
+   '/intl/icu/source/i18n/number_currencysymbols.cpp',
+   '/intl/icu/source/i18n/number_decimalquantity.cpp',
+   '/intl/icu/source/i18n/number_decimfmtprops.cpp',
+   '/intl/icu/source/i18n/number_fluent.cpp',
+   '/intl/icu/source/i18n/number_formatimpl.cpp',
+   '/intl/icu/source/i18n/number_grouping.cpp',
+   '/intl/icu/source/i18n/number_integerwidth.cpp',
+   '/intl/icu/source/i18n/number_longnames.cpp',
+   '/intl/icu/source/i18n/number_mapper.cpp',
+   '/intl/icu/source/i18n/number_modifiers.cpp',
+   '/intl/icu/source/i18n/number_multiplier.cpp',
+   '/intl/icu/source/i18n/number_notation.cpp',
+   '/intl/icu/source/i18n/number_padding.cpp',
+   '/intl/icu/source/i18n/number_patternmodifier.cpp',
+   '/intl/icu/source/i18n/number_patternstring.cpp',
+   '/intl/icu/source/i18n/number_rounding.cpp',
+   '/intl/icu/source/i18n/number_scientific.cpp',
+   '/intl/icu/source/i18n/number_skeletons.cpp',
+   '/intl/icu/source/i18n/number_stringbuilder.cpp',
+   '/intl/icu/source/i18n/number_utils.cpp',
    '/intl/icu/source/i18n/numfmt.cpp',
+   '/intl/icu/source/i18n/numparse_affixes.cpp',
+   '/intl/icu/source/i18n/numparse_compositions.cpp',
+   '/intl/icu/source/i18n/numparse_currency.cpp',
+   '/intl/icu/source/i18n/numparse_decimal.cpp',
+   '/intl/icu/source/i18n/numparse_impl.cpp',
+   '/intl/icu/source/i18n/numparse_parsednumber.cpp',
+   '/intl/icu/source/i18n/numparse_scientific.cpp',
+   '/intl/icu/source/i18n/numparse_stringsegment.cpp',
+   '/intl/icu/source/i18n/numparse_symbols.cpp',
+   '/intl/icu/source/i18n/numparse_validators.cpp',
+   '/intl/icu/source/i18n/numrange_fluent.cpp',
+   '/intl/icu/source/i18n/numrange_impl.cpp',
    '/intl/icu/source/i18n/numsys.cpp',
    '/intl/icu/source/i18n/olsontz.cpp',
    '/intl/icu/source/i18n/persncal.cpp',
-   '/intl/icu/source/i18n/pluralaffix.cpp',
    '/intl/icu/source/i18n/plurfmt.cpp',
    '/intl/icu/source/i18n/plurrule.cpp',
-   '/intl/icu/source/i18n/precision.cpp',
    '/intl/icu/source/i18n/quant.cpp',
    '/intl/icu/source/i18n/quantityformatter.cpp',
    '/intl/icu/source/i18n/rbnf.cpp',
@@ -130,7 +164,6 @@ SOURCES += [
    '/intl/icu/source/i18n/selfmt.cpp',
    '/intl/icu/source/i18n/sharedbreakiterator.cpp',
    '/intl/icu/source/i18n/simpletz.cpp',
-   '/intl/icu/source/i18n/smallintformatter.cpp',
    '/intl/icu/source/i18n/smpdtfmt.cpp',
    '/intl/icu/source/i18n/smpdtfst.cpp',
    '/intl/icu/source/i18n/sortkey.cpp',
@@ -167,7 +200,8 @@ SOURCES += [
    '/intl/icu/source/i18n/udatpg.cpp',
    '/intl/icu/source/i18n/ufieldpositer.cpp',
    '/intl/icu/source/i18n/uitercollationiterator.cpp',
-   '/intl/icu/source/i18n/ulocdata.c',
+   '/intl/icu/source/i18n/ulistformatter.cpp',
+   '/intl/icu/source/i18n/ulocdata.cpp',
    '/intl/icu/source/i18n/umsg.cpp',
    '/intl/icu/source/i18n/unesctrn.cpp',
    '/intl/icu/source/i18n/uni2name.cpp',
@@ -184,10 +218,8 @@ SOURCES += [
    '/intl/icu/source/i18n/uspoof_impl.cpp',
    '/intl/icu/source/i18n/utf16collationiterator.cpp',
    '/intl/icu/source/i18n/utf8collationiterator.cpp',
-   '/intl/icu/source/i18n/utmscale.c',
+   '/intl/icu/source/i18n/utmscale.cpp',
    '/intl/icu/source/i18n/utrans.cpp',
-   '/intl/icu/source/i18n/valueformatter.cpp',
-   '/intl/icu/source/i18n/visibledigits.cpp',
    '/intl/icu/source/i18n/vtzone.cpp',
    '/intl/icu/source/i18n/vzone.cpp',
    '/intl/icu/source/i18n/windtfmt.cpp',
@@ -223,10 +255,14 @@ EXPORTS.unicode += [
    '/intl/icu/source/i18n/unicode/fpositer.h',
    '/intl/icu/source/i18n/unicode/gender.h',
    '/intl/icu/source/i18n/unicode/gregocal.h',
+   '/intl/icu/source/i18n/unicode/listformatter.h',
    '/intl/icu/source/i18n/unicode/measfmt.h',
    '/intl/icu/source/i18n/unicode/measunit.h',
    '/intl/icu/source/i18n/unicode/measure.h',
    '/intl/icu/source/i18n/unicode/msgfmt.h',
+   '/intl/icu/source/i18n/unicode/nounit.h',
+   '/intl/icu/source/i18n/unicode/numberformatter.h',
+   '/intl/icu/source/i18n/unicode/numberrangeformatter.h',
    '/intl/icu/source/i18n/unicode/numfmt.h',
    '/intl/icu/source/i18n/unicode/numsys.h',
    '/intl/icu/source/i18n/unicode/plurfmt.h',
@@ -263,10 +299,12 @@ EXPORTS.unicode += [
    '/intl/icu/source/i18n/unicode/ufieldpositer.h',
    '/intl/icu/source/i18n/unicode/uformattable.h',
    '/intl/icu/source/i18n/unicode/ugender.h',
+   '/intl/icu/source/i18n/unicode/ulistformatter.h',
    '/intl/icu/source/i18n/unicode/ulocdata.h',
    '/intl/icu/source/i18n/unicode/umsg.h',
    '/intl/icu/source/i18n/unicode/unirepl.h',
    '/intl/icu/source/i18n/unicode/unum.h',
+   '/intl/icu/source/i18n/unicode/unumberformatter.h',
    '/intl/icu/source/i18n/unicode/unumsys.h',
    '/intl/icu/source/i18n/unicode/upluralrules.h',
    '/intl/icu/source/i18n/unicode/uregex.h',
diff --git a/config/external/icu/stubdata/moz.build b/config/external/icu/stubdata/moz.build
index c404d67542..84c7f082d9 100644
--- a/config/external/icu/stubdata/moz.build
+++ b/config/external/icu/stubdata/moz.build
@@ -9,4 +9,4 @@
 
 Library('icustubdata')
 
-SOURCES += ['/intl/icu/source/stubdata/stubdata.c']
+SOURCES += ['/intl/icu/source/stubdata/stubdata.cpp']
diff --git a/config/faster/rules.mk b/config/faster/rules.mk
deleted file mode 100644
index 9d7b322fa2..0000000000
--- a/config/faster/rules.mk
+++ /dev/null
@@ -1,110 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# /!\ Please make sure to update the following comment when you touch this
-# file. Thank you /!\
-
-# The traditional Mozilla build system relied on going through the entire
-# build tree a number of times with different targets, and many of the
-# things happening at each step required other things happening in previous
-# steps without any documentation of those dependencies.
-#
-# This new build system tries to start afresh by establishing what files or
-# operations are needed for the build, and applying the necessary rules to
-# have those in place, relying on make dependencies to get them going.
-#
-# As of writing, only building non-compiled parts of Firefox is supported
-# here (a few other things are also left out). This is a starting point, with
-# the intent to grow this build system to make it more complete.
-#
-# This file contains rules and dependencies to get things working. The intent
-# is for a Makefile to define some dependencies and variables, and include
-# this file. What needs to be defined there, and ends up being generated by
-# python/mozbuild/mozbuild/backend/fastermake.py is the following:
-# - TOPSRCDIR/TOPOBJDIR, respectively the top source directory and the top
-#   object directory
-# - PYTHON, the path to the python executable
-# - ACDEFINES, which contains a set of -Dvar=name to be used during
-#   preprocessing
-# - INSTALL_MANIFESTS, which defines the list of base directories handled
-#   by install manifests, see further below
-#
-# A convention used between this file and the Makefile including it is that
-# global Make variables names are uppercase, while "local" Make variables
-# applied to specific targets are lowercase.
-
-# Targets to be triggered for a default build
-default: $(addprefix install-,$(INSTALL_MANIFESTS))
-
-ifndef NO_XPIDL
-# Targets from the recursive make backend to be built for a default build
-default: $(TOPOBJDIR)/config/makefiles/xpidl/xpidl
-endif
-
-# Mac builds require to copy things in dist/bin/*.app
-# TODO: remove the MOZ_WIDGET_TOOLKIT and MOZ_BUILD_APP variables from
-# faster/Makefile and python/mozbuild/mozbuild/test/backend/test_build.py
-# when this is not required anymore.
-# We however don't need to do this when using the hybrid
-# FasterMake/RecursiveMake backend (FASTER_RECURSIVE_MAKE is set when
-# recursing from the RecursiveMake backend)
-ifndef FASTER_RECURSIVE_MAKE
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-default:
-	$(MAKE) -C $(TOPOBJDIR)/$(MOZ_BUILD_APP)/app repackage
-endif
-endif
-
-.PHONY: FORCE
-
-# Extra define to trigger some workarounds. We should strive to limit the
-# use of those. As of writing the only ones are in
-# toolkit/content/buildconfig.html and browser/locales/jar.mn.
-ACDEFINES += -DBUILD_FASTER
-
-# Files under the faster/ sub-directory, however, are not meant to use the
-# fallback
-$(TOPOBJDIR)/faster/%: ;
-
-# Generic rule to fall back to the recursive make backend.
-# This needs to stay after other $(TOPOBJDIR)/* rules because GNU Make
-# <3.82 apply pattern rules in definition order, not stem length like
-# modern GNU Make.
-$(TOPOBJDIR)/%: FORCE
-	$(MAKE) -C $(dir $@) $(notdir $@)
-
-# Install files using install manifests
-#
-# The list of base directories is given in INSTALL_MANIFESTS. The
-# corresponding install manifests are named correspondingly, with forward
-# slashes replaced with underscores, and prefixed with `install_`. That is,
-# the install manifest for `dist/bin` would be `install_dist_bin`.
-$(addprefix install-,$(INSTALL_MANIFESTS)): install-%: $(addprefix $(TOPOBJDIR)/,buildid.h source-repo.h)
-	@# For now, force preprocessed files to be reprocessed every time.
-	@# The overhead is not that big, and this avoids waiting for proper
-	@# support for defines tracking in process_install_manifest.
-	@touch install_$(subst /,_,$*)
-	@# BOOKMARKS_INCLUDE_DIR is for bookmarks.html only.
-	$(PYTHON) -m mozbuild.action.process_install_manifest \
-		--track install_$(subst /,_,$*).track \
-		$(TOPOBJDIR)/$* \
-		-DAB_CD=en-US \
-		-DBOOKMARKS_INCLUDE_DIR=$(TOPSRCDIR)/browser/locales/en-US/profile \
-		$(ACDEFINES) \
-		install_$(subst /,_,$*)
-
-# ============================================================================
-# Below is a set of additional dependencies and variables used to build things
-# that are not supported by data in moz.build.
-
-# The xpidl target in config/makefiles/xpidl requires the install manifest for
-# dist/idl to have been processed. When using the hybrid
-# FasterMake/RecursiveMake backend, this dependency is handled in the top-level
-# Makefile.
-ifndef FASTER_RECURSIVE_MAKE
-$(TOPOBJDIR)/config/makefiles/xpidl/xpidl: $(TOPOBJDIR)/install-dist_idl
-endif
-# It also requires all the install manifests for dist/bin to have been processed
-# because it adds interfaces.manifest references with buildlist.py.
-$(TOPOBJDIR)/config/makefiles/xpidl/xpidl: $(addprefix install-,$(filter dist/bin%,$(INSTALL_MANIFESTS)))
diff --git a/config/milestone.txt b/config/milestone.txt
index 6632fe0022..291d76b9b3 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -8,4 +8,4 @@
 # Referenced by milestone.py.
 #--------------------------------------------------------
 
-5.1.0+
\ No newline at end of file
+5.2.1
\ No newline at end of file
diff --git a/config/msvc-stl-wrapper.template.h b/config/msvc-stl-wrapper.template.h
index ed9d98b0dd..24f02023c5 100644
--- a/config/msvc-stl-wrapper.template.h
+++ b/config/msvc-stl-wrapper.template.h
@@ -19,12 +19,6 @@
 #  define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER}
 #endif
 
-// Code built with !_HAS_EXCEPTIONS calls std::_Throw(), but the win2k
-// CRT doesn't export std::_Throw().  So we define it.
-#ifndef mozilla_Throw_h
-#  include "mozilla/throw_msvc.h"
-#endif
-
 #ifdef _DEBUG
 // From
 //   http://msdn.microsoft.com/en-us/library/aa985982%28VS.80%29.aspx