RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:47:34 +00:00
Code Issues Activity Actions

LibJS: Only call GlobalObject::vm() once in add()

Browse source
This commit is contained in:
Andreas Kling 2021-03-21 18:06:13 +01:00
parent c8382c32e9
commit 37cd1a95fc
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Libraries/LibJS/Runtime/Value.cpp
View file

@ -833,37 +833,38 @@ Value unsigned_right_shift(GlobalObject& global_object, Value lhs, Value rhs)
Value add(GlobalObject& global_object, Value lhs, Value rhs)
{
auto& vm = global_object.vm();
auto lhs_primitive = lhs.to_primitive(global_object);
if (global_object.vm().exception())
if (vm.exception())
return {};
auto rhs_primitive = rhs.to_primitive(global_object);
if (global_object.vm().exception())
if (vm.exception())
return {};
if (lhs_primitive.is_string() || rhs_primitive.is_string()) {
auto lhs_string = lhs_primitive.to_string(global_object);
if (global_object.vm().exception())
if (vm.exception())
return {};
auto rhs_string = rhs_primitive.to_string(global_object);
if (global_object.vm().exception())
if (vm.exception())
return {};
StringBuilder builder(lhs_string.length() + rhs_string.length());
builder.append(lhs_string);
builder.append(rhs_string);
return js_string(global_object.heap(), builder.to_string());
return js_string(vm.heap(), builder.to_string());
}
auto lhs_numeric = lhs_primitive.to_numeric(global_object);
if (global_object.vm().exception())
if (vm.exception())
return {};
auto rhs_numeric = rhs_primitive.to_numeric(global_object);
if (global_object.vm().exception())
if (vm.exception())
return {};
if (both_number(lhs_numeric, rhs_numeric))
return Value(lhs_numeric.as_double() + rhs_numeric.as_double());
if (both_bigint(lhs_numeric, rhs_numeric))
return js_bigint(global_object.heap(), lhs_numeric.as_bigint().big_integer().plus(rhs_numeric.as_bigint().big_integer()));
global_object.vm().throw_exception<TypeError>(global_object, ErrorType::BigIntBadOperatorOtherType, "addition");
return js_bigint(vm.heap(), lhs_numeric.as_bigint().big_integer().plus(rhs_numeric.as_bigint().big_integer()));
vm.throw_exception<TypeError>(global_object, ErrorType::BigIntBadOperatorOtherType, "addition");
return {};
}