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

Fixed new GC changes.

Browse Source
This commit is contained in:
rogerl%netscape.com 2003-05-09 07:12:50 +00:00
parent c3e4703dae
commit fcd6d699fa
2 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js2/src/js2metadata.cpp
View File

@ -5151,12 +5151,14 @@ XXX see EvalAttributeExpression, where identifiers are being handled for now...
RootKeeper *r = *i;
PondScum *scum = NULL;
if (r->is_js2val) {
if (JS2VAL_IS_OBJECT(*(r->p))
scum = ((PondScum *)(JS2VAL_TO_OBJECT(*(r->p)))) - 1;
js2val *valp = (js2val *)(r->p);
if (JS2VAL_IS_OBJECT(*valp))
scum = ((PondScum *)(JS2VAL_TO_OBJECT(*valp))) - 1;
}
else {
if (*(r->p))
scum = (*(r->p) - 1);
JS2Object *objp = (JS2Object *)(r->p);
if (objp)
scum = ((PondScum *)objp - 1);
}
if (scum) {
ASSERT(scum->owner && (scum->getSize() >= sizeof(PondScum)) && (scum->owner->sanity == POND_SANITY));

44
js2/src/js2metadata.h
View File

@ -50,6 +50,12 @@ class CompoundAttribute;
class BytecodeContainer;
class Pond;
class SimpleInstance;
class BooleanInstance;
class DateInstance;
class StringInstance;
class FunctionInstance;
class ArrayInstance;
class RegExpInstance;
class LookupKind;
class Package;
@ -247,22 +253,40 @@ public:
static void markJS2Value(js2val v);
};
#define ROOTKEEPER_CONSTRUCTOR(type) RootKeeper(type **p, int line, char *pfile) : is_js2val(false), p(p) { init(line, pfile); }
class RootKeeper {
public:
#ifdef DEBUG
RootKeeper(JS2Object **p, int line, char *pfile) : is_js2val(false), p(p), line(line)
ROOTKEEPER_CONSTRUCTOR(JS2Object)
ROOTKEEPER_CONSTRUCTOR(RegExpInstance)
ROOTKEEPER_CONSTRUCTOR(CompoundAttribute)
ROOTKEEPER_CONSTRUCTOR(const String)
ROOTKEEPER_CONSTRUCTOR(String)
ROOTKEEPER_CONSTRUCTOR(ArrayInstance)
ROOTKEEPER_CONSTRUCTOR(BooleanInstance)
ROOTKEEPER_CONSTRUCTOR(StringInstance)
ROOTKEEPER_CONSTRUCTOR(JS2Metadata)
ROOTKEEPER_CONSTRUCTOR(Environment)
ROOTKEEPER_CONSTRUCTOR(Multiname)
ROOTKEEPER_CONSTRUCTOR(ParameterFrame)
ROOTKEEPER_CONSTRUCTOR(SimpleInstance)
ROOTKEEPER_CONSTRUCTOR(FunctionInstance)
ROOTKEEPER_CONSTRUCTOR(DateInstance)
RootKeeper(js2val *p, int line, char *pfile) : is_js2val(true), p(p)
{
file = new char[strlen(pfile) + 1];
strcpy(file, pfile);
ri = JS2Object::addRoot(this);
}
RootKeeper(js2val *p, int line, char *pfile) : is_js2val(true), p(p), line(line)
{
file = new char[strlen(pfile) + 1];
strcpy(file, pfile);
ri = JS2Object::addRoot(this);
init(line, pfile);
}
~RootKeeper() { JS2Object::removeRoot(ri); delete file; }
void RootKeeper::init(int line, char *pfile)
{
line = line;
file = new char[strlen(pfile) + 1];
strcpy(file, pfile);
ri = JS2Object::addRoot(this);
}
#else
RootKeeper(JS2Object **p) : is_js2val(false), p(p), { ri = JS2Object::addRoot(p); }
RootKeeper(js2val *p) : is_js2val(true), p(p) { ri = JS2Object::addRoot(p); }