summaryrefslogtreecommitdiffstats
path: root/src/runtime.js
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-01-27 16:31:12 +0000
committerLeon Clarke <leonclarke@google.com>2010-01-27 16:31:12 +0000
commiteab96aab0834f21954b5d6aa6366bcfb348ed811 (patch)
treea057ce0ab4f5fa5f37a3f468c60f750488908209 /src/runtime.js
parent888f6729be6a6f6fbe246cb5a9f122e2dbe455b7 (diff)
downloadandroid_external_v8-eab96aab0834f21954b5d6aa6366bcfb348ed811.tar.gz
android_external_v8-eab96aab0834f21954b5d6aa6366bcfb348ed811.tar.bz2
android_external_v8-eab96aab0834f21954b5d6aa6366bcfb348ed811.zip
Revert "Pull from svn bleeding_edge@3716"
This reverts commit 888f6729be6a6f6fbe246cb5a9f122e2dbe455b7. (Waiting until v8 issue 554101 is in v8 rather than patching it straight into android)
Diffstat (limited to 'src/runtime.js')
-rw-r--r--src/runtime.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/runtime.js b/src/runtime.js
index c4c855eb..ce2f197f 100644
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -541,9 +541,7 @@ function ToObject(x) {
if (IS_STRING(x)) return new $String(x);
if (IS_NUMBER(x)) return new $Number(x);
if (IS_BOOLEAN(x)) return new $Boolean(x);
- if (IS_NULL_OR_UNDEFINED(x) && !IS_UNDETECTABLE(x)) {
- throw %MakeTypeError('null_to_object', []);
- }
+ if (x == null) throw %MakeTypeError('null_to_object', []);
return x;
}