diff options
| author | Iain Merrick <husky@google.com> | 2010-08-19 15:07:18 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 14:25:34 +0100 |
| commit | 756813857a4c2a4d8ad2e805969d5768d3cf43a0 (patch) | |
| tree | 002fad3c25654870c9634232d53a48219346c50b /src/runtime.js | |
| parent | bb769b257e753aafcbd96767abb2abc645eaa20c (diff) | |
| download | android_external_v8-756813857a4c2a4d8ad2e805969d5768d3cf43a0.tar.gz android_external_v8-756813857a4c2a4d8ad2e805969d5768d3cf43a0.tar.bz2 android_external_v8-756813857a4c2a4d8ad2e805969d5768d3cf43a0.zip | |
Update V8 to r5295 as required by WebKit r65615
Change-Id: I1d72d4990703e88b7798919c7a53e12ebf76958a
Diffstat (limited to 'src/runtime.js')
| -rw-r--r-- | src/runtime.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime.js b/src/runtime.js index aca19457..42968104 100644 --- a/src/runtime.js +++ b/src/runtime.js @@ -175,7 +175,7 @@ function ADD(x) { // Left operand (this) is already a string. function STRING_ADD_LEFT(y) { if (!IS_STRING(y)) { - if (IS_STRING_WRAPPER(y)) { + if (IS_STRING_WRAPPER(y) && %_IsStringWrapperSafeForDefaultValueOf(y)) { y = %_ValueOf(y); } else { y = IS_NUMBER(y) @@ -191,7 +191,7 @@ function STRING_ADD_LEFT(y) { function STRING_ADD_RIGHT(y) { var x = this; if (!IS_STRING(x)) { - if (IS_STRING_WRAPPER(x)) { + if (IS_STRING_WRAPPER(x) && %_IsStringWrapperSafeForDefaultValueOf(x)) { x = %_ValueOf(x); } else { x = IS_NUMBER(x) @@ -387,11 +387,11 @@ function GET_KEYS() { // Filter a given key against an object by checking if the object // has a property with the given key; return the key as a string if -// it has. Otherwise returns null. Used in for-in statements. +// it has. Otherwise returns 0 (smi). Used in for-in statements. function FILTER_KEY(key) { var string = %ToString(key); if (%HasProperty(this, string)) return string; - return null; + return 0; } |
