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

Bug 1919767 - Flag various EnumSet<...> globals as constexpr in js/src/gc/GC.cpp r=sfink

Browse Source 
This requires to flag some method from Enumset as constexpr but make it
clear that those don't require a global constructor.

Differential Revision: https://phabricator.services.mozilla.com/D222792
This commit is contained in:
serge-sans-paille 2024-09-20 05:54:01 +00:00
parent 7907b5fa6d
commit 875628fc84
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/gc/GC.cpp
View File

@ -637,7 +637,7 @@ const char gc::ZealModeHelpText[] =
// clang-format on
// The set of zeal modes that yield at specific points in collection.
static const EnumSet<ZealMode> YieldPointZealModes = {
static constexpr EnumSet<ZealMode> YieldPointZealModes = {
ZealMode::YieldBeforeRootMarking,
ZealMode::YieldBeforeMarking,
ZealMode::YieldBeforeSweeping,
@ -649,19 +649,19 @@ static const EnumSet<ZealMode> YieldPointZealModes = {
ZealMode::YieldWhileGrayMarking};
// The set of zeal modes that control incremental slices.
static const EnumSet<ZealMode> IncrementalSliceZealModes =
static constexpr EnumSet<ZealMode> IncrementalSliceZealModes =
YieldPointZealModes +
EnumSet<ZealMode>{ZealMode::IncrementalMultipleSlices};
// The set of zeal modes that trigger GC periodically.
static const EnumSet<ZealMode> PeriodicGCZealModes =
static constexpr EnumSet<ZealMode> PeriodicGCZealModes =
IncrementalSliceZealModes + EnumSet<ZealMode>{ZealMode::Alloc,
ZealMode::GenerationalGC,
ZealMode::Compact};
// The set of zeal modes that are mutually exclusive. All of these trigger GC
// except VerifierPre.
static const EnumSet<ZealMode> ExclusiveZealModes =
static constexpr EnumSet<ZealMode> ExclusiveZealModes =
PeriodicGCZealModes + EnumSet<ZealMode>{ZealMode::VerifierPre};
void GCRuntime::setZeal(uint8_t zeal, uint32_t frequency) {

34
mfbt/EnumSet.h
View File

@ -82,7 +82,7 @@ class EnumSet {
/**
* Union
*/
void operator+=(const EnumSet& aEnumSet) {
constexpr void operator+=(const EnumSet& aEnumSet) {
IncVersion();
mBitField |= aEnumSet.mBitField;
}
@ -90,7 +90,7 @@ class EnumSet {
/**
* Union
*/
EnumSet operator+(const EnumSet& aEnumSet) const {
constexpr EnumSet operator+(const EnumSet& aEnumSet) const {
EnumSet result(*this);
result += aEnumSet;
return result;
@ -99,7 +99,7 @@ class EnumSet {
/**
* Remove an element
*/
void operator-=(T aEnum) {
constexpr void operator-=(T aEnum) {
IncVersion();
mBitField &= ~(BitFor(aEnum));
}
@ -107,7 +107,7 @@ class EnumSet {
/**
* Remove an element
*/
EnumSet operator-(T aEnum) const {
constexpr EnumSet operator-(T aEnum) const {
EnumSet result(*this);
result -= aEnum;
return result;
@ -116,7 +116,7 @@ class EnumSet {
/**
* Remove a set of elements
*/
void operator-=(const EnumSet& aEnumSet) {
constexpr void operator-=(const EnumSet& aEnumSet) {
IncVersion();
mBitField &= ~(aEnumSet.mBitField);
}
@ -124,7 +124,7 @@ class EnumSet {
/**
* Remove a set of elements
*/
EnumSet operator-(const EnumSet& aEnumSet) const {
constexpr EnumSet operator-(const EnumSet& aEnumSet) const {
EnumSet result(*this);
result -= aEnumSet;
return result;
@ -133,7 +133,7 @@ class EnumSet {
/**
* Clear
*/
void clear() {
constexpr void clear() {
IncVersion();
mBitField = Serialized();
}
@ -141,7 +141,7 @@ class EnumSet {
/**
* Intersection
*/
void operator&=(const EnumSet& aEnumSet) {
constexpr void operator&=(const EnumSet& aEnumSet) {
IncVersion();
mBitField &= aEnumSet.mBitField;
}
@ -149,7 +149,7 @@ class EnumSet {
/**
* Intersection
*/
EnumSet operator&(const EnumSet& aEnumSet) const {
constexpr EnumSet operator&(const EnumSet& aEnumSet) const {
EnumSet result(*this);
result &= aEnumSet;
return result;
@ -158,36 +158,38 @@ class EnumSet {
/**
* Equality
*/
bool operator==(const EnumSet& aEnumSet) const {
constexpr bool operator==(const EnumSet& aEnumSet) const {
return mBitField == aEnumSet.mBitField;
}
/**
* Equality
*/
bool operator==(T aEnum) const { return mBitField == BitFor(aEnum); }
constexpr bool operator==(T aEnum) const {
return mBitField == BitFor(aEnum);
}
/**
* Not equal
*/
bool operator!=(const EnumSet& aEnumSet) const {
constexpr bool operator!=(const EnumSet& aEnumSet) const {
return !operator==(aEnumSet);
}
/**
* Not equal
*/
bool operator!=(T aEnum) const { return !operator==(aEnum); }
constexpr bool operator!=(T aEnum) const { return !operator==(aEnum); }
/**
* Test is an element is contained in the set.
*/
bool contains(T aEnum) const { return HasBitFor(aEnum); }
constexpr bool contains(T aEnum) const { return HasBitFor(aEnum); }
/**
* Test if a set is contained in the set.
*/
bool contains(const EnumSet& aEnumSet) const {
constexpr bool contains(const EnumSet& aEnumSet) const {
return (mBitField & aEnumSet.mBitField) == aEnumSet.mBitField;
}
@ -206,7 +208,7 @@ class EnumSet {
}
}
bool isEmpty() const {
constexpr bool isEmpty() const {
if constexpr (std::is_unsigned_v<Serialized>) {
return mBitField == 0;
} else {