Changeset 37337 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Oct 6, 2008, 11:31:07 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-10-06 Maciej Stachowiak <​[email protected]>

Not reviewed. Build fix.

• revert toBoolean changes (r37333 and r37335); need to make WebCore work with these

• API/JSValueRef.cpp: (JSValueToBoolean):
• ChangeLog:
• JavaScriptCore.exp:
• VM/CodeBlock.cpp: (JSC::CodeBlock::dump):
• VM/Machine.cpp: (JSC::Machine::privateExecute): (JSC::Machine::cti_op_loop_if_true): (JSC::Machine::cti_op_not): (JSC::Machine::cti_op_jtrue):
• kjs/ArrayPrototype.cpp: (JSC::arrayProtoFuncFilter): (JSC::arrayProtoFuncEvery): (JSC::arrayProtoFuncSome):
• kjs/BooleanConstructor.cpp: (JSC::constructBoolean): (JSC::callBooleanConstructor):
• kjs/GetterSetter.h:
• kjs/JSCell.h: (JSC::JSValue::toBoolean):
• kjs/JSNumberCell.cpp: (JSC::JSNumberCell::toBoolean):
• kjs/JSNumberCell.h:
• kjs/JSObject.cpp: (JSC::JSObject::toBoolean):
• kjs/JSObject.h:
• kjs/JSString.cpp: (JSC::JSString::toBoolean):
• kjs/JSString.h:
• kjs/JSValue.h:
• kjs/RegExpConstructor.cpp: (JSC::setRegExpConstructorMultiline):
• kjs/RegExpObject.cpp: (JSC::RegExpObject::match):
• kjs/RegExpPrototype.cpp: (JSC::regExpProtoFuncToString):

JavaScriptGlue:

2008-10-06 Maciej Stachowiak <​[email protected]>

Not reviewed. Build fix.

• revert toBoolean changes (r37333 and r37335); need to make WebCore work with these

• JSUtils.cpp: (KJSValueToCFTypeInternal):

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (6 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -2128 +2128 @@
         int dst = (++vPC)->u.operand;
         int src = (++vPC)->u.operand;
-        JSValue* result = jsBoolean(!r[src].jsValue(exec)->toBoolean());
+        JSValue* result = jsBoolean(!r[src].jsValue(exec)->toBoolean(exec));
+        VM_CHECK_EXCEPTION();
         r[dst] = result;
 
@@ -2986 +2987 @@
         int cond = (++vPC)->u.operand;
         int target = (++vPC)->u.operand;
-        if (r[cond].jsValue(exec)->toBoolean()) {
+        if (r[cond].jsValue(exec)->toBoolean(exec)) {
             vPC += target;
             CHECK_FOR_TIMEOUT();
@@ -3003 +3004 @@
         int cond = (++vPC)->u.operand;
         int target = (++vPC)->u.operand;
-        if (r[cond].jsValue(exec)->toBoolean()) {
+        if (r[cond].jsValue(exec)->toBoolean(exec)) {
             vPC += target;
             NEXT_OPCODE;
@@ -3019 +3020 @@
         int cond = (++vPC)->u.operand;
         int target = (++vPC)->u.operand;
-        if (!r[cond].jsValue(exec)->toBoolean()) {
+        if (!r[cond].jsValue(exec)->toBoolean(exec)) {
             vPC += target;
             NEXT_OPCODE;
@@ -4988 +4989 @@
     JSValue* src1 = ARG_src1;
 
-    return src1->toBoolean();
+    ExecState* exec = ARG_exec;
+
+    bool result = src1->toBoolean(exec);
+    VM_CHECK_EXCEPTION_AT_END();
+    return result;
 }
 
@@ -5111 +5116 @@
 JSValue* Machine::cti_op_not(CTI_ARGS)
 {
-    return jsBoolean(!ARG_src1->toBoolean());
+    JSValue* src = ARG_src1;
+
+    ExecState* exec = ARG_exec;
+
+    JSValue* result = jsBoolean(!src->toBoolean(exec));
+    VM_CHECK_EXCEPTION_AT_END();
+    return result;
 }
 
 int SFX_CALL Machine::cti_op_jtrue(CTI_ARGS)
 {
-    return ARG_src1->toBoolean();
+    JSValue* src1 = ARG_src1;
+
+    ExecState* exec = ARG_exec;
+
+    bool result = src1->toBoolean(exec);
+    VM_CHECK_EXCEPTION_AT_END();
+    return result;
 }