diff options
author | Ben Murdoch <benm@google.com> | 2012-05-21 11:52:46 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-21 11:52:46 -0700 |
commit | a52989282d6fb5ddd8b3a0aa23eff80ac25db913 (patch) | |
tree | 549bfed0eb32d8fd10c3e06691ce54a5d7bd035c | |
parent | f3a27c9df78913a0e322d7387d909275eac12519 (diff) | |
parent | 08f6c96fc894987f8ddd5e0c71466eeac4481fc3 (diff) | |
download | android_external_v8-a52989282d6fb5ddd8b3a0aa23eff80ac25db913.tar.gz android_external_v8-a52989282d6fb5ddd8b3a0aa23eff80ac25db913.tar.bz2 android_external_v8-a52989282d6fb5ddd8b3a0aa23eff80ac25db913.zip |
am 08f6c96f: am 84774f4b: Merge V8 at 3.9.24.25
* commit '08f6c96fc894987f8ddd5e0c71466eeac4481fc3':
Merge V8 at 3.9.24.25
-rw-r--r-- | V8_MERGE_REVISION | 4 | ||||
-rw-r--r-- | src/date.js | 3 | ||||
-rw-r--r-- | src/runtime.cc | 2 | ||||
-rw-r--r-- | src/version.cc | 2 | ||||
-rw-r--r-- | test/mjsunit/regress/regress-2027.js | 48 |
5 files changed, 53 insertions, 6 deletions
diff --git a/V8_MERGE_REVISION b/V8_MERGE_REVISION index 6787b735..35f9ea13 100644 --- a/V8_MERGE_REVISION +++ b/V8_MERGE_REVISION @@ -1,2 +1,2 @@ -V8 3.9.24.24 -http://v8.googlecode.com/svn/branches/3.9@11575 +V8 3.9.24.25 +http://v8.googlecode.com/svn/branches/3.9@11584 diff --git a/src/date.js b/src/date.js index 75edf6d3..d0e24abc 100644 --- a/src/date.js +++ b/src/date.js @@ -516,8 +516,7 @@ function DateSetMilliseconds(ms) { var t = LOCAL_DATE_VALUE(this); ms = ToNumber(ms); var time = MakeTime(LOCAL_HOUR(this), LOCAL_MIN(this), LOCAL_SEC(this), ms); - SET_LOCAL_DATE_VALUE(this, MakeDate(LOCAL_DAYS(this), time)); - return this; + return SET_LOCAL_DATE_VALUE(this, MakeDate(LOCAL_DAYS(this), time)); } diff --git a/src/runtime.cc b/src/runtime.cc index 77c1cd8d..6a24f988 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -7582,7 +7582,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_DateSetValue) { } } date->SetValue(value, is_value_nan); - return *date; + return value; } diff --git a/src/version.cc b/src/version.cc index fa5f4c7e..37c2ec26 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 9 #define BUILD_NUMBER 24 -#define PATCH_LEVEL 24 +#define PATCH_LEVEL 25 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/mjsunit/regress/regress-2027.js b/test/mjsunit/regress/regress-2027.js new file mode 100644 index 00000000..00ed03f6 --- /dev/null +++ b/test/mjsunit/regress/regress-2027.js @@ -0,0 +1,48 @@ +// Copyright 2012 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 d = new Date(2010, 1, 1); + +function Check(time) { + assertEquals(d.getTime(), time); +} + +Check(d.setMilliseconds(10)); +Check(d.setSeconds(10)); +Check(d.setMinutes(10)); +Check(d.setHours(10)); +Check(d.setDate(10)); +Check(d.setMonth(10)); +Check(d.setFullYear(2010)); +Check(d.setUTCMilliseconds(10)); +Check(d.setUTCSeconds(10)); +Check(d.setUTCMinutes(10)); +Check(d.setUTCHours(10)); +Check(d.setUTCDate(10)); +Check(d.setUTCMonth(10)); +Check(d.setUTCFullYear(2010)); + |