| commit | 833cdd78f8ada3166f25f39ab88e9ce0096f81ac | [log] [tgz] |
|---|---|---|
| author | sgjesse@chromium.org <sgjesse@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00> | Fri Feb 26 10:06:16 2010 +0000 |
| committer | sgjesse@chromium.org <sgjesse@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00> | Fri Feb 26 10:06:16 2010 +0000 |
| tree | 2ffdeed95212a5c7d59d5c6d3f421e390c0303a1 | |
| parent | 534ae57472cf18f03cf14e138f13c2cbcd1d4fc2 [diff] [blame] |
Merge r3962 to trunk BUG=http://crbug.com/36807 TEST=none Review URL: http://codereview.chromium.org/661171 git-svn-id: http://v8.googlecode.com/svn/trunk@3963 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc index 95c50f2..6644d02 100644 --- a/src/arm/codegen-arm.cc +++ b/src/arm/codegen-arm.cc
@@ -35,7 +35,7 @@ #include "register-allocator-inl.h" #include "runtime.h" #include "scopes.h" - +#include "virtual-frame-inl.h" namespace v8 { namespace internal { @@ -133,9 +133,6 @@ } -Scope* CodeGenerator::scope() { return info_->function()->scope(); } - - // Calling conventions: // fp: caller's frame pointer // sp: stack pointer