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 742114 - Remove duplicate marking of TypeObject::interpretedFunction; r=billm

Browse Source 
This looks like a merge conflict that I didn't resolve correctly.  I also took
the liberty of re-ordering the marking here to match what's in MarkChildren and
the declaration ordering of TypeObject.

--HG--
extra : rebase_source : 33beeb5ea33f8238f6d4d17c223d29acdbfa9457
This commit is contained in:
Terrence Cole 2012-04-03 18:33:41 -07:00
parent a906c21250
commit f59cad57a1
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jsgcmark.cpp
View File

@ -774,6 +774,9 @@ ScanTypeObject(GCMarker *gcmarker, types::TypeObject *type)
if (type->proto)
PushMarkStack(gcmarker, type->proto);
if (type->singleton && !type->lazy())
PushMarkStack(gcmarker, type->singleton);
if (type->newScript) {
PushMarkStack(gcmarker, type->newScript->fun);
PushMarkStack(gcmarker, type->newScript->shape);
@ -781,12 +784,6 @@ ScanTypeObject(GCMarker *gcmarker, types::TypeObject *type)
if (type->interpretedFunction)
PushMarkStack(gcmarker, type->interpretedFunction);
if (type->singleton && !type->lazy())
PushMarkStack(gcmarker, type->singleton);
if (type->interpretedFunction)
PushMarkStack(gcmarker, type->interpretedFunction);
}
static void