Fix the 32-bit build.
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Jul 2011 09:43:21 +0000 (09:43 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Jul 2011 09:43:21 +0000 (09:43 +0000)
* runtime/ObjectPrototype.cpp:
(JSC::objectProtoFuncToString):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@91351 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/ObjectPrototype.cpp

index f829fa91b616069b9b3a4f5b0a7a066acc727631..2d14c8bf5b09596a4a5f8633eeaa900817609f78 100644 (file)
@@ -1,3 +1,10 @@
+2011-07-20  Mark Rowe  <mrowe@apple.com>
+
+        Fix the 32-bit build.
+
+        * runtime/ObjectPrototype.cpp:
+        (JSC::objectProtoFuncToString):
+
 2011-07-19  Gavin Barraclough  <barraclough@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=64678
 2011-07-19  Gavin Barraclough  <barraclough@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=64678
index 9e14b2e59c63c134999c1d9930c62dc3ef5bf568..c06de27e7ecd379ab7fb909099a996a4f9705049 100644 (file)
@@ -195,7 +195,7 @@ EncodedJSValue JSC_HOST_CALL objectProtoFuncToString(ExecState* exec)
 {
     JSValue thisValue = exec->hostThisValue();
     if (thisValue.isUndefinedOrNull())
 {
     JSValue thisValue = exec->hostThisValue();
     if (thisValue.isUndefinedOrNull())
-        return jsNontrivialString(exec, thisValue.isUndefined() ? "[object Undefined]" : "[object Null]");
+        return JSValue::encode(jsNontrivialString(exec, thisValue.isUndefined() ? "[object Undefined]" : "[object Null]"));
     return JSValue::encode(jsMakeNontrivialString(exec, "[object ", thisValue.toObject(exec)->className(), "]"));
 }
 
     return JSValue::encode(jsMakeNontrivialString(exec, "[object ", thisValue.toObject(exec)->className(), "]"));
 }