Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1676821 - Use vector to map delazified function to function index. r=tcampbell

Browse Source 
CompilationInfoVector::buildDelazificationIndices builds a map
from delazified function's key to its index in the delazifications vector,
and then build a vector that maps delazification to FunctionIndex.

Differential Revision: https://phabricator.services.mozilla.com/D96818
This commit is contained in:
Tooru Fujisawa 2020-11-13 10:01:52 +00:00
parent 172256ead3
commit 9dc1dcab9f
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/frontend/CompilationInfo.h
View File

@ -462,17 +462,18 @@ struct CompilationInfo {
struct CompilationInfoVector {
private:
using FunctionKey = uint64_t;
using FunctionMap = HashMap<FunctionKey, FunctionIndex>;
using FunctionIndexVector = Vector<FunctionIndex, 0, js::SystemAllocPolicy>;
static FunctionKey toFunctionKey(const SourceExtent& extent) {
return (FunctionKey)extent.sourceStart << 32 | extent.sourceEnd;
}
MOZ_MUST_USE bool buildDelazificationStencilMap(FunctionMap& functionMap);
MOZ_MUST_USE bool buildDelazificationIndices(JSContext* cx);
public:
frontend::CompilationInfo initial;
GCVector<frontend::CompilationInfo, 0, js::SystemAllocPolicy> delazifications;
FunctionIndexVector delazificationIndices;
CompilationInfoVector(JSContext* cx,
const JS::ReadOnlyCompileOptions& options)

57
js/src/frontend/Stencil.cpp
View File

@ -725,20 +725,40 @@ bool CompilationInfo::instantiateStencilsAfterPreparation(
return true;
}
bool CompilationInfoVector::buildDelazificationStencilMap(
FunctionMap& functionMap) {
// Stantdlone-functions are not supported by XDR.
bool CompilationInfoVector::buildDelazificationIndices(JSContext* cx) {
// Standalone-functions are not supported by XDR.
MOZ_ASSERT(!initial.stencil.scriptData[0].isFunction());
if (!functionMap.reserve(initial.stencil.scriptData.length() - 1)) {
// If no delazifications, we are done.
if (delazifications.empty()) {
return true;
}
if (!delazificationIndices.resize(delazifications.length())) {
ReportOutOfMemory(cx);
return false;
}
HashMap<FunctionKey, size_t> keyToIndex(cx);
if (!keyToIndex.reserve(delazifications.length())) {
return false;
}
for (size_t i = 0; i < delazifications.length(); i++) {
const auto& delazification = delazifications[i];
auto key = toFunctionKey(delazification.stencil.scriptData[0].extent);
keyToIndex.putNewInfallible(key, i);
}
MOZ_ASSERT(keyToIndex.count() == delazifications.length());
for (size_t i = 1; i < initial.stencil.scriptData.length(); i++) {
if (!functionMap.put(toFunctionKey(initial.stencil.scriptData[i].extent),
FunctionIndex(i))) {
return false;
auto key = toFunctionKey(initial.stencil.scriptData[i].extent);
auto ptr = keyToIndex.lookup(key);
if (!ptr) {
continue;
}
delazificationIndices[ptr->value()] = FunctionIndex(i);
}
return true;
@ -759,22 +779,11 @@ bool CompilationInfoVector::instantiateStencilsAfterPreparation(
return false;
}
// If no delazifications, we are done.
if (delazifications.empty()) {
return true;
}
for (size_t i = 0; i < delazifications.length(); i++) {
auto& delazification = delazifications[i];
auto index = delazificationIndices[i];
FunctionMap functionMap(cx);
if (!buildDelazificationStencilMap(functionMap)) {
return false;
}
for (auto& delazification : delazifications) {
auto p = functionMap.lookup(
toFunctionKey(delazification.stencil.scriptData[0].extent));
MOZ_ASSERT(p);
JSFunction* fun = gcOutput.functions[p->value()];
JSFunction* fun = gcOutput.functions[index];
MOZ_ASSERT(fun);
BaseScript* lazy = fun->baseScript();
@ -845,6 +854,10 @@ bool CompilationInfoVector::prepareForInstantiate(
}
}
if (!buildDelazificationIndices(cx)) {
return false;
}
return true;
}