diff options
| author | Ben Murdoch <benm@google.com> | 2012-05-17 10:59:30 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2012-05-17 11:27:31 +0100 |
| commit | 84774f4b8cb56f14184c96dd08fb2ae119d986e0 (patch) | |
| tree | c9e7180a9a067fe98739d0237554cad1c8625ca4 /src | |
| parent | 7a930e02c0b52d70d022ed255db551895dfe1157 (diff) | |
| download | android_external_v8-84774f4b8cb56f14184c96dd08fb2ae119d986e0.tar.gz android_external_v8-84774f4b8cb56f14184c96dd08fb2ae119d986e0.tar.bz2 android_external_v8-84774f4b8cb56f14184c96dd08fb2ae119d986e0.zip | |
Merge V8 at 3.9.24.25
Bug: 6510301
Change-Id: I2e1efb9b3420fd4c72927c9948546e1de16865fc
Diffstat (limited to 'src')
| -rw-r--r-- | src/date.js | 3 | ||||
| -rw-r--r-- | src/runtime.cc | 2 | ||||
| -rw-r--r-- | src/version.cc | 2 |
3 files changed, 3 insertions, 4 deletions
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 |