wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 782487 - Remove traces of JSStaticAtom. r=billm.

Browse Source 
--HG--
extra : rebase_source : 89e892e3e6ca04f0c19747f189535b3e3ae95d77
This commit is contained in:
Nicholas Nethercote 2012-08-13 20:02:51 -07:00
parent 85598d9362
commit 613f8f933c
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/jsprvtd.h
View File

@ -82,7 +82,6 @@ class JSExtensibleString;
class JSExternalString;
class JSLinearString;
class JSFixedString;
class JSStaticAtom;
class JSRope;
class JSAtom;
class JSWrapper;

2
js/src/vm/String-inl.h
View File

@ -213,7 +213,7 @@ JSFixedString::new_(JSContext *cx, const jschar *chars, size_t length)
JS_ALWAYS_INLINE JSAtom *
JSFixedString::morphAtomizedStringIntoAtom()
{
d.lengthAndFlags = buildLengthAndFlags(length(), NON_STATIC_ATOM_FLAGS);
d.lengthAndFlags = buildLengthAndFlags(length(), ATOM_FLAGS);
return &asAtom();
}

7
js/src/vm/String.h
View File

@ -168,8 +168,8 @@ class JSString : public js::gc::Cell
*
* Instead of using a dense index to represent the most-derived type, string
* types are encoded to allow single-op tests for hot queries (isRope,
* isDependent, isFlat, isAtom, isStaticAtom) which, in view of subtyping,
* would require slower (isX() || isY() || isZ()).
* isDependent, isFlat, isAtom) which, in view of subtyping, would require
* slower (isX() || isY() || isZ()).
*
* The string type encoding can be summarized as follows. The "instance
* encoding" entry for a type specifies the flag bits used to create a
@ -194,7 +194,6 @@ class JSString : public js::gc::Cell
* Atom 1000 x000
* InlineAtom 1000 1000 && is Inline
* ShortAtom 1000 1000 && is Short
* StaticAtom 0000 0000
*/
static const size_t LENGTH_SHIFT = 4;
@ -208,7 +207,7 @@ class JSString : public js::gc::Cell
static const size_t UNDEPENDED_FLAGS = JS_BIT(1) | JS_BIT(3);
static const size_t ATOM_MASK = JS_BITMASK(3);
static const size_t NON_STATIC_ATOM_FLAGS = JS_BIT(3);
static const size_t ATOM_FLAGS = JS_BIT(3);
static const size_t MAX_LENGTH = JS_BIT(32 - LENGTH_SHIFT) - 1;