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 1091725 - Fix barrier computation for MNewDerivedTypedObject, r=nmatsakis.

Browse Source
This commit is contained in:
Brian Hackett 2014-11-03 07:16:58 -07:00
parent edac6334c0
commit 9dc0d36bfd
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/builtin/TypedObject.h
View File

@ -1071,6 +1071,19 @@ IsTypedObjectClass(const Class *class_)
class_ == &InlineOpaqueTypedObject::class_;
}
inline bool
IsOpaqueTypedObjectClass(const Class *class_)
{
return class_ == &OutlineOpaqueTypedObject::class_ ||
class_ == &InlineOpaqueTypedObject::class_;
}
inline const Class *
GetOutlineTypedObjectClass(bool opaque)
{
return opaque ? &OutlineOpaqueTypedObject::class_ : &OutlineTransparentTypedObject::class_;
}
inline bool
IsSimpleTypeDescrClass(const Class* clasp)
{
@ -1103,7 +1116,7 @@ IsTypeDescrClass(const Class* clasp)
inline bool
TypedObject::opaque() const
{
return is<OutlineOpaqueTypedObject>() || is<InlineOpaqueTypedObject>();
return IsOpaqueTypedObjectClass(getClass());
}
// Inline transparent typed objects do not initially have an array buffer, but

16
js/src/jit/IonBuilder.cpp
View File

@ -7411,13 +7411,17 @@ IonBuilder::pushDerivedTypedObject(bool *emitted,
current->add(derivedTypedObj);
current->push(derivedTypedObj);
// Determine (if possible) the class/proto that `derivedTypedObj`
// will have. For derived typed objects, the class (transparent vs
// opaque) will be the same as the incoming object from which the
// derived typed object is, well, derived. The prototype will be
// determined based on the type descriptor (and is immutable).
// Determine (if possible) the class/proto that `derivedTypedObj` will
// have. For derived typed objects, the opacity will be the same as the
// incoming object from which the derived typed object is, well, derived.
// The prototype will be determined based on the type descriptor (and is
// immutable).
types::TemporaryTypeSet *objTypes = obj->resultTypeSet();
const Class *expectedClass = objTypes ? objTypes->getKnownClass() : nullptr;
const Class *expectedClass = nullptr;
if (const Class *objClass = objTypes ? objTypes->getKnownClass() : nullptr) {
MOZ_ASSERT(IsTypedObjectClass(objClass));
expectedClass = GetOutlineTypedObjectClass(IsOpaqueTypedObjectClass(objClass));
}
const TypedProto *expectedProto = derivedPrediction.getKnownPrototype();
MOZ_ASSERT_IF(expectedClass, IsTypedObjectClass(expectedClass));