Remove unused parameter in toBoolean method

Signed-off-by: HyukWoo Park <[email protected]>
Samsung · Oct 18, 2023 · f0ddc35 · f0ddc35
1 parent 463d730
commit f0ddc35
Show file tree

Hide file tree

Showing 23 changed files with 68 additions and 69 deletions.
diff --git a/build/android/escargot/src/main/cpp/escargot.cpp b/build/android/escargot/src/main/cpp/escargot.cpp
@@ -1332,7 +1332,7 @@ Java_com_samsung_lwe_escargot_JavaScriptValue_toBoolean(JNIEnv* env, jobject thi
     ValueRef* thisValueRef = unwrapValueRefFromValue(env, env->GetObjectClass(thiz), thiz);
 
     auto evaluatorResult = Evaluator::execute(contextRef->get(), [](ExecutionStateRef* state, ValueRef* thisValueRef) -> ValueRef* {
-        return ValueRef::create(thisValueRef->toBoolean(state));
+        return ValueRef::create(thisValueRef->toBoolean());
     }, thisValueRef);
 
     return createOptionalValueFromEvaluatorBooleanResult(env, context, contextRef->get(),

diff --git a/src/api/EscargotPublic.cpp b/src/api/EscargotPublic.cpp
@@ -3396,9 +3396,9 @@ ValueRef* ValueRef::createUndefined()
                                            .payload());
 }
 
-bool ValueRef::toBoolean(ExecutionStateRef* es)
+bool ValueRef::toBoolean()
 {
-    return toImpl(this).toBoolean(*toImpl(es));
+    return toImpl(this).toBoolean();
 }
 
 double ValueRef::toNumber(ExecutionStateRef* es)
@@ -3694,7 +3694,7 @@ BooleanObjectRef* BooleanObjectRef::create(ExecutionStateRef* state)
 
 void BooleanObjectRef::setPrimitiveValue(ExecutionStateRef* state, ValueRef* str)
 {
-    toImpl(this)->setPrimitiveValue(*toImpl(state), toImpl(str).toBoolean(*toImpl(state)));
+    toImpl(this)->setPrimitiveValue(*toImpl(state), toImpl(str).toBoolean());
 }
 
 bool BooleanObjectRef::primitiveValue()

