From 1c00f363b19db079a6084a3a68d06e4a1f0ae719 Mon Sep 17 00:00:00 2001 From: "mrbkap%gmail.com" Date: Mon, 22 Aug 2005 17:09:53 +0000 Subject: [PATCH] bug 292731: be consistent in calling valueOf when using for-in. r=brendan git-svn-id: svn://10.0.0.236/trunk@178609 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/jsinterp.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/mozilla/js/src/jsinterp.c b/mozilla/js/src/jsinterp.c index cb71837e56f..d7b3cdb927e 100644 --- a/mozilla/js/src/jsinterp.c +++ b/mozilla/js/src/jsinterp.c @@ -1,4 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * vim: set ts=8 sw=4 et tw=80: * * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -272,15 +273,11 @@ static JSClass prop_iterator_class = { #define VALUE_TO_OBJECT(cx, v, obj) \ JS_BEGIN_MACRO \ - if (JSVAL_IS_OBJECT(v) && v != JSVAL_NULL) { \ - obj = JSVAL_TO_OBJECT(v); \ - } else { \ - SAVE_SP(fp); \ - obj = js_ValueToNonNullObject(cx, v); \ - if (!obj) { \ - ok = JS_FALSE; \ - goto out; \ - } \ + SAVE_SP(fp); \ + obj = js_ValueToNonNullObject(cx, v); \ + if (!obj) { \ + ok = JS_FALSE; \ + goto out; \ } \ JS_END_MACRO