diff options
Diffstat (limited to 'chromium/v8/src/objects/js-regexp-inl.h')
| -rw-r--r-- | chromium/v8/src/objects/js-regexp-inl.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/chromium/v8/src/objects/js-regexp-inl.h b/chromium/v8/src/objects/js-regexp-inl.h index 93e6ee008d2..b69d1cca975 100644 --- a/chromium/v8/src/objects/js-regexp-inl.h +++ b/chromium/v8/src/objects/js-regexp-inl.h @@ -17,13 +17,8 @@ namespace v8 { namespace internal { -OBJECT_CONSTRUCTORS_IMPL(JSRegExp, JSObject) +TQ_OBJECT_CONSTRUCTORS_IMPL(JSRegExp) -CAST_ACCESSOR(JSRegExp) - -ACCESSORS(JSRegExp, data, Object, kDataOffset) -ACCESSORS(JSRegExp, flags, Object, kFlagsOffset) -ACCESSORS(JSRegExp, source, Object, kSourceOffset) ACCESSORS(JSRegExp, last_index, Object, kLastIndexOffset) JSRegExp::Type JSRegExp::TypeTag() const { @@ -80,23 +75,28 @@ void JSRegExp::SetDataAt(int index, Object value) { bool JSRegExp::HasCompiledCode() const { if (TypeTag() != IRREGEXP) return false; + Smi uninitialized = Smi::FromInt(kUninitializedValue); #ifdef DEBUG DCHECK(DataAt(kIrregexpLatin1CodeIndex).IsCode() || - DataAt(kIrregexpLatin1CodeIndex).IsByteArray() || - DataAt(kIrregexpLatin1CodeIndex) == Smi::FromInt(kUninitializedValue)); + DataAt(kIrregexpLatin1CodeIndex) == uninitialized); DCHECK(DataAt(kIrregexpUC16CodeIndex).IsCode() || - DataAt(kIrregexpUC16CodeIndex).IsByteArray() || - DataAt(kIrregexpUC16CodeIndex) == Smi::FromInt(kUninitializedValue)); + DataAt(kIrregexpUC16CodeIndex) == uninitialized); + DCHECK(DataAt(kIrregexpLatin1BytecodeIndex).IsByteArray() || + DataAt(kIrregexpLatin1BytecodeIndex) == uninitialized); + DCHECK(DataAt(kIrregexpUC16BytecodeIndex).IsByteArray() || + DataAt(kIrregexpUC16BytecodeIndex) == uninitialized); #endif // DEBUG - Smi uninitialized = Smi::FromInt(kUninitializedValue); return (DataAt(kIrregexpLatin1CodeIndex) != uninitialized || DataAt(kIrregexpUC16CodeIndex) != uninitialized); } void JSRegExp::DiscardCompiledCodeForSerialization() { DCHECK(HasCompiledCode()); - SetDataAt(kIrregexpLatin1CodeIndex, Smi::FromInt(kUninitializedValue)); - SetDataAt(kIrregexpUC16CodeIndex, Smi::FromInt(kUninitializedValue)); + Smi uninitialized = Smi::FromInt(kUninitializedValue); + SetDataAt(kIrregexpLatin1CodeIndex, uninitialized); + SetDataAt(kIrregexpUC16CodeIndex, uninitialized); + SetDataAt(kIrregexpLatin1BytecodeIndex, uninitialized); + SetDataAt(kIrregexpUC16BytecodeIndex, uninitialized); } } // namespace internal |