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 55fa2277a702 (bug 848592) for exposing pre-existing rooting hazards. Will fix the problems before relanding. The green you see is a lie.

Browse Source
This commit is contained in:
Steve Fink 2013-06-05 16:03:30 -07:00
parent 5b627cd05c
commit b5693aeaba
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/public/RootingAPI.h
View File

@ -589,10 +589,8 @@ class MOZ_STACK_CLASS Rooted : public js::RootedBase<T>
this->stack = &thingGCRooters[kind];
this->prev = *stack;
*stack = reinterpret_cast<Rooted<void*>*>(this);
# ifdef JSGC_ROOT_ANALYSIS
this->scanned = false;
JS_ASSERT(!js::RootMethods<T>::poisoned(ptr));
# endif
#endif
}

28
js/src/gc/Verifier.cpp
View File

@ -59,40 +59,12 @@ struct Rooter {
ThingRootKind kind;
};
// Temporarily mark a region of memory as defined for valgrind's purposes, so
// that we don't get false positive warnings due to examining or poisoning
// undefined memory that happens to look like gcthing pointers. The advantage
// of using this RAII class over an unconditional VALGRIND_MAKE_MEM_DEFINED is
// that it is reverted to undefined afterwards, so that true uses of undefined
// memory will not be suppressed.
template <typename T>
struct AutoMarkDefinedForValgrind {
static const unsigned int VALGRIND_RUNNING_AND_REQUEST_SUCCESSFUL = 1;
T *ptr_;
bool active;
uint8_t defined[sizeof(T)];
AutoMarkDefinedForValgrind(T *ptr)
: ptr_(ptr), active(true)
{
// The 'v bits' are Valgrind's representation of whether a valid is defined
active = (VALGRIND_GET_VBITS(ptr_, defined, sizeof(T)) ==
VALGRIND_RUNNING_AND_REQUEST_SUCCESSFUL);
VALGRIND_MAKE_MEM_DEFINED(ptr_, sizeof(T));
}
~AutoMarkDefinedForValgrind() {
if (active)
(void) VALGRIND_SET_VBITS(ptr_, defined, sizeof(T));
}
};
static void
CheckStackRoot(JSRuntime *rt, uintptr_t *w, Rooter *begin, Rooter *end)
{
/* Mark memory as defined for valgrind, as in MarkWordConservatively. */
#ifdef MOZ_VALGRIND
VALGRIND_MAKE_MEM_DEFINED(&w, sizeof(w));
AutoMarkDefinedForValgrind<uintptr_t> define(w);
#endif
void *thing = GetAddressableGCThing(rt, *w);