diff --git a/src/api/EscargotPublic.h b/src/api/EscargotPublic.h
@@ -982,7 +982,7 @@ class ESCARGOT_EXPORT ValueRef {
     ESCARGOT_TYPEDARRAY_REF_LIST(DEFINE_VALUEREF_IS_AS);
 #undef DEFINE_VALUEREF_IS_AS
 
-    bool toBoolean(ExecutionStateRef* state);
+    bool toBoolean();
     double toNumber(ExecutionStateRef* state);
     double toInteger(ExecutionStateRef* state);
     double toLength(ExecutionStateRef* state);

diff --git a/src/builtins/BuiltinArray.cpp b/src/builtins/BuiltinArray.cpp
@@ -987,7 +987,7 @@ static Value builtinArrayEvery(ExecutionState& state, Value thisValue, size_t ar
             Value args[] = { kValue, Value(k), O };
             Value testResult = Object::call(state, callbackfn, T, 3, args);
 
-            if (!testResult.toBoolean(state)) {
+            if (!testResult.toBoolean()) {
                 return Value(false);
             }
 
@@ -1079,7 +1079,7 @@ static Value builtinArrayFilter(ExecutionState& state, Value thisValue, size_t a
             Value selected = Object::call(state, callbackfn, T, 3, v);
 
             // If ToBoolean(selected) is true, then
-            if (selected.toBoolean(state)) {
+            if (selected.toBoolean()) {
                 // Let status be CreateDataPropertyOrThrow (A, ToString(to), kValue).
                 ASSERT(A != nullptr);
                 A->defineOwnPropertyThrowsException(state, ObjectPropertyName(state, Value(to)), ObjectPropertyDescriptor(kValue, ObjectPropertyDescriptor::AllPresent));
@@ -1188,7 +1188,7 @@ static Value builtinArraySome(ExecutionState& state, Value thisValue, size_t arg
             Value argv[] = { kValue, Value(k), O };
             Value testResult = Object::call(state, callbackfn, T, 3, argv);
             // If ToBoolean(testResult) is true, return true.
-            if (testResult.toBoolean(state)) {
+            if (testResult.toBoolean()) {
                 return Value(true);
             }
         } else {
@@ -1699,7 +1699,7 @@ static Value builtinArrayFind(ExecutionState& state, Value thisValue, size_t arg
         Value kValue = O->get(state, ObjectPropertyName(state, Value(k))).value(state, O);
         // Let testResult be ToBoolean(? Call(predicate, thisArg, « kValue, k, O »)).
         Value v[] = { kValue, Value(k), O };
-        bool testResult = Object::call(state, argv[0], thisArg, 3, v).toBoolean(state);
+        bool testResult = Object::call(state, argv[0], thisArg, 3, v).toBoolean();
         // If testResult is true, return kValue.
         if (testResult) {
             return kValue;
@@ -1734,7 +1734,7 @@ static Value builtinArrayFindIndex(ExecutionState& state, Value thisValue, size_
         Value kValue = O->get(state, ObjectPropertyName(state, Value(k))).value(state, O);
         // Let testResult be ToBoolean(? Call(predicate, thisArg, « kValue, k, O »)).
         Value v[] = { kValue, Value(k), O };
-        bool testResult = Object::call(state, argv[0], thisArg, 3, v).toBoolean(state);
+        bool testResult = Object::call(state, argv[0], thisArg, 3, v).toBoolean();
         // If testResult is true, return k.
         if (testResult) {
             return Value(k);
@@ -1874,7 +1874,7 @@ static Value builtinArrayFindLast(ExecutionState& state, Value thisValue, size_t
         Value predicateArgv[] = {
             kValue, Value(k), Value(O)
         };
-        bool testResult = Object::call(state, predicate, thisArg, 3, predicateArgv).toBoolean(state);
+        bool testResult = Object::call(state, predicate, thisArg, 3, predicateArgv).toBoolean();
         // d. If testResult is true, return kValue.
         if (testResult) {
             return kValue;
@@ -1910,7 +1910,7 @@ static Value builtinArrayFindLastIndex(ExecutionState& state, Value thisValue, s
         Value predicateArgv[] = {
             kValue, Value(k), Value(O)
         };
-        bool testResult = Object::call(state, predicate, thisArg, 3, predicateArgv).toBoolean(state);
+        bool testResult = Object::call(state, predicate, thisArg, 3, predicateArgv).toBoolean();
         // d. If testResult is true, return kValue.
         if (testResult) {
             return Value(k);

diff --git a/src/builtins/BuiltinBoolean.cpp b/src/builtins/BuiltinBoolean.cpp
@@ -27,7 +27,7 @@ namespace Escargot {
 
 static Value builtinBooleanConstructor(ExecutionState& state, Value thisValue, size_t argc, Value* argv, Optional<Object*> newTarget)
 {
-    bool primitiveVal = argv[0].toBoolean(state);
+    bool primitiveVal = argv[0].toBoolean();
     if (!newTarget.hasValue()) {
         return Value(primitiveVal);
     } else {

diff --git a/src/builtins/BuiltinRegExp.cpp b/src/builtins/BuiltinRegExp.cpp
@@ -406,9 +406,9 @@ static Value builtinRegExpReplace(ExecutionState& state, Value thisValue, size_t
     if (!functionalReplace) {
         replaceValue = replaceValue.toString(state);
     }
-    bool global = rx.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().global)).value(state, rx).toBoolean(state);
+    bool global = rx.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().global)).value(state, rx).toBoolean();
     if (global) {
-        fullUnicode = rx.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().unicode)).value(state, rx).toBoolean(state);
+        fullUnicode = rx.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().unicode)).value(state, rx).toBoolean();
         rx.asObject()->setThrowsException(state, ObjectPropertyName(state, state.context()->staticStrings().lastIndex), Value(0), rx);
     }
     ValueVectorWithInlineStorage results;
@@ -509,13 +509,13 @@ static Value builtinRegExpMatch(ExecutionState& state, Value thisValue, size_t a
     ASSERT(str != nullptr);
 
     //21.2.5.6.8
-    bool global = rx.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().global)).value(state, rx).toBoolean(state);
+    bool global = rx.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().global)).value(state, rx).toBoolean();
 
     if (!global) {
         return regExpExec(state, rx.asObject(), str);
     }
 
-    bool fullUnicode = rx.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().unicode)).value(state, rx).toBoolean(state);
+    bool fullUnicode = rx.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().unicode)).value(state, rx).toBoolean();
     rx.asObject()->setThrowsException(state, ObjectPropertyName(state, state.context()->staticStrings().lastIndex), Value(0), rx);
     ArrayObject* A = new ArrayObject(state);
     size_t n = 0;

diff --git a/src/builtins/BuiltinTypedArray.cpp b/src/builtins/BuiltinTypedArray.cpp
@@ -864,7 +864,7 @@ static Value builtinTypedArraySome(ExecutionState& state, Value thisValue, size_
         Value testResult = Object::call(state, callbackfn, T, 3, args);
 
         // If ToBoolean(testResult) is true, return true.
-        if (testResult.toBoolean(state)) {
+        if (testResult.toBoolean()) {
             return Value(true);
         }
 
@@ -1002,7 +1002,7 @@ static Value builtinTypedArrayEvery(ExecutionState& state, Value thisValue, size
         Value args[] = { kValue, Value(k), O };
         Value testResult = Object::call(state, callbackfn, T, 3, args);
 
-        if (!testResult.toBoolean(state)) {
+        if (!testResult.toBoolean()) {
             return Value(false);
         }
 
@@ -1091,7 +1091,7 @@ static Value builtinTypedArrayFilter(ExecutionState& state, Value thisValue, siz
     while (k < len) {
         Value kValue = O->getIndexedProperty(state, Value(k)).value(state, O);
         Value args[] = { kValue, Value(k), O };
-        bool selected = Object::call(state, callbackfn, T, 3, args).toBoolean(state);
+        bool selected = Object::call(state, callbackfn, T, 3, args).toBoolean();
         if (selected) {
             kept.push_back(kValue);
             captured++;
@@ -1140,7 +1140,7 @@ static Value builtinTypedArrayFind(ExecutionState& state, Value thisValue, size_
         Value kValue = O->getIndexedProperty(state, Value(k)).value(state, O);
         // Let testResult be ToBoolean(Call(predicate, thisArg, «kValue, k, O»)).
         Value args[] = { kValue, Value(k), O };
-        bool testResult = Object::call(state, predicate, thisArg, 3, args).toBoolean(state);
+        bool testResult = Object::call(state, predicate, thisArg, 3, args).toBoolean();
         // If testResult is true, return kValue.
         if (testResult) {
             return kValue;
@@ -1179,7 +1179,7 @@ static Value builtinTypedArrayFindIndex(ExecutionState& state, Value thisValue,
         Value kValue = O->getIndexedProperty(state, Value(k)).value(state, O);
         // Let testResult be ToBoolean(? Call(predicate, thisArg, « kValue, k, O »)).
         Value args[] = { kValue, Value(k), O };
-        bool testResult = Object::call(state, predicate, thisArg, 3, args).toBoolean(state);
+        bool testResult = Object::call(state, predicate, thisArg, 3, args).toBoolean();
         // If testResult is true, return k.
         if (testResult) {
             return Value(k);
@@ -1217,7 +1217,7 @@ static Value builtinTypedArrayFindLast(ExecutionState& state, Value thisValue, s
         kValue = O->getIndexedProperty(state, Value(k)).value(state, O);
         // Let testResult be ToBoolean(Call(predicate, thisArg, «kValue, k, O»)).
         Value args[] = { kValue, Value(k), O };
-        bool testResult = Object::call(state, predicate, thisArg, 3, args).toBoolean(state);
+        bool testResult = Object::call(state, predicate, thisArg, 3, args).toBoolean();
         // If testResult is true, return kValue.
         if (testResult) {
             return kValue;
@@ -1255,7 +1255,7 @@ static Value builtinTypedArrayFindLastIndex(ExecutionState& state, Value thisVal
         Value kValue = O->getIndexedProperty(state, Value(k)).value(state, O);
         // Let testResult be ToBoolean(? Call(predicate, thisArg, « kValue, k, O »)).
         Value args[] = { kValue, Value(k), O };
-        bool testResult = Object::call(state, predicate, thisArg, 3, args).toBoolean(state);
+        bool testResult = Object::call(state, predicate, thisArg, 3, args).toBoolean();
         // If testResult is true, return k.
         if (testResult) {
             return Value(k);

diff --git a/src/interpreter/ByteCodeInterpreter.cpp b/src/interpreter/ByteCodeInterpreter.cpp
@@ -544,7 +544,7 @@ Value Interpreter::interpret(ExecutionState* state, ByteCodeBlock* byteCodeBlock
         {
             UnaryNot* code = (UnaryNot*)programCounter;
             const Value& val = registerFile[code->m_srcIndex];
-            registerFile[code->m_dstIndex] = Value(!val.toBoolean(*state));
+            registerFile[code->m_dstIndex] = Value(!val.toBoolean());
             ADD_PROGRAM_COUNTER(UnaryNot);
             NEXT_INSTRUCTION();
         }
@@ -692,7 +692,7 @@ Value Interpreter::interpret(ExecutionState* state, ByteCodeBlock* byteCodeBlock
         {
             JumpIfTrue* code = (JumpIfTrue*)programCounter;
             ASSERT(code->m_jumpPosition != SIZE_MAX);
-            if (registerFile[code->m_registerIndex].toBoolean(*state)) {
+            if (registerFile[code->m_registerIndex].toBoolean()) {
                 programCounter = code->m_jumpPosition;
             } else {
                 ADD_PROGRAM_COUNTER(JumpIfTrue);
@@ -720,7 +720,7 @@ Value Interpreter::interpret(ExecutionState* state, ByteCodeBlock* byteCodeBlock
         {
             JumpIfFalse* code = (JumpIfFalse*)programCounter;
             ASSERT(code->m_jumpPosition != SIZE_MAX);
-            if (!registerFile[code->m_registerIndex].toBoolean(*state)) {
+            if (!registerFile[code->m_registerIndex].toBoolean()) {
                 programCounter = code->m_jumpPosition;
             } else {
                 ADD_PROGRAM_COUNTER(JumpIfFalse);
@@ -1771,7 +1771,7 @@ NEVER_INLINE void InterpreterSlowPath::resolveNameAddress(ExecutionState& state,
                 ObjectPropertyName propertyName(code->m_name);
                 auto obj = env->record()->asObjectEnvironmentRecord()->bindingObject();
                 Value unscopables = obj->get(state, ObjectPropertyName(state.context()->vmInstance()->globalSymbols().unscopables)).value(state, obj);
-                if (UNLIKELY(unscopables.isObject() && unscopables.asObject()->get(state, propertyName).value(state, unscopables).toBoolean(state))) {
+                if (UNLIKELY(unscopables.isObject() && unscopables.asObject()->get(state, propertyName).value(state, unscopables).toBoolean())) {
                     foundUnscopables = true;
                 }
             }
@@ -4516,7 +4516,7 @@ NEVER_INLINE void InterpreterSlowPath::iteratorOperation(ExecutionState& state,
                 registerFile[code->m_iteratorTestDoneData.m_iteratorRecordOrObjectRegisterIndex].asPointerValue()->asIteratorRecord()->m_done);
         } else {
             registerFile[code->m_iteratorTestDoneData.m_dstRegisterIndex] = Value(
-                registerFile[code->m_iteratorTestDoneData.m_iteratorRecordOrObjectRegisterIndex].asObject()->get(state, state.context()->staticStrings().done).value(state, registerFile[code->m_iteratorTestDoneData.m_iteratorRecordOrObjectRegisterIndex]).toBoolean(state));
+                registerFile[code->m_iteratorTestDoneData.m_iteratorRecordOrObjectRegisterIndex].asObject()->get(state, state.context()->staticStrings().done).value(state, registerFile[code->m_iteratorTestDoneData.m_iteratorRecordOrObjectRegisterIndex]).toBoolean());
         }
         ADD_PROGRAM_COUNTER(IteratorOperation);
     } else if (code->m_operation == IteratorOperation::Operation::IteratorNext) {

diff --git a/src/intl/Intl.cpp b/src/intl/Intl.cpp
@@ -2255,7 +2255,7 @@ Value Intl::getOption(ExecutionState& state, Object* options, Value property, In
         // Assert: type is "boolean" or "string".
         // If type is "boolean", then let value be ToBoolean(value).
         if (type == Intl::OptionValueType::BooleanValue) {
-            value = Value(value.toBoolean(state));
+            value = Value(value.toBoolean());
         }
         // If type is "string", then let value be ToString(value).
         if (type == Intl::OptionValueType::StringValue) {

diff --git a/src/intl/IntlCollator.cpp b/src/intl/IntlCollator.cpp
@@ -139,8 +139,8 @@ IntlCollator::CollatorResolvedOptions IntlCollator::resolvedOptions(ExecutionSta
     opt.sensitivity = internalSlot->get(state, ObjectPropertyName(state.context()->staticStrings().lazySensitivity())).value(state, internalSlot).toString(state);
     opt.usage = internalSlot->get(state, ObjectPropertyName(state.context()->staticStrings().lazyUsage())).value(state, internalSlot).toString(state);
     opt.collation = internalSlot->get(state, ObjectPropertyName(state.context()->staticStrings().collation)).value(state, internalSlot).toString(state);
-    opt.numeric = internalSlot->get(state, ObjectPropertyName(state.context()->staticStrings().numeric)).value(state, internalSlot).toBoolean(state);
-    opt.ignorePunctuation = internalSlot->get(state, ObjectPropertyName(state.context()->staticStrings().lazyIgnorePunctuation())).value(state, internalSlot).toBoolean(state);
+    opt.numeric = internalSlot->get(state, ObjectPropertyName(state.context()->staticStrings().numeric)).value(state, internalSlot).toBoolean();
+    opt.ignorePunctuation = internalSlot->get(state, ObjectPropertyName(state.context()->staticStrings().lazyIgnorePunctuation())).value(state, internalSlot).toBoolean();
     opt.caseFirst = internalSlot->get(state, ObjectPropertyName(state.context()->staticStrings().caseFirst)).value(state, internalSlot).toString(state);
     return opt;
 }

diff --git a/src/intl/IntlDateTimeFormat.cpp b/src/intl/IntlDateTimeFormat.cpp
@@ -550,7 +550,7 @@ String* IntlDateTimeFormatObject::initDateTimeFormatMainHelper(ExecutionState& s
     String* hour = ret = opt.at("hour");
     Value hr12Value = hour12;
     bool isHour12Undefined = hr12Value.isUndefined();
-    bool hr12 = hr12Value.toBoolean(state);
+    bool hr12 = hr12Value.toBoolean();
 
     if (isHour12Undefined) {
         if (ret->equals("2-digit"))

diff --git a/src/parser/ast/WhileStatementNode.h b/src/parser/ast/WhileStatementNode.h
@@ -53,8 +53,7 @@ class WhileStatementNode : public StatementNode {
 
         size_t whileStart = codeBlock->currentCodeSize();
         size_t testPos = SIZE_MAX;
-        ExecutionState stateForTest(codeBlock->m_codeBlock->context());
-        if (m_test->isLiteral() && m_test->asLiteral()->value().isPrimitive() && m_test->asLiteral()->value().toBoolean(stateForTest)) {
+        if (m_test->isLiteral() && m_test->asLiteral()->value().isPrimitive() && m_test->asLiteral()->value().toBoolean()) {
             // skip generate code
         } else {
             if (m_test->isRelationOperation()) {

diff --git a/src/runtime/DataViewObject.h b/src/runtime/DataViewObject.h
@@ -52,7 +52,7 @@ class DataViewObject : public ArrayBufferView {
             ErrorObject::throwBuiltinError(state, ErrorCode::RangeError, state.context()->staticStrings().DataView.string(), false, String::emptyString, ErrorObject::Messages::GlobalObject_InvalidArrayBufferOffset);
         }
 
-        bool isLittleEndian = _isLittleEndian.toBoolean(state);
+        bool isLittleEndian = _isLittleEndian.toBoolean();
         ArrayBuffer* buffer = this->buffer();
         buffer->throwTypeErrorIfDetached(state);
 
@@ -79,7 +79,7 @@ class DataViewObject : public ArrayBufferView {
         auto numericValue = val.toNumeric(state);
         UNUSED_VARIABLE(numericValue);
 
-        bool isLittleEndian = _isLittleEndian.toBoolean(state);
+        bool isLittleEndian = _isLittleEndian.toBoolean();
         ArrayBuffer* buffer = this->buffer();
         buffer->throwTypeErrorIfDetached(state);
 

diff --git a/src/runtime/EnvironmentRecord.h b/src/runtime/EnvironmentRecord.h
@@ -251,7 +251,7 @@ class ObjectEnvironmentRecord : public EnvironmentRecord {
             // we check conditions same as hasBinding for performance reason
             // directly call getBindingValue instead of checking the result of hasBinding in advance
             Value unscopables = m_bindingObject->get(state, ObjectPropertyName(state.context()->vmInstance()->globalSymbols().unscopables)).value(state, m_bindingObject);
-            if (UNLIKELY(unscopables.isObject() && unscopables.asObject()->get(state, propertyName).value(state, unscopables).toBoolean(state))) {
+            if (UNLIKELY(unscopables.isObject() && unscopables.asObject()->get(state, propertyName).value(state, unscopables).toBoolean())) {
                 return GetBindingValueResult();
             }
 

diff --git a/src/runtime/IteratorObject.cpp b/src/runtime/IteratorObject.cpp
@@ -117,7 +117,7 @@ Object* IteratorObject::iteratorNext(ExecutionState& state, IteratorRecord* iter
 bool IteratorObject::iteratorComplete(ExecutionState& state, Object* iterResult)
 {
     Value result = iterResult->get(state, ObjectPropertyName(state.context()->staticStrings().done)).value(state, iterResult);
-    return result.toBoolean(state);
+    return result.toBoolean();
 }
 
 // https://www.ecma-international.org/ecma-262/10.0/#sec-iteratorvalue