Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1649968 - Part 3: Use CompilationStencil and CompilationGCOutput in ScriptStencilIterable. r=tcampbell

Browse Source 
CompilationGCOutput will be moved out of CompilationInfo in later patch.

Depends on D88206

Differential Revision: https://phabricator.services.mozilla.com/D88207
This commit is contained in:
Tooru Fujisawa 2020-08-27 22:11:42 +00:00
parent 8751eb263b
commit 76c4a7f0c0
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,8 @@ struct ScopeContext {
static Scope* determineEffectiveScope(Scope* scope, JSObject* environment);
};
struct CompilationInfo;
struct CompilationStencil;
struct CompilationGCOutput;
class ScriptStencilIterable {
public:
@ -107,16 +108,19 @@ class ScriptStencilIterable {
class Iterator {
size_t index_ = 0;
CompilationInfo* compilationInfo_;
CompilationStencil& stencil_;
CompilationGCOutput& gcOutput_;
Iterator(CompilationInfo* compilationInfo, size_t index)
: index_(index), compilationInfo_(compilationInfo) {
Iterator(CompilationStencil& stencil, CompilationGCOutput& gcOutput,
size_t index)
: index_(index), stencil_(stencil), gcOutput_(gcOutput) {
skipNonFunctions();
}
public:
explicit Iterator(CompilationInfo* compilationInfo)
: compilationInfo_(compilationInfo) {
explicit Iterator(CompilationStencil& stencil,
CompilationGCOutput& gcOutput)
: stencil_(stencil), gcOutput_(gcOutput) {
skipNonFunctions();
}
@ -136,17 +140,20 @@ class ScriptStencilIterable {
inline ScriptAndFunction operator*();
static inline Iterator end(CompilationInfo* compilationInfo);
static inline Iterator end(CompilationStencil& stencil,
CompilationGCOutput& gcOutput);
};
CompilationInfo* compilationInfo_;
CompilationStencil& stencil_;
CompilationGCOutput& gcOutput_;
explicit ScriptStencilIterable(CompilationInfo* compilationInfo)
: compilationInfo_(compilationInfo) {}
explicit ScriptStencilIterable(CompilationStencil& stencil,
CompilationGCOutput& gcOutput)
: stencil_(stencil), gcOutput_(gcOutput) {}
Iterator begin() const { return Iterator(compilationInfo_); }
Iterator begin() const { return Iterator(stencil_, gcOutput_); }
Iterator end() const { return Iterator::end(compilationInfo_); }
Iterator end() const { return Iterator::end(stencil_, gcOutput_); }
};
// Input of the compilation, including source and enclosing context.
@ -349,7 +356,7 @@ struct MOZ_RAII CompilationInfo {
CompilationInfo& operator=(CompilationInfo&&) = delete;
ScriptStencilIterable functionScriptStencils() {
return ScriptStencilIterable(this);
return ScriptStencilIterable(stencil, gcOutput);
}
#if defined(DEBUG) || defined(JS_JITSPEW)
@ -359,14 +366,14 @@ struct MOZ_RAII CompilationInfo {
};
inline void ScriptStencilIterable::Iterator::next() {
MOZ_ASSERT(index_ < compilationInfo_->stencil.scriptData.length());
MOZ_ASSERT(index_ < stencil_.scriptData.length());
index_++;
}
inline void ScriptStencilIterable::Iterator::skipNonFunctions() {
size_t length = compilationInfo_->stencil.scriptData.length();
size_t length = stencil_.scriptData.length();
while (index_ < length) {
if (compilationInfo_->stencil.scriptData[index_].isFunction()) {
if (stencil_.scriptData[index_].isFunction()) {
return;
}
@ -376,18 +383,17 @@ inline void ScriptStencilIterable::Iterator::skipNonFunctions() {
inline ScriptStencilIterable::ScriptAndFunction
ScriptStencilIterable::Iterator::operator*() {
ScriptStencil& script = compilationInfo_->stencil.scriptData[index_];
ScriptStencil& script = stencil_.scriptData[index_];
FunctionIndex functionIndex = FunctionIndex(index_);
return ScriptAndFunction(script,
compilationInfo_->gcOutput.functions[functionIndex],
return ScriptAndFunction(script, gcOutput_.functions[functionIndex],
functionIndex);
}
/* static */ inline ScriptStencilIterable::Iterator
ScriptStencilIterable::Iterator::end(CompilationInfo* compilationInfo) {
return Iterator(compilationInfo,
compilationInfo->stencil.scriptData.length());
ScriptStencilIterable::Iterator::end(CompilationStencil& stencil,
CompilationGCOutput& gcOutput) {
return Iterator(stencil, gcOutput, stencil.scriptData.length());
}
} // namespace frontend