Revision: 3430 Author: [email protected] Date: Mon Dec 7 07:10:39 2009 Log: Adding ThisFunction expression to top-level compiler.
Review URL: http://codereview.chromium.org/466056 http://code.google.com/p/v8/source/detail?r=3430 Added: /branches/bleeding_edge/test/mjsunit/compiler/thisfunction.js Modified: /branches/bleeding_edge/src/arm/fast-codegen-arm.cc /branches/bleeding_edge/src/compiler.cc /branches/bleeding_edge/src/fast-codegen.cc /branches/bleeding_edge/src/ia32/fast-codegen-ia32.cc /branches/bleeding_edge/src/x64/fast-codegen-x64.cc ======================================= --- /dev/null +++ /branches/bleeding_edge/test/mjsunit/compiler/thisfunction.js Mon Dec 7 07:10:39 2009 @@ -0,0 +1,35 @@ +// 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); ======================================= --- /branches/bleeding_edge/src/arm/fast-codegen-arm.cc Mon Dec 7 05:31:47 2009 +++ /branches/bleeding_edge/src/arm/fast-codegen-arm.cc Mon Dec 7 07:10:39 2009 @@ -1695,6 +1695,11 @@ false_label_ = saved_false; // 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 __ ======================================= --- /branches/bleeding_edge/src/compiler.cc Mon Dec 7 05:31:47 2009 +++ /branches/bleeding_edge/src/compiler.cc Mon Dec 7 07:10:39 2009 @@ -596,7 +596,7 @@ Slot* slot = scope->parameter(i)->slot(); if (slot != NULL && slot->type() == Slot::CONTEXT) { if (FLAG_trace_bailout) { - PrintF("function has context-allocated parameters"); + PrintF("Function has context-allocated parameters.\n"); } return NORMAL; } @@ -1123,7 +1123,7 @@ void CodeGenSelector::VisitThisFunction(ThisFunction* expr) { - BAILOUT("ThisFunction"); + // ThisFunction is supported. } #undef BAILOUT ======================================= --- /branches/bleeding_edge/src/fast-codegen.cc Fri Dec 4 06:30:27 2009 +++ /branches/bleeding_edge/src/fast-codegen.cc Mon Dec 7 07:10:39 2009 @@ -552,11 +552,6 @@ void FastCodeGenerator::VisitThrow(Throw* expr) { UNREACHABLE(); } - - -void FastCodeGenerator::VisitThisFunction(ThisFunction* expr) { - UNREACHABLE(); -} #undef __ ======================================= --- /branches/bleeding_edge/src/ia32/fast-codegen-ia32.cc Mon Dec 7 05:31:47 2009 +++ /branches/bleeding_edge/src/ia32/fast-codegen-ia32.cc Mon Dec 7 07:10:39 2009 @@ -1678,6 +1678,11 @@ } +void FastCodeGenerator::VisitThisFunction(ThisFunction* expr) { + __ mov(eax, Operand(ebp, JavaScriptFrameConstants::kFunctionOffset)); + Move(expr->context(), eax); +} + #undef __ ======================================= --- /branches/bleeding_edge/src/x64/fast-codegen-x64.cc Mon Dec 7 05:31:47 2009 +++ /branches/bleeding_edge/src/x64/fast-codegen-x64.cc Mon Dec 7 07:10:39 2009 @@ -1676,6 +1676,12 @@ false_label_ = saved_false; // Convert current context to test context: End post-test code. } + + +void FastCodeGenerator::VisitThisFunction(ThisFunction* expr) { + __ movq(rax, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset)); + Move(expr->context(), rax); +} #undef __ -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
