Index: src/ia32/full-codegen-ia32.cc |
=================================================================== |
--- src/ia32/full-codegen-ia32.cc (revision 9808) |
+++ src/ia32/full-codegen-ia32.cc (working copy) |
@@ -266,7 +266,10 @@ |
// constant. |
if (scope()->is_function_scope() && scope()->function() != NULL) { |
int ignored = 0; |
- EmitDeclaration(scope()->function(), CONST, NULL, &ignored); |
+ VariableProxy* proxy = scope()->function(); |
+ ASSERT(proxy->var()->mode() == CONST || |
+ proxy->var()->mode() == CONST_HARMONY); |
+ EmitDeclaration(proxy, proxy->var()->mode(), NULL, &ignored); |
} |
VisitDeclarations(scope()->declarations()); |
} |
@@ -711,6 +714,8 @@ |
// need to "declare" it at runtime to make sure it actually exists in the |
// local context. |
Variable* variable = proxy->var(); |
+ bool binding_needs_init = |
+ mode == CONST || mode == CONST_HARMONY || mode == LET; |
switch (variable->location()) { |
case Variable::UNALLOCATED: |
++(*global_count); |
@@ -722,7 +727,7 @@ |
Comment cmnt(masm_, "[ Declaration"); |
VisitForAccumulatorValue(function); |
__ mov(StackOperand(variable), result_register()); |
- } else if (mode == CONST || mode == LET) { |
+ } else if (binding_needs_init) { |
Comment cmnt(masm_, "[ Declaration"); |
__ mov(StackOperand(variable), |
Immediate(isolate()->factory()->the_hole_value())); |
@@ -754,7 +759,7 @@ |
EMIT_REMEMBERED_SET, |
OMIT_SMI_CHECK); |
PrepareForBailoutForId(proxy->id(), NO_REGISTERS); |
- } else if (mode == CONST || mode == LET) { |
+ } else if (binding_needs_init) { |
Comment cmnt(masm_, "[ Declaration"); |
__ mov(ContextOperand(esi, variable->index()), |
Immediate(isolate()->factory()->the_hole_value())); |
@@ -767,9 +772,13 @@ |
Comment cmnt(masm_, "[ Declaration"); |
__ push(esi); |
__ push(Immediate(variable->name())); |
- // Declaration nodes are always introduced in one of three modes. |
- ASSERT(mode == VAR || mode == CONST || mode == LET); |
- PropertyAttributes attr = (mode == CONST) ? READ_ONLY : NONE; |
+ // Declaration nodes are always introduced in one of four modes. |
+ ASSERT(mode == VAR || |
+ mode == CONST || |
+ mode == CONST_HARMONY || |
+ mode == LET); |
+ PropertyAttributes attr = (mode == CONST || mode == CONST_HARMONY) |
+ ? READ_ONLY : NONE; |
__ push(Immediate(Smi::FromInt(attr))); |
// Push initial value, if any. |
// Note: For variables we must not push an initial value (such as |
@@ -778,7 +787,7 @@ |
increment_stack_height(3); |
if (function != NULL) { |
VisitForStackValue(function); |
- } else if (mode == CONST || mode == LET) { |
+ } else if (binding_needs_init) { |
__ push(Immediate(isolate()->factory()->the_hole_value())); |
increment_stack_height(); |
} else { |
@@ -920,11 +929,17 @@ |
__ push(eax); |
increment_stack_height(); |
+ // Check for proxies. |
+ Label call_runtime; |
+ STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_SPEC_OBJECT_TYPE); |
+ __ CmpObjectType(eax, LAST_JS_PROXY_TYPE, ecx); |
+ __ j(below_equal, &call_runtime); |
+ |
// Check cache validity in generated code. This is a fast case for |
// the JSObject::IsSimpleEnum cache validity checks. If we cannot |
// guarantee cache validity, call the runtime system to check cache |
// validity or get the property names in a fixed array. |
- Label next, call_runtime; |
+ Label next; |
__ mov(ecx, eax); |
__ bind(&next); |
@@ -995,9 +1010,17 @@ |
__ jmp(&loop); |
// We got a fixed array in register eax. Iterate through that. |
+ Label non_proxy; |
__ bind(&fixed_array); |
- __ push(Immediate(Smi::FromInt(0))); // Map (0) - force slow check. |
- __ push(eax); |
+ __ mov(ebx, Immediate(Smi::FromInt(1))); // Smi indicates slow check |
+ __ mov(ecx, Operand(esp, 0 * kPointerSize)); // Get enumerated object |
+ STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_SPEC_OBJECT_TYPE); |
+ __ CmpObjectType(ecx, LAST_JS_PROXY_TYPE, ecx); |
+ __ j(above, &non_proxy); |
+ __ mov(ebx, Immediate(Smi::FromInt(0))); // Zero indicates proxy |
+ __ bind(&non_proxy); |
+ __ push(ebx); // Smi |
+ __ push(eax); // Array |
__ mov(eax, FieldOperand(eax, FixedArray::kLengthOffset)); |
__ push(eax); // Fixed array length (as smi). |
__ push(Immediate(Smi::FromInt(0))); // Initial index. |
@@ -1014,17 +1037,23 @@ |
__ mov(ebx, Operand(esp, 2 * kPointerSize)); |
__ mov(ebx, FieldOperand(ebx, eax, times_2, FixedArray::kHeaderSize)); |
- // Get the expected map from the stack or a zero map in the |
+ // Get the expected map from the stack or a smi in the |
// permanent slow case into register edx. |
__ mov(edx, Operand(esp, 3 * kPointerSize)); |
// Check if the expected map still matches that of the enumerable. |
- // If not, we have to filter the key. |
+ // If not, we may have to filter the key. |
Label update_each; |
__ mov(ecx, Operand(esp, 4 * kPointerSize)); |
__ cmp(edx, FieldOperand(ecx, HeapObject::kMapOffset)); |
__ j(equal, &update_each, Label::kNear); |
+ // For proxies, no filtering is done. |
+ // TODO(rossberg): What if only a prototype is a proxy? Not specified yet. |
+ ASSERT(Smi::FromInt(0) == 0); |
+ __ test(edx, edx); |
+ __ j(zero, &update_each); |
+ |
// Convert the entry to a string or null if it isn't a property |
// anymore. If the property has been removed while iterating, we |
// just skip it. |
@@ -1079,7 +1108,7 @@ |
!pretenure && |
scope()->is_function_scope() && |
info->num_literals() == 0) { |
- FastNewClosureStub stub(info->strict_mode() ? kStrictMode : kNonStrictMode); |
+ FastNewClosureStub stub(info->strict_mode_flag()); |
__ push(Immediate(info)); |
__ CallStub(&stub); |
} else { |
@@ -1109,7 +1138,7 @@ |
Scope* s = scope(); |
while (s != NULL) { |
if (s->num_heap_slots() > 0) { |
- if (s->calls_eval()) { |
+ if (s->calls_non_strict_eval()) { |
// Check that extension is NULL. |
__ cmp(ContextOperand(context, Context::EXTENSION_INDEX), |
Immediate(0)); |
@@ -1123,7 +1152,7 @@ |
// If no outer scope calls eval, we do not need to check more |
// context extensions. If we have reached an eval scope, we check |
// all extensions from this point. |
- if (!s->outer_scope_calls_eval() || s->is_eval_scope()) break; |
+ if (!s->outer_scope_calls_non_strict_eval() || s->is_eval_scope()) break; |
s = s->outer_scope(); |
} |
@@ -1168,7 +1197,7 @@ |
for (Scope* s = scope(); s != var->scope(); s = s->outer_scope()) { |
if (s->num_heap_slots() > 0) { |
- if (s->calls_eval()) { |
+ if (s->calls_non_strict_eval()) { |
// Check that extension is NULL. |
__ cmp(ContextOperand(context, Context::EXTENSION_INDEX), |
Immediate(0)); |
@@ -1206,12 +1235,13 @@ |
Variable* local = var->local_if_not_shadowed(); |
__ mov(eax, ContextSlotOperandCheckExtensions(local, slow)); |
if (local->mode() == CONST || |
+ local->mode() == CONST_HARMONY || |
local->mode() == LET) { |
__ cmp(eax, isolate()->factory()->the_hole_value()); |
__ j(not_equal, done); |
if (local->mode() == CONST) { |
__ mov(eax, isolate()->factory()->undefined_value()); |
- } else { // LET |
+ } else { // LET || CONST_HARMONY |
__ push(Immediate(var->name())); |
__ CallRuntime(Runtime::kThrowReferenceError, 1); |
} |
@@ -1247,7 +1277,7 @@ |
Comment cmnt(masm_, var->IsContextSlot() |
? "Context variable" |
: "Stack variable"); |
- if (var->mode() != LET && var->mode() != CONST) { |
+ if (!var->binding_needs_init()) { |
context()->Plug(var); |
} else { |
// Let and const need a read barrier. |
@@ -1255,10 +1285,14 @@ |
GetVar(eax, var); |
__ cmp(eax, isolate()->factory()->the_hole_value()); |
__ j(not_equal, &done, Label::kNear); |
- if (var->mode() == LET) { |
+ if (var->mode() == LET || var->mode() == CONST_HARMONY) { |
+ // Throw a reference error when using an uninitialized let/const |
+ // binding in harmony mode. |
__ push(Immediate(var->name())); |
__ CallRuntime(Runtime::kThrowReferenceError, 1); |
- } else { // CONST |
+ } else { |
+ // Uninitalized const bindings outside of harmony mode are unholed. |
+ ASSERT(var->mode() == CONST); |
__ mov(eax, isolate()->factory()->undefined_value()); |
} |
__ bind(&done); |
@@ -1448,12 +1482,18 @@ |
ZoneList<Expression*>* subexprs = expr->values(); |
int length = subexprs->length(); |
+ Handle<FixedArray> constant_elements = expr->constant_elements(); |
+ ASSERT_EQ(2, constant_elements->length()); |
+ ElementsKind constant_elements_kind = |
+ static_cast<ElementsKind>(Smi::cast(constant_elements->get(0))->value()); |
+ Handle<FixedArrayBase> constant_elements_values( |
+ FixedArrayBase::cast(constant_elements->get(1))); |
__ mov(ebx, Operand(ebp, JavaScriptFrameConstants::kFunctionOffset)); |
__ push(FieldOperand(ebx, JSFunction::kLiteralsOffset)); |
__ push(Immediate(Smi::FromInt(expr->literal_index()))); |
- __ push(Immediate(expr->constant_elements())); |
- if (expr->constant_elements()->map() == |
+ __ push(Immediate(constant_elements)); |
+ if (constant_elements_values->map() == |
isolate()->heap()->fixed_cow_array_map()) { |
ASSERT(expr->depth() == 1); |
FastCloneShallowArrayStub stub( |
@@ -1465,8 +1505,14 @@ |
} else if (length > FastCloneShallowArrayStub::kMaximumClonedLength) { |
__ CallRuntime(Runtime::kCreateArrayLiteralShallow, 3); |
} else { |
- FastCloneShallowArrayStub stub( |
- FastCloneShallowArrayStub::CLONE_ELEMENTS, length); |
+ ASSERT(constant_elements_kind == FAST_ELEMENTS || |
+ constant_elements_kind == FAST_SMI_ONLY_ELEMENTS || |
+ FLAG_smi_only_arrays); |
+ FastCloneShallowArrayStub::Mode mode = |
+ constant_elements_kind == FAST_DOUBLE_ELEMENTS |
+ ? FastCloneShallowArrayStub::CLONE_DOUBLE_ELEMENTS |
+ : FastCloneShallowArrayStub::CLONE_ELEMENTS; |
+ FastCloneShallowArrayStub stub(mode, length); |
__ CallStub(&stub); |
} |
@@ -1492,23 +1538,62 @@ |
// Store the subexpression value in the array's elements. |
__ mov(ebx, Operand(esp, 0)); // Copy of array literal. |
+ __ mov(edi, FieldOperand(ebx, JSObject::kMapOffset)); |
__ mov(ebx, FieldOperand(ebx, JSObject::kElementsOffset)); |
int offset = FixedArray::kHeaderSize + (i * kPointerSize); |
+ |
+ Label element_done; |
+ Label double_elements; |
+ Label smi_element; |
+ Label slow_elements; |
+ Label fast_elements; |
+ __ CheckFastElements(edi, &double_elements); |
+ |
+ // FAST_SMI_ONLY_ELEMENTS or FAST_ELEMENTS |
+ __ JumpIfSmi(result_register(), &smi_element); |
+ __ CheckFastSmiOnlyElements(edi, &fast_elements, Label::kNear); |
+ |
+ // Store into the array literal requires a elements transition. Call into |
+ // the runtime. |
+ __ bind(&slow_elements); |
+ __ push(Operand(esp, 0)); // Copy of array literal. |
+ __ push(Immediate(Smi::FromInt(i))); |
+ __ push(result_register()); |
+ __ push(Immediate(Smi::FromInt(NONE))); // PropertyAttributes |
+ __ push(Immediate(Smi::FromInt(strict_mode_flag()))); // Strict mode. |
+ __ CallRuntime(Runtime::kSetProperty, 5); |
+ __ jmp(&element_done); |
+ |
+ // Array literal has ElementsKind of FAST_DOUBLE_ELEMENTS. |
+ __ bind(&double_elements); |
+ __ mov(ecx, Immediate(Smi::FromInt(i))); |
+ __ StoreNumberToDoubleElements(result_register(), |
+ ebx, |
+ ecx, |
+ edx, |
+ xmm0, |
+ &slow_elements, |
+ false); |
+ __ jmp(&element_done); |
+ |
+ // Array literal has ElementsKind of FAST_ELEMENTS and value is an object. |
+ __ bind(&fast_elements); |
__ mov(FieldOperand(ebx, offset), result_register()); |
- |
- Label no_map_change; |
- __ JumpIfSmi(result_register(), &no_map_change); |
// Update the write barrier for the array store. |
__ RecordWriteField(ebx, offset, result_register(), ecx, |
kDontSaveFPRegs, |
EMIT_REMEMBERED_SET, |
OMIT_SMI_CHECK); |
- __ mov(edi, FieldOperand(ebx, JSObject::kMapOffset)); |
- __ CheckFastSmiOnlyElements(edi, &no_map_change, Label::kNear); |
- __ push(Operand(esp, 0)); |
- __ CallRuntime(Runtime::kNonSmiElementStored, 1); |
- __ bind(&no_map_change); |
+ __ jmp(&element_done); |
+ // Array literal has ElementsKind of FAST_SMI_ONLY_ELEMENTS or |
+ // FAST_ELEMENTS, and value is Smi. |
+ __ bind(&smi_element); |
+ __ mov(FieldOperand(ebx, offset), result_register()); |
+ // Fall through |
+ |
+ __ bind(&element_done); |
+ |
PrepareForBailoutForId(expr->GetIdForElement(i), NO_REGISTERS); |
} |
@@ -1890,8 +1975,9 @@ |
} |
} |
- } else if (var->mode() != CONST) { |
- // Assignment to var or initializing assignment to let. |
+ } else if (!var->is_const_mode() || op == Token::INIT_CONST_HARMONY) { |
+ // Assignment to var or initializing assignment to let/const |
+ // in harmony mode. |
if (var->IsStackAllocated() || var->IsContextSlot()) { |
MemOperand location = VarOperand(var, ecx); |
if (FLAG_debug_code && op == Token::INIT_LET) { |
@@ -2104,7 +2190,7 @@ |
flags = static_cast<CallFunctionFlags>(flags | RECORD_CALL_TARGET); |
} |
CallFunctionStub stub(arg_count, flags); |
- __ CallStub(&stub); |
+ __ CallStub(&stub, expr->id()); |
if (record_call_target) { |
// There is a one element cache in the instruction stream. |
#ifdef DEBUG |
@@ -2781,9 +2867,10 @@ |
__ bind(&heapnumber_allocated); |
__ PrepareCallCFunction(1, ebx); |
- __ mov(Operand(esp, 0), Immediate(ExternalReference::isolate_address())); |
- __ CallCFunction(ExternalReference::random_uint32_function(isolate()), |
- 1); |
+ __ mov(eax, ContextOperand(context_register(), Context::GLOBAL_INDEX)); |
+ __ mov(eax, FieldOperand(eax, GlobalObject::kGlobalContextOffset)); |
+ __ mov(Operand(esp, 0), eax); |
+ __ CallCFunction(ExternalReference::random_uint32_function(isolate()), 1); |
// Convert 32 random bits in eax to 0.(32 random bits) in a double |
// by computing: |
@@ -4147,33 +4234,25 @@ |
case Token::EQ_STRICT: |
case Token::EQ: |
cc = equal; |
- __ pop(edx); |
break; |
case Token::LT: |
cc = less; |
- __ pop(edx); |
break; |
case Token::GT: |
- // Reverse left and right sizes to obtain ECMA-262 conversion order. |
- cc = less; |
- __ mov(edx, result_register()); |
- __ pop(eax); |
+ cc = greater; |
break; |
case Token::LTE: |
- // Reverse left and right sizes to obtain ECMA-262 conversion order. |
- cc = greater_equal; |
- __ mov(edx, result_register()); |
- __ pop(eax); |
+ cc = less_equal; |
break; |
case Token::GTE: |
cc = greater_equal; |
- __ pop(edx); |
break; |
case Token::IN: |
case Token::INSTANCEOF: |
default: |
UNREACHABLE(); |
} |
+ __ pop(edx); |
decrement_stack_height(); |
bool inline_smi_code = ShouldInlineSmiCase(op); |