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 2d35b006a2f6 (bug 1042729)

Browse Source
This commit is contained in:
Ed Morley 2014-08-05 13:33:17 +01:00
parent a8b0422efe
commit c4e92b4d22
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jit/MIR.h
View File

@ -10206,11 +10206,7 @@ class MNewDenseArrayPar : public MBinaryInstruction
// 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
// IonBuilder.cpp.
class MResumePoint MOZ_FINAL :
public MNode
#ifdef DEBUG
, public InlineForwardListNode<MResumePoint>
#endif
class MResumePoint MOZ_FINAL : public MNode, public InlineForwardListNode<MResumePoint>
{
public:
enum Mode {

2
js/src/jit/MIRGraph.cpp
View File

@ -728,7 +728,6 @@ MBasicBlock::discardResumePoint(MResumePoint *rp, ReferencesType refType /* = Re
{
if (refType & RefType_DiscardOperands)
rp->discardUses();
#ifdef DEBUG
MResumePointIterator iter = resumePointsBegin();
while (*iter != rp) {
// We should reach it before reaching the end.
@ -736,7 +735,6 @@ MBasicBlock::discardResumePoint(MResumePoint *rp, ReferencesType refType /* = Re
iter++;
}
resumePoints_.removeAt(iter);
#endif
}
void

14
js/src/jit/MIRGraph.h
View File

@ -27,10 +27,7 @@ class MDefinitionIterator;
typedef InlineListIterator<MInstruction> MInstructionIterator;
typedef InlineListReverseIterator<MInstruction> MInstructionReverseIterator;
typedef InlineListIterator<MPhi> MPhiIterator;
#ifdef DEBUG
typedef InlineForwardListIterator<MResumePoint> MResumePointIterator;
#endif
class LBlock;
@ -187,9 +184,7 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
// Adds a resume point to this block.
void addResumePoint(MResumePoint *resume) {
#ifdef DEBUG
resumePoints_.pushFront(resume);
#endif
}
// Discard pre-allocated resume point.
@ -346,7 +341,6 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
bool phisEmpty() const {
return phis_.empty();
}
#ifdef DEBUG
MResumePointIterator resumePointsBegin() const {
return resumePoints_.begin();
}
@ -356,7 +350,6 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
bool resumePointsEmpty() const {
return resumePoints_.empty();
}
#endif
MInstructionIterator begin() {
return instructions_.begin();
}
@ -569,6 +562,7 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
InlineList<MInstruction> instructions_;
Vector<MBasicBlock *, 1, IonAllocPolicy> predecessors_;
InlineList<MPhi> phis_;
InlineForwardList<MResumePoint> resumePoints_;
FixedList<MDefinition *> slots_;
uint32_t stackPosition_;
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.
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_;
uint32_t positionInPhiSuccessor_;
uint32_t loopDepth_;