| Index: src/ia32/full-codegen-ia32.cc
 | 
| diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
 | 
| index f0ee7f4b2c1d63ca888193ca7f33f13c0e325ea6..777ec6891f76d340a02e1321245e977b4b4bf51e 100644
 | 
| --- a/src/ia32/full-codegen-ia32.cc
 | 
| +++ b/src/ia32/full-codegen-ia32.cc
 | 
| @@ -114,7 +114,7 @@ void FullCodeGenerator::Generate() {
 | 
|    // Sloppy mode functions and builtins need to replace the receiver with the
 | 
|    // global proxy when called as functions (without an explicit receiver
 | 
|    // object).
 | 
| -  if (info->strict_mode() == SLOPPY && !info->is_native()) {
 | 
| +  if (is_sloppy(info->language_mode()) && !info->is_native()) {
 | 
|      Label ok;
 | 
|      // +1 for return address.
 | 
|      int receiver_offset = (info->scope()->num_parameters() + 1) * kPointerSize;
 | 
| @@ -257,7 +257,7 @@ void FullCodeGenerator::Generate() {
 | 
|      // The stub will rewrite receiver and parameter count if the previous
 | 
|      // stack frame was an arguments adapter frame.
 | 
|      ArgumentsAccessStub::Type type;
 | 
| -    if (strict_mode() == STRICT) {
 | 
| +    if (is_strict(language_mode())) {
 | 
|        type = ArgumentsAccessStub::NEW_STRICT;
 | 
|      } else if (function()->has_duplicate_parameters()) {
 | 
|        type = ArgumentsAccessStub::NEW_SLOPPY_SLOW;
 | 
| @@ -1222,7 +1222,7 @@ void FullCodeGenerator::EmitNewClosure(Handle<SharedFunctionInfo> info,
 | 
|        !pretenure &&
 | 
|        scope()->is_function_scope() &&
 | 
|        info->num_literals() == 0) {
 | 
| -    FastNewClosureStub stub(isolate(), info->strict_mode(), info->kind());
 | 
| +    FastNewClosureStub stub(isolate(), info->language_mode(), info->kind());
 | 
|      __ mov(ebx, Immediate(info));
 | 
|      __ CallStub(&stub);
 | 
|    } else {
 | 
| @@ -1669,7 +1669,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
 | 
|          VisitForStackValue(value);
 | 
|          if (property->emit_store()) {
 | 
|            EmitSetHomeObjectIfNeeded(value, 2);
 | 
| -          __ push(Immediate(Smi::FromInt(SLOPPY)));  // Strict mode
 | 
| +          __ push(Immediate(Smi::FromInt(SLOPPY)));  // Language mode
 | 
|            __ CallRuntime(Runtime::kSetProperty, 4);
 | 
|          } else {
 | 
|            __ Drop(3);
 | 
| @@ -2572,7 +2572,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) {
 | 
|        __ pop(StoreDescriptor::ReceiverRegister());  // Receiver.
 | 
|        __ pop(StoreDescriptor::ValueRegister());     // Restore value.
 | 
|        Handle<Code> ic =
 | 
| -          CodeFactory::KeyedStoreIC(isolate(), strict_mode()).code();
 | 
| +          CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();
 | 
|        CallIC(ic);
 | 
|        break;
 | 
|      }
 | 
| @@ -2638,7 +2638,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var,
 | 
|        __ push(eax);  // Value.
 | 
|        __ push(esi);  // Context.
 | 
|        __ push(Immediate(var->name()));
 | 
| -      __ push(Immediate(Smi::FromInt(strict_mode())));
 | 
| +      __ push(Immediate(Smi::FromInt(language_mode())));
 | 
|        __ CallRuntime(Runtime::kStoreLookupSlot, 4);
 | 
|      } else {
 | 
|        // Assignment to var or initializing assignment to let/const in harmony
 | 
| @@ -2653,7 +2653,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var,
 | 
|        }
 | 
|        EmitStoreToStackLocalOrContextSlot(var, location);
 | 
|      }
 | 
| -  } else if (IsSignallingAssignmentToConst(var, op, strict_mode())) {
 | 
| +  } else if (IsSignallingAssignmentToConst(var, op, language_mode())) {
 | 
|      __ CallRuntime(Runtime::kThrowConstAssignError, 0);
 | 
|    }
 | 
|  }
 | 
| @@ -2688,8 +2688,8 @@ void FullCodeGenerator::EmitNamedSuperPropertyStore(Property* prop) {
 | 
|  
 | 
|    __ push(Immediate(key->value()));
 | 
|    __ push(eax);
 | 
| -  __ CallRuntime((strict_mode() == STRICT ? Runtime::kStoreToSuper_Strict
 | 
| -                                          : Runtime::kStoreToSuper_Sloppy),
 | 
| +  __ CallRuntime((is_strict(language_mode()) ? Runtime::kStoreToSuper_Strict
 | 
| +                                             : Runtime::kStoreToSuper_Sloppy),
 | 
|                   4);
 | 
|  }
 | 
|  
 | 
| @@ -2700,9 +2700,10 @@ void FullCodeGenerator::EmitKeyedSuperPropertyStore(Property* prop) {
 | 
|    // stack : receiver ('this'), home_object, key
 | 
|  
 | 
|    __ push(eax);
 | 
| -  __ CallRuntime((strict_mode() == STRICT ? Runtime::kStoreKeyedToSuper_Strict
 | 
| -                                          : Runtime::kStoreKeyedToSuper_Sloppy),
 | 
| -                 4);
 | 
| +  __ CallRuntime(
 | 
| +      (is_strict(language_mode()) ? Runtime::kStoreKeyedToSuper_Strict
 | 
| +                                  : Runtime::kStoreKeyedToSuper_Sloppy),
 | 
| +      4);
 | 
|  }
 | 
|  
 | 
|  
 | 
| @@ -2717,7 +2718,8 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) {
 | 
|    DCHECK(StoreDescriptor::ValueRegister().is(eax));
 | 
|    // Record source code position before IC call.
 | 
|    SetSourcePosition(expr->position());
 | 
| -  Handle<Code> ic = CodeFactory::KeyedStoreIC(isolate(), strict_mode()).code();
 | 
| +  Handle<Code> ic =
 | 
| +      CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();
 | 
|    CallIC(ic, expr->AssignmentFeedbackId());
 | 
|  
 | 
|    PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
 | 
| @@ -2932,7 +2934,7 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
 | 
|    // Push the receiver of the enclosing function.
 | 
|    __ push(Operand(ebp, (2 + info_->scope()->num_parameters()) * kPointerSize));
 | 
|    // Push the language mode.
 | 
| -  __ push(Immediate(Smi::FromInt(strict_mode())));
 | 
| +  __ push(Immediate(Smi::FromInt(language_mode())));
 | 
|  
 | 
|    // Push the start position of the scope the calls resides in.
 | 
|    __ push(Immediate(Smi::FromInt(scope()->start_position())));
 | 
| @@ -4504,14 +4506,14 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) {
 | 
|        if (property != NULL) {
 | 
|          VisitForStackValue(property->obj());
 | 
|          VisitForStackValue(property->key());
 | 
| -        __ push(Immediate(Smi::FromInt(strict_mode())));
 | 
| +        __ push(Immediate(Smi::FromInt(language_mode())));
 | 
|          __ InvokeBuiltin(Builtins::DELETE, CALL_FUNCTION);
 | 
|          context()->Plug(eax);
 | 
|        } else if (proxy != NULL) {
 | 
|          Variable* var = proxy->var();
 | 
|          // Delete of an unqualified identifier is disallowed in strict mode
 | 
|          // but "delete this" is allowed.
 | 
| -        DCHECK(strict_mode() == SLOPPY || var->is_this());
 | 
| +        DCHECK(is_sloppy(language_mode()) || var->is_this());
 | 
|          if (var->IsUnallocated()) {
 | 
|            __ push(GlobalObjectOperand());
 | 
|            __ push(Immediate(var->name()));
 | 
| @@ -4838,7 +4840,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
 | 
|        __ pop(StoreDescriptor::NameRegister());
 | 
|        __ pop(StoreDescriptor::ReceiverRegister());
 | 
|        Handle<Code> ic =
 | 
| -          CodeFactory::KeyedStoreIC(isolate(), strict_mode()).code();
 | 
| +          CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();
 | 
|        CallIC(ic, expr->CountStoreFeedbackId());
 | 
|        PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
 | 
|        if (expr->is_postfix()) {
 | 
| 
 |