| Index: src/x64/virtual-frame-x64.cc
|
| ===================================================================
|
| --- src/x64/virtual-frame-x64.cc (revision 4259)
|
| +++ src/x64/virtual-frame-x64.cc (working copy)
|
| @@ -177,7 +177,7 @@
|
| }
|
|
|
|
|
| -void VirtualFrame::EmitPush(Register reg, NumberInfo info) {
|
| +void VirtualFrame::EmitPush(Register reg, TypeInfo info) {
|
| ASSERT(stack_pointer_ == element_count() - 1);
|
| elements_.Add(FrameElement::MemoryElement(info));
|
| stack_pointer_++;
|
| @@ -185,7 +185,7 @@
|
| }
|
|
|
|
|
| -void VirtualFrame::EmitPush(const Operand& operand, NumberInfo info) {
|
| +void VirtualFrame::EmitPush(const Operand& operand, TypeInfo info) {
|
| ASSERT(stack_pointer_ == element_count() - 1);
|
| elements_.Add(FrameElement::MemoryElement(info));
|
| stack_pointer_++;
|
| @@ -193,7 +193,7 @@
|
| }
|
|
|
|
|
| -void VirtualFrame::EmitPush(Immediate immediate, NumberInfo info) {
|
| +void VirtualFrame::EmitPush(Immediate immediate, TypeInfo info) {
|
| ASSERT(stack_pointer_ == element_count() - 1);
|
| elements_.Add(FrameElement::MemoryElement(info));
|
| stack_pointer_++;
|
| @@ -203,7 +203,7 @@
|
|
|
| void VirtualFrame::EmitPush(Smi* smi_value) {
|
| ASSERT(stack_pointer_ == element_count() - 1);
|
| - elements_.Add(FrameElement::MemoryElement(NumberInfo::Smi()));
|
| + elements_.Add(FrameElement::MemoryElement(TypeInfo::Smi()));
|
| stack_pointer_++;
|
| __ Push(smi_value);
|
| }
|
| @@ -211,14 +211,14 @@
|
|
|
| void VirtualFrame::EmitPush(Handle<Object> value) {
|
| ASSERT(stack_pointer_ == element_count() - 1);
|
| - NumberInfo info = NumberInfo::TypeFromValue(value);
|
| + TypeInfo info = TypeInfo::TypeFromValue(value);
|
| elements_.Add(FrameElement::MemoryElement(info));
|
| stack_pointer_++;
|
| __ Push(value);
|
| }
|
|
|
|
|
| -void VirtualFrame::EmitPush(Heap::RootListIndex index, NumberInfo info) {
|
| +void VirtualFrame::EmitPush(Heap::RootListIndex index, TypeInfo info) {
|
| ASSERT(stack_pointer_ == element_count() - 1);
|
| elements_.Add(FrameElement::MemoryElement(info));
|
| stack_pointer_++;
|
| @@ -292,12 +292,12 @@
|
| elements_[new_backing_index] =
|
| FrameElement::RegisterElement(backing_reg,
|
| FrameElement::SYNCED,
|
| - original.number_info());
|
| + original.type_info());
|
| } else {
|
| elements_[new_backing_index] =
|
| FrameElement::RegisterElement(backing_reg,
|
| FrameElement::NOT_SYNCED,
|
| - original.number_info());
|
| + original.type_info());
|
| }
|
| // Update the other copies.
|
| for (int i = new_backing_index + 1; i < element_count(); i++) {
|
| @@ -329,7 +329,7 @@
|
| FrameElement new_element =
|
| FrameElement::RegisterElement(fresh.reg(),
|
| FrameElement::NOT_SYNCED,
|
| - original.number_info());
|
| + original.type_info());
|
| Use(fresh.reg(), element_count());
|
| elements_.Add(new_element);
|
| __ movq(fresh.reg(), Operand(rbp, fp_relative(index)));
|
| @@ -475,7 +475,7 @@
|
| if (element.is_constant() || element.is_copy()) {
|
| if (element.is_synced()) {
|
| // Just spill.
|
| - elements_[i] = FrameElement::MemoryElement(NumberInfo::Unknown());
|
| + elements_[i] = FrameElement::MemoryElement(TypeInfo::Unknown());
|
| } else {
|
| // Allocate to a register.
|
| FrameElement backing_element; // Invalid if not a copy.
|
| @@ -487,7 +487,7 @@
|
| elements_[i] =
|
| FrameElement::RegisterElement(fresh.reg(),
|
| FrameElement::NOT_SYNCED,
|
| - NumberInfo::Unknown());
|
| + TypeInfo::Unknown());
|
| Use(fresh.reg(), i);
|
|
|
| // Emit a move.
|
| @@ -516,7 +516,7 @@
|
| // The copy flag is not relied on before the end of this loop,
|
| // including when registers are spilled.
|
| elements_[i].clear_copied();
|
| - elements_[i].set_number_info(NumberInfo::Unknown());
|
| + elements_[i].set_type_info(TypeInfo::Unknown());
|
| }
|
| }
|
| }
|
| @@ -723,11 +723,11 @@
|
| ASSERT(element.is_valid());
|
|
|
| // Get number type information of the result.
|
| - NumberInfo info;
|
| + TypeInfo info;
|
| if (!element.is_copy()) {
|
| - info = element.number_info();
|
| + info = element.type_info();
|
| } else {
|
| - info = elements_[element.index()].number_info();
|
| + info = elements_[element.index()].type_info();
|
| }
|
|
|
| bool pop_needed = (stack_pointer_ == index);
|
| @@ -737,7 +737,7 @@
|
| Result temp = cgen()->allocator()->Allocate();
|
| ASSERT(temp.is_valid());
|
| __ pop(temp.reg());
|
| - temp.set_number_info(info);
|
| + temp.set_type_info(info);
|
| return temp;
|
| }
|
|
|
| @@ -767,7 +767,7 @@
|
| FrameElement new_element =
|
| FrameElement::RegisterElement(temp.reg(),
|
| FrameElement::SYNCED,
|
| - element.number_info());
|
| + element.type_info());
|
| // Preserve the copy flag on the element.
|
| if (element.is_copied()) new_element.set_copied();
|
| elements_[index] = new_element;
|
|
|