Adding ThisFunction expression to top-level compiler.

Review URL: http://codereview.chromium.org/466056

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3430 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 0bf28222
...@@ -1696,6 +1696,11 @@ void FastCodeGenerator::VisitCompareOperation(CompareOperation* expr) { ...@@ -1696,6 +1696,11 @@ void FastCodeGenerator::VisitCompareOperation(CompareOperation* expr) {
// Convert current context to test context: End post-test code. // Convert current context to test context: End post-test code.
} }
void FastCodeGenerator::VisitThisFunction(ThisFunction* expr) {
__ ldr(r0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
Move(expr->context(), r0);
}
#undef __ #undef __
......
...@@ -596,7 +596,7 @@ CodeGenSelector::CodeGenTag CodeGenSelector::Select(FunctionLiteral* fun) { ...@@ -596,7 +596,7 @@ CodeGenSelector::CodeGenTag CodeGenSelector::Select(FunctionLiteral* fun) {
Slot* slot = scope->parameter(i)->slot(); Slot* slot = scope->parameter(i)->slot();
if (slot != NULL && slot->type() == Slot::CONTEXT) { if (slot != NULL && slot->type() == Slot::CONTEXT) {
if (FLAG_trace_bailout) { if (FLAG_trace_bailout) {
PrintF("function has context-allocated parameters"); PrintF("Function has context-allocated parameters.\n");
} }
return NORMAL; return NORMAL;
} }
...@@ -1123,7 +1123,7 @@ void CodeGenSelector::VisitCompareOperation(CompareOperation* expr) { ...@@ -1123,7 +1123,7 @@ void CodeGenSelector::VisitCompareOperation(CompareOperation* expr) {
void CodeGenSelector::VisitThisFunction(ThisFunction* expr) { void CodeGenSelector::VisitThisFunction(ThisFunction* expr) {
BAILOUT("ThisFunction"); // ThisFunction is supported.
} }
#undef BAILOUT #undef BAILOUT
......
...@@ -554,11 +554,6 @@ void FastCodeGenerator::VisitThrow(Throw* expr) { ...@@ -554,11 +554,6 @@ void FastCodeGenerator::VisitThrow(Throw* expr) {
} }
void FastCodeGenerator::VisitThisFunction(ThisFunction* expr) {
UNREACHABLE();
}
#undef __ #undef __
......
...@@ -1678,6 +1678,11 @@ void FastCodeGenerator::VisitCompareOperation(CompareOperation* expr) { ...@@ -1678,6 +1678,11 @@ void FastCodeGenerator::VisitCompareOperation(CompareOperation* expr) {
} }
void FastCodeGenerator::VisitThisFunction(ThisFunction* expr) {
__ mov(eax, Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
Move(expr->context(), eax);
}
#undef __ #undef __
......
...@@ -1678,6 +1678,12 @@ void FastCodeGenerator::VisitCompareOperation(CompareOperation* expr) { ...@@ -1678,6 +1678,12 @@ void FastCodeGenerator::VisitCompareOperation(CompareOperation* expr) {
} }
void FastCodeGenerator::VisitThisFunction(ThisFunction* expr) {
__ movq(rax, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset));
Move(expr->context(), rax);
}
#undef __ #undef __
......
// 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
// with the distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Flags: --always_fast_compiler
// Test reference to this-function.
var g = (function f(x) {
if (x == 1) return 42; else return f(1);
})(0);
assertEquals(42, g);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment