From 726aa859c60ca097e3b00daa3ff7383dd04c2281 Mon Sep 17 00:00:00 2001 From: olehougaard Date: Wed, 7 Jan 2009 09:58:58 +0000 Subject: [PATCH] Fix for issue 91 (http://code.google.com/p/v8/issues/detail?id=91) Review URL: http://codereview.chromium.org/17232 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1036 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/date-delay.js | 2 +- test/mjsunit/regress/regress-91.js | 38 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-91.js diff --git a/src/date-delay.js b/src/date-delay.js index bef1fb42a..0b7498289 100644 --- a/src/date-delay.js +++ b/src/date-delay.js @@ -957,7 +957,7 @@ function DateSetYear(year) { if ($isNaN(year)) return %_SetValueOf(this, $NaN); year = (0 <= TO_INTEGER(year) && TO_INTEGER(year) <= 99) ? 1900 + TO_INTEGER(year) : year; - var day = MakeDay(year, GetMonthFrom(this), GetDateFrom(this)); + var day = MakeDay(year, MonthFromTime(t), DateFromTime(t)); return %_SetValueOf(this, TimeClip(UTC(MakeDate(day, TimeWithinDay(t))))); } diff --git a/test/mjsunit/regress/regress-91.js b/test/mjsunit/regress/regress-91.js new file mode 100644 index 000000000..7f6263d91 --- /dev/null +++ b/test/mjsunit/regress/regress-91.js @@ -0,0 +1,38 @@ +// 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. + +var date = new Date(); +var year = date.getYear(); +date.setMilliseconds(Number.NaN); +date.setYear(1900 + year); +assertEquals(year, date.getYear()); +assertEquals(0, date.getMonth()); +assertEquals(1, date.getDate()); +assertEquals(0, date.getHours()); +assertEquals(0, date.getMinutes()); +assertEquals(0, date.getSeconds()); +assertEquals(0, date.getMilliseconds()); -- 2.34.1