mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changeset 2d35b006a2f6 (bug 1042729)
This commit is contained in:
parent
a8b0422efe
commit
c4e92b4d22
@ -10206,11 +10206,7 @@ class MNewDenseArrayPar : public MBinaryInstruction
|
|||||||
// A resume point contains the information needed to reconstruct the Baseline
|
// A resume point contains the information needed to reconstruct the Baseline
|
||||||
// state from a position in the JIT. See the big comment near resumeAfter() in
|
// state from a position in the JIT. See the big comment near resumeAfter() in
|
||||||
// IonBuilder.cpp.
|
// IonBuilder.cpp.
|
||||||
class MResumePoint MOZ_FINAL :
|
class MResumePoint MOZ_FINAL : public MNode, public InlineForwardListNode<MResumePoint>
|
||||||
public MNode
|
|
||||||
#ifdef DEBUG
|
|
||||||
, public InlineForwardListNode<MResumePoint>
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
enum Mode {
|
enum Mode {
|
||||||
|
@ -728,7 +728,6 @@ MBasicBlock::discardResumePoint(MResumePoint *rp, ReferencesType refType /* = Re
|
|||||||
{
|
{
|
||||||
if (refType & RefType_DiscardOperands)
|
if (refType & RefType_DiscardOperands)
|
||||||
rp->discardUses();
|
rp->discardUses();
|
||||||
#ifdef DEBUG
|
|
||||||
MResumePointIterator iter = resumePointsBegin();
|
MResumePointIterator iter = resumePointsBegin();
|
||||||
while (*iter != rp) {
|
while (*iter != rp) {
|
||||||
// We should reach it before reaching the end.
|
// We should reach it before reaching the end.
|
||||||
@ -736,7 +735,6 @@ MBasicBlock::discardResumePoint(MResumePoint *rp, ReferencesType refType /* = Re
|
|||||||
iter++;
|
iter++;
|
||||||
}
|
}
|
||||||
resumePoints_.removeAt(iter);
|
resumePoints_.removeAt(iter);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -27,10 +27,7 @@ class MDefinitionIterator;
|
|||||||
typedef InlineListIterator<MInstruction> MInstructionIterator;
|
typedef InlineListIterator<MInstruction> MInstructionIterator;
|
||||||
typedef InlineListReverseIterator<MInstruction> MInstructionReverseIterator;
|
typedef InlineListReverseIterator<MInstruction> MInstructionReverseIterator;
|
||||||
typedef InlineListIterator<MPhi> MPhiIterator;
|
typedef InlineListIterator<MPhi> MPhiIterator;
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
typedef InlineForwardListIterator<MResumePoint> MResumePointIterator;
|
typedef InlineForwardListIterator<MResumePoint> MResumePointIterator;
|
||||||
#endif
|
|
||||||
|
|
||||||
class LBlock;
|
class LBlock;
|
||||||
|
|
||||||
@ -187,9 +184,7 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
|
|||||||
|
|
||||||
// Adds a resume point to this block.
|
// Adds a resume point to this block.
|
||||||
void addResumePoint(MResumePoint *resume) {
|
void addResumePoint(MResumePoint *resume) {
|
||||||
#ifdef DEBUG
|
|
||||||
resumePoints_.pushFront(resume);
|
resumePoints_.pushFront(resume);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Discard pre-allocated resume point.
|
// Discard pre-allocated resume point.
|
||||||
@ -346,7 +341,6 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
|
|||||||
bool phisEmpty() const {
|
bool phisEmpty() const {
|
||||||
return phis_.empty();
|
return phis_.empty();
|
||||||
}
|
}
|
||||||
#ifdef DEBUG
|
|
||||||
MResumePointIterator resumePointsBegin() const {
|
MResumePointIterator resumePointsBegin() const {
|
||||||
return resumePoints_.begin();
|
return resumePoints_.begin();
|
||||||
}
|
}
|
||||||
@ -356,7 +350,6 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
|
|||||||
bool resumePointsEmpty() const {
|
bool resumePointsEmpty() const {
|
||||||
return resumePoints_.empty();
|
return resumePoints_.empty();
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
MInstructionIterator begin() {
|
MInstructionIterator begin() {
|
||||||
return instructions_.begin();
|
return instructions_.begin();
|
||||||
}
|
}
|
||||||
@ -569,6 +562,7 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
|
|||||||
InlineList<MInstruction> instructions_;
|
InlineList<MInstruction> instructions_;
|
||||||
Vector<MBasicBlock *, 1, IonAllocPolicy> predecessors_;
|
Vector<MBasicBlock *, 1, IonAllocPolicy> predecessors_;
|
||||||
InlineList<MPhi> phis_;
|
InlineList<MPhi> phis_;
|
||||||
|
InlineForwardList<MResumePoint> resumePoints_;
|
||||||
FixedList<MDefinition *> slots_;
|
FixedList<MDefinition *> slots_;
|
||||||
uint32_t stackPosition_;
|
uint32_t stackPosition_;
|
||||||
uint32_t id_;
|
uint32_t id_;
|
||||||
@ -585,12 +579,6 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
|
|||||||
// beginning of the call-site which is being inlined after this block.
|
// beginning of the call-site which is being inlined after this block.
|
||||||
MResumePoint *outerResumePoint_;
|
MResumePoint *outerResumePoint_;
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
// Unordered list used to verify that all the resume points which are
|
|
||||||
// registered are correctly removed when a basic block is removed.
|
|
||||||
InlineForwardList<MResumePoint> resumePoints_;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
MBasicBlock *successorWithPhis_;
|
MBasicBlock *successorWithPhis_;
|
||||||
uint32_t positionInPhiSuccessor_;
|
uint32_t positionInPhiSuccessor_;
|
||||||
uint32_t loopDepth_;
|
uint32_t loopDepth_;
|
||||||
|
Loading…
Reference in New Issue
Block a user