corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 6 changesets (bug 1757833) for Linux base toolchains build failure

Browse Source 
Backed out changeset c8117edaf054 (bug 1757833)
Backed out changeset a46efd9967d0 (bug 1757833)
Backed out changeset f33955b6a7cc (bug 1757833)
Backed out changeset 71f1afa82581 (bug 1757833)
Backed out changeset 868407dccba9 (bug 1757833)
Backed out changeset 79873d83d02b (bug 1757833)
This commit is contained in:
Sebastian Hengst
2022-05-17 19:46:50 +02:00
parent d4dc83a791
commit e33f3602b0
11 changed files with 11 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dom/script/ScriptLoader.cpp
View File

@@ -9,8 +9,6 @@
#include "ScriptTrace.h"
#include "ModuleLoader.h"
#include "zlib.h"
#include "prsystem.h"
#include "jsapi.h"
#include "jsfriendapi.h"
@@ -19,7 +17,6 @@
#include "js/ContextOptions.h" // JS::ContextOptionsRef
#include "js/friend/ErrorMessages.h" // js::GetErrorMessage, JSMSG_*
#include "js/loader/ScriptLoadRequest.h"
#include "ScriptCompression.h"
#include "js/loader/LoadedScript.h"
#include "js/loader/ModuleLoadRequest.h"
#include "js/MemoryFunctions.h"
@@ -2555,14 +2552,7 @@ void ScriptLoader::EncodeRequestBytecode(JSContext* aCx,
return;
}
Vector<uint8_t> compressedBytecode;
// TODO probably need to move this to a helper thread
if (!ScriptBytecodeCompress(aRequest->mScriptBytecode,
aRequest->mBytecodeOffset, compressedBytecode)) {
return;
}
if (compressedBytecode.length() >= UINT32_MAX) {
if (aRequest->mScriptBytecode.length() >= UINT32_MAX) {
LOG(
("ScriptLoadRequest (%p): Bytecode cache is too large to be decoded "
"correctly.",
@@ -2575,8 +2565,7 @@ void ScriptLoader::EncodeRequestBytecode(JSContext* aCx,
// case, we just ignore the current one.
nsCOMPtr<nsIAsyncOutputStream> output;
rv = aRequest->mCacheInfo->OpenAlternativeOutputStream(
BytecodeMimeTypeFor(aRequest),
static_cast<int64_t>(compressedBytecode.length()),
BytecodeMimeTypeFor(aRequest), aRequest->mScriptBytecode.length(),
getter_AddRefs(output));
if (NS_FAILED(rv)) {
LOG(
@@ -2593,17 +2582,17 @@ void ScriptLoader::EncodeRequestBytecode(JSContext* aCx,
});
uint32_t n;
rv = output->Write(reinterpret_cast<char*>(compressedBytecode.begin()),
compressedBytecode.length(), &n);
LOG(
("ScriptLoadRequest (%p): Write bytecode cache (rv = %X, length = %u, "
"written = %u)",
aRequest, unsigned(rv), unsigned(compressedBytecode.length()), n));
rv = output->Write(reinterpret_cast<char*>(aRequest->mScriptBytecode.begin()),
aRequest->mScriptBytecode.length(), &n);
LOG((
"ScriptLoadRequest (%p): Write bytecode cache (rv = %X, length = %u, "
"written = %u)",
aRequest, unsigned(rv), unsigned(aRequest->mScriptBytecode.length()), n));
if (NS_FAILED(rv)) {
return;
}
MOZ_RELEASE_ASSERT(compressedBytecode.length() == n);
MOZ_RELEASE_ASSERT(aRequest->mScriptBytecode.length() == n);
bytecodeFailed.release();
TRACE_FOR_TEST_NONE(aRequest->GetScriptLoadContext()->GetScriptElement(),