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

Backed out changeset 89a91619a2ae (bug 984101) for bustage

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-04-10 10:03:47 +02:00
parent 4742184268
commit 661931f6a3
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/gc/Heap.h
View File

@ -288,7 +288,7 @@ struct FreeSpan
return nullptr;
}
checkSpan();
JS_EXTRA_POISON(reinterpret_cast<void *>(thing), JS_ALLOCATED_TENURED_PATTERN, thingSize);
JS_POISON(reinterpret_cast<void *>(thing), JS_ALLOCATED_TENURED_PATTERN, thingSize);
return reinterpret_cast<void *>(thing);
}
@ -304,7 +304,6 @@ struct FreeSpan
*this = *reinterpret_cast<FreeSpan *>(thing);
}
checkSpan();
JS_EXTRA_POISON(reinterpret_cast<void *>(thing), JS_ALLOCATED_TENURED_PATTERN, thingSize);
return reinterpret_cast<void *>(thing);
}
@ -321,7 +320,6 @@ struct FreeSpan
first = thing + thingSize;
last = arenaAddr | ArenaMask;
checkSpan();
JS_EXTRA_POISON(reinterpret_cast<void *>(thing), JS_ALLOCATED_TENURED_PATTERN, thingSize);
return reinterpret_cast<void *>(thing);
}

2
js/src/gc/Nursery.cpp
View File

@ -168,7 +168,7 @@ js::Nursery::allocate(size_t size)
void *thing = (void *)position();
position_ = position() + size;
JS_EXTRA_POISON(thing, JS_ALLOCATED_NURSERY_PATTERN, size);
JS_POISON(thing, JS_ALLOCATED_NURSERY_PATTERN, size);
return thing;
}

3
js/src/jsgc.cpp
View File

@ -491,8 +491,7 @@ Arena::finalize(FreeOp *fop, AllocKind thingKind, size_t thingSize)
JS_ASSERT(newListTail == &newListHead);
JS_ASSERT(!newFreeSpanStart ||
newFreeSpanStart == thingsStart(thingKind));
JS_POISON(&aheader, JS_SWEPT_TENURED_PATTERN, sizeof(ArenaHeader));
JS_EXTRA_POISON(data, JS_SWEPT_TENURED_PATTERN, sizeof(data));
JS_POISON(data, JS_SWEPT_TENURED_PATTERN, sizeof(data));
return true;
}

3
js/src/jsutil.h
View File

@ -284,9 +284,6 @@ ClearAllBitArrayElements(size_t *array, size_t length)
# define JS_POISON(p, val, size) ((void) 0)
#endif
/* Bug 984101: Disable labeled poisoning until we have poison checking. */
#define JS_EXTRA_POISON(p, val, size) ((void) 0)
/* Basic stats */
#ifdef DEBUG
# define JS_BASIC_STATS 1