Reviewers: Kevin Millikin, Description: Fix bug in optimized named function expressions on 3.4 branch.
This issue was fixed on bleeding edge as part of http://codereview.chromium.org/7776009 BUG=v8:1647 TEST=mjsunit/regress/regress-1647.js Please review this at http://codereview.chromium.org/7860033/ SVN Base: http://v8.googlecode.com/svn/branches/3.4/ Affected files: M src/hydrogen.cc M src/version.cc A test/mjsunit/regress/regress-1647.js Index: src/hydrogen.cc =================================================================== --- src/hydrogen.cc (revision 9206) +++ src/hydrogen.cc (working copy) @@ -2443,6 +2443,14 @@ graph()->SetArgumentsObject(object); environment()->Bind(scope->arguments(), object); } + // Handle implicit declaration of the function name in named function + // expressions before other declarations. + if (scope->is_function_scope() && scope->function() != NULL) { + if (!scope->function()->IsStackAllocated()) { + return Bailout("unsupported declaration"); + } + environment()->Bind(scope->function(), graph()->GetConstantHole()); + } } Index: src/version.cc =================================================================== --- src/version.cc (revision 9206) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 4 #define BUILD_NUMBER 14 -#define PATCH_LEVEL 19 +#define PATCH_LEVEL 20 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 Index: test/mjsunit/regress/regress-1647.js =================================================================== --- test/mjsunit/regress/regress-1647.js (revision 0) +++ test/mjsunit/regress/regress-1647.js (revision 0) @@ -0,0 +1,42 @@ +// Copyright 2011 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: --allow-natives-syntax + +// Test for correct deoptimization in named function expressions. + +var t = { foo: function() {} }; + +var f = (function bar() { + t.foo(); + assertEquals("function", typeof bar); +}); + +for (var i = 0; i < 10; i++) f(); +%OptimizeFunctionOnNextCall(f); +t.number = 2; +f(); Property changes on: test/mjsunit/regress/regress-1647.js ___________________________________________________________________ Added: svn:eol-style + LF -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
