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 1004457 - Remove unused mutable value operations from BarrieredBase; r=jonco

Browse Source
This commit is contained in:
Terrence Cole 2014-05-02 16:33:18 -07:00
parent dbc5d236e7
commit 1156a946c5
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/gc/Barrier.h
View File

@ -407,11 +407,14 @@ struct InternalGCMethods<jsid>
static void postBarrierRemove(jsid *idp) {}
};
template <typename T>
class BarrieredBaseMixins {};
/*
* Base class for barriered pointer types.
*/
template <class T>
class BarrieredBase : public HeapBase<T>
class BarrieredBase : public BarrieredBaseMixins<T>
{
protected:
T value;
@ -436,6 +439,7 @@ class BarrieredBase : public HeapBase<T>
* Obviously this is dangerous unless you know the barrier is not needed.
*/
T *unsafeGet() { return &value; }
const T *unsafeGet() const { return &value; }
void unsafeSet(T v) { value = v; }
T operator->() const { return value; }
@ -451,6 +455,15 @@ class BarrieredBase : public HeapBase<T>
void pre(Zone *zone) { InternalGCMethods<T>::preBarrier(zone, value); }
};
template <>
class BarrieredBaseMixins<JS::Value> : public ValueOperations<BarrieredBase<JS::Value> >
{
friend class ValueOperations<BarrieredBase<JS::Value> >;
const JS::Value * extract() const {
return static_cast<const BarrieredBase<JS::Value>*>(this)->unsafeGet();
}
};
/*
* PreBarriered only automatically handles pre-barriers. Post-barriers must
* be manually implemented when using this class. HeapPtr and RelocatablePtr

3
js/src/jit-test/tests/gc/bug-1004457.js Normal file
View File

@ -0,0 +1,3 @@
var argObj = (function () { return arguments })();
gczeal(4);
delete argObj.callee;

2
js/src/vm/ArgumentsObject.h
View File

@ -295,7 +295,7 @@ class NormalArgumentsObject : public ArgumentsObject
/* Clear the location storing arguments.callee's initial value. */
void clearCallee() {
data()->callee.setMagic(JS_OVERWRITTEN_CALLEE);
data()->callee = MagicValue(JS_OVERWRITTEN_CALLEE);
}
};