Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(604)

Unified Diff: src/virtual-frame-ia32.cc

Issue 57052: * String type inference using compiler framework. (Closed)
Patch Set: Changes relative to head of bleeding edge (don't do diff with earlier versions) Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/virtual-frame-ia32.h ('k') | test/mjsunit/string-add.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/virtual-frame-ia32.cc
diff --git a/src/virtual-frame-ia32.cc b/src/virtual-frame-ia32.cc
index ed0d3d5b3d6ea319731a31ba4498e11547adc5af..067ecec6adb0fafe97aca9ef9e57ffbb2ea2aefe 100644
--- a/src/virtual-frame-ia32.cc
+++ b/src/virtual-frame-ia32.cc
@@ -191,9 +191,10 @@ void VirtualFrame::MergeTo(VirtualFrame* expected) {
if (elements_[i].is_copy()) {
elements_[elements_[i].index()].set_copied();
}
+ elements_[i].set_static_type(target.static_type());
}
- // Adjust the stack point downard if necessary.
+ // Adjust the stack pointer downward if necessary.
if (stack_pointer_ > expected->stack_pointer_) {
int difference = stack_pointer_ - expected->stack_pointer_;
stack_pointer_ = expected->stack_pointer_;
@@ -950,6 +951,7 @@ Result VirtualFrame::Pop() {
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;
}
@@ -981,11 +983,12 @@ Result VirtualFrame::Pop() {
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(), cgen_);
+ return Result(temp.reg(), cgen_, element.static_type());
} else if (element.is_register()) {
- return Result(element.reg(), cgen_);
+ return Result(element.reg(), cgen_, element.static_type());
} else {
ASSERT(element.is_constant());
return Result(element.handle(), cgen_);
« no previous file with comments | « src/virtual-frame-ia32.h ('k') | test/mjsunit/string-add.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698