Commit 7fe93c1f authored by Ted Campbell's avatar Ted Campbell
Browse files

Bug 1343723 - ResumePoint not needed for MNewLexicalEnvironmentObject. r=jandem 

MozReview-Commit-ID: KNEhTjtKRiJ
parent f4b7ac79

js/src/jit/IonBuilder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -12063,7 +12063,7 @@ IonBuilder::jsop_pushlexicalenv(uint32_t index) 
    current->add(ins);

    current->setEnvironmentChain(ins);



    return resumeAfter(ins);

    return Ok();

}



AbortReasonOr<Ok>
@@ -12077,7 +12077,7 @@ IonBuilder::jsop_copylexicalenv(bool copySlots) 
    current->add(ins);

    current->setEnvironmentChain(ins);



    return resumeAfter(ins);

    return Ok();

}



AbortReasonOr<Ok>

js/src/jit/MIR.h

+8 −0
Original line number Diff line number Diff line
@@ -11640,6 +11640,9 @@ class MNewLexicalEnvironmentObject 
    bool appendRoots(MRootList& roots) const override {

        return roots.append(scope_);

    }

    AliasSet getAliasSet() const override {

        return AliasSet::None();

    }

};



// Allocate a new LexicalEnvironmentObject from existing one
@@ -11667,6 +11670,11 @@ class MCopyLexicalEnvironmentObject 
    bool possiblyCalls() const override {

        return true;

    }

    AliasSet getAliasSet() const override {

        return AliasSet::Load(AliasSet::ObjectFields |

                              AliasSet::FixedSlot |

                              AliasSet::DynamicSlot);

    }

};



// Store to vp[slot] (slots that are not inline in an object).