merge mozilla-central to mozilla-inbound. r=merge a=merge on a CLOSED TREE

--HG--
extra : amend_source : 5bfb0f121a7dbb553614c0cff5a830d96762cac6
This commit is contained in:
Sebastian Hengst 2017-12-08 02:18:07 +02:00
commit ffa5268a57

View File

@ -913,8 +913,8 @@ ScriptLoader::InstantiateModuleTree(ModuleLoadRequest* aRequest)
JS::Value parseError = FindFirstParseError(aRequest);
if (!parseError.isUndefined()) {
LOG(("ScriptLoadRequest (%p): found parse error", aRequest));
moduleScript->SetErrorToRethrow(parseError);
LOG(("ScriptLoadRequest (%p): found parse error", aRequest));
return true;
}