Removed static type inference and add a dynamic test for string addition.

src/ia32/virtual-frame-ia32.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 200 matching lines @@
             // want it.
             if (!fresh.reg().is(backing_element.reg())) {
               __ mov(fresh.reg(), backing_element.reg());
             }
           } else {
             ASSERT(backing_element.is_memory());
             __ mov(fresh.reg(), Operand(ebp, fp_relative(element.index())));
           }
         }
       }
-      // No need to set the copied flag---there are no copies.
-
-      // Backwards jump targets can never know the type of a value.
-      elements_[i].set_static_type(StaticType::unknown());
+      // No need to set the copied flag---there are no copies of
+      // copies or constants so the original was not copied.

[Erik Corry, 2009/06/24 11:46:35]

Copies of copies?

[Lasse Reichstein, 2009/06/24 12:33:07]

Bad merge. I'll restore the original.

     } else {
       // Clear the copy flag of non-constant, non-copy elements.
       // They cannot be copied because copies are not allowed.
       // The copy flag is not relied on before the end of this loop,
       // including when registers are spilled.
       elements_[i].clear_copied();
     }
   }
 }
 
@@ skipping 757 matching lines @@
   FrameElement element = elements_.RemoveLast();
   int index = element_count();
   ASSERT(element.is_valid());
 
   bool pop_needed = (stack_pointer_ == index);
   if (pop_needed) {
     stack_pointer_--;
     if (element.is_memory()) {
       Result temp = cgen()->allocator()->Allocate();
       ASSERT(temp.is_valid());
-      temp.set_static_type(element.static_type());
       __ pop(temp.reg());
       return temp;
     }
 
     __ add(Operand(esp), Immediate(kPointerSize));
   }
   ASSERT(!element.is_memory());
 
   // The top element is a register, constant, or a copy.  Unuse
   // registers and follow copies to their backing store.
@@ skipping 11 matching lines @@
     // Memory elements could only be the backing store of a copy.
     // Allocate the original to a register.
     ASSERT(index <= stack_pointer_);
     Result temp = cgen()->allocator()->Allocate();
     ASSERT(temp.is_valid());
     Use(temp.reg(), index);
     FrameElement new_element =
         FrameElement::RegisterElement(temp.reg(), FrameElement::SYNCED);
     // Preserve the copy flag on the element.
     if (element.is_copied()) new_element.set_copied();
-    new_element.set_static_type(element.static_type());
     elements_[index] = new_element;
     __ mov(temp.reg(), Operand(ebp, fp_relative(index)));
-    return Result(temp.reg(), element.static_type());
+    return Result(temp.reg());
   } else if (element.is_register()) {
-    return Result(element.reg(), element.static_type());
+    return Result(element.reg());
   } else {
     ASSERT(element.is_constant());
     return Result(element.handle());
   }
 }
 
 
 void VirtualFrame::EmitPop(Register reg) {
   ASSERT(stack_pointer_ == element_count() - 1);
   stack_pointer_--;
@@ skipping 30 matching lines @@
   ASSERT(stack_pointer_ == element_count() - 1);
   elements_.Add(FrameElement::MemoryElement());
   stack_pointer_++;
   __ push(immediate);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal