Commit 0c23ece0 authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Backed out changeset 9108c50863b3 (bug 1343723) for SM test failures.

parent 7fe93c1f

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 Ok();

    return resumeAfter(ins);

}



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

    current->setEnvironmentChain(ins);



    return Ok();

    return resumeAfter(ins);

}



AbortReasonOr<Ok>

js/src/jit/MIR.h

+0 −8
Original line number Diff line number Diff line
@@ -11640,9 +11640,6 @@ 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
@@ -11670,11 +11667,6 @@ 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).