Reviewers: Kevin Millikin, Description: Push V8 r1767 to trunk. This fixes a problem in the string type inference code that is hit by lala.com.
Please review this at http://codereview.chromium.org/92010 SVN Base: http://v8.googlecode.com/svn/trunk/ Affected files: M src/api.cc M src/virtual-frame-ia32.cc M src/virtual-frame.cc A test/mjsunit/regress/regress-318.js Index: test/mjsunit/regress/regress-318.js =================================================================== --- test/mjsunit/regress/regress-318.js (revision 0) +++ test/mjsunit/regress/regress-318.js (revision 1761) @@ -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. + +// Should not raise an exception. + +function test(value) { + if (typeof(value) == 'boolean') value = value + ''; + if (typeof(value) == 'number') value = value + ''; +} + +assertDoesNotThrow(test(0)); Index: src/api.cc =================================================================== --- src/api.cc (revision 1765) +++ src/api.cc (working copy) @@ -2373,7 +2373,7 @@ const char* v8::V8::GetVersion() { - return "1.1.10.3"; + return "1.1.10.4"; } Index: src/virtual-frame-ia32.cc =================================================================== --- src/virtual-frame-ia32.cc (revision 1761) +++ src/virtual-frame-ia32.cc (working copy) @@ -191,7 +191,6 @@ if (elements_[i].is_copy()) { elements_[elements_[i].index()].set_copied(); } - elements_[i].set_static_type(target.static_type()); } // Adjust the stack pointer downward if necessary. Index: src/virtual-frame.cc =================================================================== --- src/virtual-frame.cc (revision 1761) +++ src/virtual-frame.cc (working copy) @@ -297,6 +297,10 @@ if (elements_[i].is_copy()) { elements_[elements_[i].index()].set_copied(); } + + // No code needs to be generated to change the static type of an + // element. + elements_[i].set_static_type(target.static_type()); } } --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
