| Index: src/full-codegen/s390/full-codegen-s390.cc
|
| diff --git a/src/full-codegen/s390/full-codegen-s390.cc b/src/full-codegen/s390/full-codegen-s390.cc
|
| index 34de5c680a19bd922ef88f7373dcf9e82b949b8c..21d76d2327a684c7629bb4d1f1782db974d8f5fa 100644
|
| --- a/src/full-codegen/s390/full-codegen-s390.cc
|
| +++ b/src/full-codegen/s390/full-codegen-s390.cc
|
| @@ -454,6 +454,10 @@ void FullCodeGenerator::EmitReturnSequence() {
|
| }
|
| }
|
|
|
| +void FullCodeGenerator::RestoreContext() {
|
| + __ LoadP(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
|
| +}
|
| +
|
| void FullCodeGenerator::StackValueContext::Plug(Variable* var) const {
|
| DCHECK(var->IsStackAllocated() || var->IsContextSlot());
|
| codegen()->GetVar(result_register(), var);
|
| @@ -3623,7 +3627,7 @@ void FullCodeGenerator::VisitCompareOperation(CompareOperation* expr) {
|
| switch (op) {
|
| case Token::IN:
|
| VisitForStackValue(expr->right());
|
| - CallRuntimeWithOperands(Runtime::kHasProperty);
|
| + EmitInExpression();
|
| PrepareForBailoutBeforeSplit(expr, false, NULL, NULL);
|
| __ CompareRoot(r2, Heap::kTrueValueRootIndex);
|
| Split(eq, if_true, if_false, fall_through);
|
|
|