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 845519 - Fix aliasing problem between Rooted<T> and Rooted<derived-from-T>. r=bhackett

Browse Source 
--HG--
extra : rebase_source : 38e1a42e7408e6bd60dbdc42f2dbb5cffb68625d
This commit is contained in:
Steve Fink 2013-02-15 10:18:30 -08:00
parent 41efaaf7cd
commit 415bf7ecaf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/gc/Root.h
View File

@ -670,7 +670,7 @@ class Rooted : public RootedBase<T>
~Rooted() {
#if defined(JSGC_ROOT_ANALYSIS) || defined(JSGC_USE_EXACT_ROOTING)
JS_ASSERT(*stack == this);
JS_ASSERT(*stack == reinterpret_cast<Rooted<void*>*>(this));
*stack = prev;
#endif
}
@ -704,19 +704,19 @@ class Rooted : public RootedBase<T>
void commonInit(Rooted<void*> **thingGCRooters) {
#if defined(JSGC_ROOT_ANALYSIS) || defined(JSGC_USE_EXACT_ROOTING)
ThingRootKind kind = RootMethods<T>::kind();
this->stack = reinterpret_cast<Rooted<T>**>(&thingGCRooters[kind]);
this->stack = &thingGCRooters[kind];
this->prev = *stack;
*stack = this;
*stack = reinterpret_cast<Rooted<void*>*>(this);
JS_ASSERT(!RootMethods<T>::poisoned(ptr));
#endif
}
#if defined(JSGC_ROOT_ANALYSIS) || defined(JSGC_USE_EXACT_ROOTING)
Rooted<T> **stack, *prev;
Rooted<void*> **stack, *prev;
#endif
#if defined(JSGC_ROOT_ANALYSIS)
#if defined(DEBUG) && defined(JS_GC_ZEAL) && defined(JSGC_ROOT_ANALYSIS) && !defined(JS_THREADSAFE)
/* Has the rooting analysis ever scanned this Rooted's stack location? */
friend void JS::CheckStackRoots(JSContext*);
bool scanned;