Merge inbound to mozilla-central. a=merge

--HG--
rename : devtools/client/debugger/src/utils/workers.js => devtools/client/debugger/src/utils/threads.js

js/src/builtin/intl/Collator.cpp

@@ -102,9 +102,6 @@ static bool Collator(JSContext* cx, const CallArgs& args) {
     return false;
   }
 
-  collator->setFixedSlot(CollatorObject::INTERNALS_SLOT, NullValue());
-  collator->setCollator(nullptr);
-
   HandleValue locales = args.get(0);
   HandleValue options = args.get(1);
 

js/src/builtin/intl/CommonFunctions.js

@@ -2024,7 +2024,7 @@ function initializeIntlObject(obj, type, lazyData) {
     internals.lazyData = lazyData;
     internals.internalProps = null;
 
-    assert(UnsafeGetReservedSlot(obj, INTL_INTERNALS_OBJECT_SLOT) === null,
+    assert(UnsafeGetReservedSlot(obj, INTL_INTERNALS_OBJECT_SLOT) === undefined,
            "Internal slot already initialized?");
     UnsafeSetReservedSlot(obj, INTL_INTERNALS_OBJECT_SLOT, internals);
 }

js/src/builtin/intl/DateTimeFormat.cpp

@@ -117,10 +117,6 @@ static bool DateTimeFormat(JSContext* cx, const CallArgs& args, bool construct,
     return false;
   }
 
-  dateTimeFormat->setFixedSlot(DateTimeFormatObject::INTERNALS_SLOT,
-                               NullValue());
-  dateTimeFormat->setDateFormat(nullptr);
-
   RootedValue thisValue(
       cx, construct ? ObjectValue(*dateTimeFormat) : args.thisv());
   HandleValue locales = args.get(0);

js/src/builtin/intl/NumberFormat.cpp

@@ -127,10 +127,6 @@ static bool NumberFormat(JSContext* cx, const CallArgs& args, bool construct) {
     return false;
   }
 
-  numberFormat->setFixedSlot(NumberFormatObject::INTERNALS_SLOT, NullValue());
-  numberFormat->setNumberFormatter(nullptr);
-  numberFormat->setFormattedNumber(nullptr);
-
   RootedValue thisValue(cx,
                         construct ? ObjectValue(*numberFormat) : args.thisv());
   HandleValue locales = args.get(0);

js/src/builtin/intl/PluralRules.cpp

@@ -100,11 +100,6 @@ static bool PluralRules(JSContext* cx, unsigned argc, Value* vp) {
     return false;
   }
 
-  pluralRules->setFixedSlot(PluralRulesObject::INTERNALS_SLOT, NullValue());
-  pluralRules->setPluralRules(nullptr);
-  pluralRules->setNumberFormatter(nullptr);
-  pluralRules->setFormattedNumber(nullptr);
-
   HandleValue locales = args.get(0);
   HandleValue options = args.get(1);
 

js/src/builtin/intl/RelativeTimeFormat.cpp

@@ -109,10 +109,6 @@ static bool RelativeTimeFormat(JSContext* cx, unsigned argc, Value* vp) {
     return false;
   }
 
-  relativeTimeFormat->setFixedSlot(RelativeTimeFormatObject::INTERNALS_SLOT,
-                                   NullValue());
-  relativeTimeFormat->setRelativeDateTimeFormatter(nullptr);
-
   HandleValue locales = args.get(0);
   HandleValue options = args.get(1);