diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-20 14:39:02 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-20 14:39:02 (GMT) |
| commit | f32035e829bbad14eed632d80794349a878bcc38 (patch) | |
| tree | 2d86864a060c482b0e19a9f6d30bfa75033dc575 /src/script/bridge/qscriptqobject.cpp | |
| parent | 6fec99fd1fc256437c5c651209084f479005a7a7 (diff) | |
| download | Qt-f32035e829bbad14eed632d80794349a878bcc38.zip Qt-f32035e829bbad14eed632d80794349a878bcc38.tar.gz Qt-f32035e829bbad14eed632d80794349a878bcc38.tar.bz2 | |
add recursion guard for GC marking
To achieve behavior of the old back-end. There, the recursion guard
was automatic because a mark flag was set on the object as soon as
marking begun, but in JSC it appears to only be set _after_ the
marking is completed.
Diffstat (limited to 'src/script/bridge/qscriptqobject.cpp')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index bb701ce..b7a0e44 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -266,9 +266,8 @@ JSC::CallType QtFunction::getCallData(JSC::CallData &callData) void QtFunction::mark() { Q_ASSERT(!marked()); - if (data->object && !data->object.marked()) { - JSC::asObject(data->object)->JSC::JSObject::mark(); - } + if (data->object && !data->object.marked()) + data->object.mark(); JSC::InternalFunction::mark(); } |