RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:17:36 +00:00
Code Issues Activity Actions

LibJS: Make JumpIf{True,False,Nullish} inherit from Jump

Browse source 
This saves a few lines in LogicalExpression::generate_bytecode.
This commit is contained in:
Gunnar Beutner 2021-06-08 11:28:27 +02:00 • committed by Andreas Kling
parent afbbcde150
commit ef83872f62
2 changed files with 16 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp
View file

@ -126,7 +126,7 @@ Optional<Bytecode::Register> LogicalExpression::generate_bytecode(Bytecode::Gene
auto result_reg = generator.allocate_register();
auto lhs_reg = m_lhs->generate_bytecode(generator);
Bytecode::Instruction* test_instr;
Bytecode::Op::Jump* test_instr;
switch (m_op) {
case LogicalOp::And:
test_instr = &generator.emit<Bytecode::Op::JumpIfTrue>(*lhs_reg);
@ -145,20 +145,7 @@ Optional<Bytecode::Register> LogicalExpression::generate_bytecode(Bytecode::Gene
auto& end_jump = generator.emit<Bytecode::Op::Jump>();
auto rhs_label = generator.make_label();
switch (m_op) {
case LogicalOp::And:
static_cast<Bytecode::Op::JumpIfTrue*>(test_instr)->set_target(rhs_label);
break;
case LogicalOp::Or:
static_cast<Bytecode::Op::JumpIfFalse*>(test_instr)->set_target(rhs_label);
break;
case LogicalOp::NullishCoalescing:
static_cast<Bytecode::Op::JumpIfNullish*>(test_instr)->set_target(rhs_label);
break;
default:
VERIFY_NOT_REACHED();
}
test_instr->set_target(rhs_label);
auto rhs_reg = m_rhs->generate_bytecode(generator);
generator.emit<Bytecode::Op::LoadRegister>(result_reg, *rhs_reg);

34
Userland/Libraries/LibJS/Bytecode/Op.h
View file

@ -229,8 +229,14 @@ private:
Register m_src;
};
class Jump final : public Instruction {
class Jump : public Instruction {
public:
explicit Jump(Type type, Optional<Label> target = {})
: Instruction(type)
, m_target(move(target))
{
}
explicit Jump(Optional<Label> target = {})
: Instruction(Type::Jump)
, m_target(move(target))
@ -242,65 +248,53 @@ public:
void execute(Bytecode::Interpreter&) const;
String to_string() const;
private:
protected:
Optional<Label> m_target;
};
class JumpIfFalse final : public Instruction {
class JumpIfFalse final : public Jump {
public:
explicit JumpIfFalse(Register result, Optional<Label> target = {})
: Instruction(Type::JumpIfFalse)
: Jump(Type::JumpIfFalse, move(target))
, m_result(result)
, m_target(move(target))
{
}
void set_target(Optional<Label> target) { m_target = move(target); }
void execute(Bytecode::Interpreter&) const;
String to_string() const;
private:
Register m_result;
Optional<Label> m_target;
};
class JumpIfTrue final : public Instruction {
class JumpIfTrue : public Jump {
public:
explicit JumpIfTrue(Register result, Optional<Label> target = {})
: Instruction(Type::JumpIfTrue)
: Jump(Type::JumpIfTrue, move(target))
, m_result(result)
, m_target(move(target))
{
}
void set_target(Optional<Label> target) { m_target = move(target); }
void execute(Bytecode::Interpreter&) const;
String to_string() const;
private:
Register m_result;
Optional<Label> m_target;
};
class JumpIfNullish final : public Instruction {
class JumpIfNullish final : public Jump {
public:
explicit JumpIfNullish(Register result, Optional<Label> target = {})
: Instruction(Type::JumpIfNullish)
: Jump(Type::JumpIfNullish, move(target))
, m_result(result)
, m_target(move(target))
{
}
void set_target(Optional<Label> target) { m_target = move(target); }
void execute(Bytecode::Interpreter&) const;
String to_string() const;
private:
Register m_result;
Optional<Label> m_target;
};
// NOTE: This instruction is variable-width depending on the number of arguments!