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

Bug 1797024 - Part 1: Move OOM handling out of frontend::WellKnownParserAtoms. r=nbp

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D160206
This commit is contained in:
Tooru Fujisawa 2022-11-24 15:44:40 +00:00
parent 81b3e451ce
commit 84533f6bcf
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/src/frontend/ParserAtom.cpp
View File

@ -1238,8 +1238,7 @@ TaggedParserAtomIndex WellKnownParserAtoms::lookupTinyIndexUTF8(
return lookupTinyIndex(reinterpret_cast<const Latin1Char*>(utf8Ptr), nbyte);
}
bool WellKnownParserAtoms::initSingle(JSContext* cx,
const WellKnownAtomInfo& info,
bool WellKnownParserAtoms::initSingle(const WellKnownAtomInfo& info,
TaggedParserAtomIndex index) {
unsigned int len = info.length;
const Latin1Char* str = reinterpret_cast<const Latin1Char*>(info.content);
@ -1259,34 +1258,33 @@ bool WellKnownParserAtoms::initSingle(JSContext* cx,
// Save name for returning after moving entry into set.
if (!wellKnownMap_.putNew(lookup, &info, index)) {
js::ReportOutOfMemory(cx);
return false;
}
return true;
}
bool WellKnownParserAtoms::init(JSContext* cx) {
bool WellKnownParserAtoms::init() {
// Add well-known strings to the HashMap. The HashMap is used for dynamic
// lookups later and does not change once this init method is complete.
#define COMMON_NAME_INIT_(_, NAME, _2) \
if (!initSingle(cx, GetWellKnownAtomInfo(WellKnownAtomId::NAME), \
TaggedParserAtomIndex::WellKnown::NAME())) { \
return false; \
#define COMMON_NAME_INIT_(_, NAME, _2) \
if (!initSingle(GetWellKnownAtomInfo(WellKnownAtomId::NAME), \
TaggedParserAtomIndex::WellKnown::NAME())) { \
return false; \
}
FOR_EACH_NONTINY_COMMON_PROPERTYNAME(COMMON_NAME_INIT_)
#undef COMMON_NAME_INIT_
#define COMMON_NAME_INIT_(NAME, _) \
if (!initSingle(cx, GetWellKnownAtomInfo(WellKnownAtomId::NAME), \
TaggedParserAtomIndex::WellKnown::NAME())) { \
return false; \
#define COMMON_NAME_INIT_(NAME, _) \
if (!initSingle(GetWellKnownAtomInfo(WellKnownAtomId::NAME), \
TaggedParserAtomIndex::WellKnown::NAME())) { \
return false; \
}
JS_FOR_EACH_PROTOTYPE(COMMON_NAME_INIT_)
#undef COMMON_NAME_INIT_
#define COMMON_NAME_INIT_(NAME) \
if (!initSingle(cx, GetWellKnownAtomInfo(WellKnownAtomId::NAME), \
TaggedParserAtomIndex::WellKnown::NAME())) { \
return false; \
#define COMMON_NAME_INIT_(NAME) \
if (!initSingle(GetWellKnownAtomInfo(WellKnownAtomId::NAME), \
TaggedParserAtomIndex::WellKnown::NAME())) { \
return false; \
}
JS_FOR_EACH_WELL_KNOWN_SYMBOL(COMMON_NAME_INIT_)
#undef COMMON_NAME_INIT_
@ -1307,7 +1305,8 @@ bool JSRuntime::initializeParserAtoms(JSContext* cx) {
UniquePtr<js::frontend::WellKnownParserAtoms> names(
js_new<js::frontend::WellKnownParserAtoms>());
if (!names || !names->init(cx)) {
if (!names || !names->init()) {
js::ReportOutOfMemory(cx);
return false;
}

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

@ -579,11 +579,10 @@ class WellKnownParserAtoms {
WellKnownAtomInfoHasher, js::SystemAllocPolicy>;
EntryMap wellKnownMap_;
bool initSingle(JSContext* cx, const WellKnownAtomInfo& info,
TaggedParserAtomIndex index);
bool initSingle(const WellKnownAtomInfo& info, TaggedParserAtomIndex index);
public:
bool init(JSContext* cx);
bool init();
// Maximum length of any well known atoms. This can be increased if needed.
static constexpr size_t MaxWellKnownLength = 32;