Commit 3df8a57b authored by Milad Fa's avatar Milad Fa Committed by V8 LUCI CQ

PPC/s390: [regexp][cleanup] Use 'override' instead of 'virtual'

Port 7c08633b

Original Commit Message:

    Replace 'virtual' by 'override' when overriding methods.
    This uncovered one method which was unnecessarily virtual:
    {RegExpMacroAssemblerARM64::CheckCharacters}.

R=clemensb@chromium.org, joransiu@ca.ibm.com, junyan@redhat.com, midawson@redhat.com
BUG=
LOG=N

Change-Id: I542aeae836b5b78284291ed39844a5c166ed06ad
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3208811Reviewed-by: 's avatarJunliang Yan <junyan@redhat.com>
Commit-Queue: Milad Fa <mfarazma@redhat.com>
Cr-Commit-Position: refs/heads/main@{#77269}
parent 8659c9c3
...@@ -16,66 +16,67 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerPPC ...@@ -16,66 +16,67 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerPPC
public: public:
RegExpMacroAssemblerPPC(Isolate* isolate, Zone* zone, Mode mode, RegExpMacroAssemblerPPC(Isolate* isolate, Zone* zone, Mode mode,
int registers_to_save); int registers_to_save);
virtual ~RegExpMacroAssemblerPPC(); ~RegExpMacroAssemblerPPC() override;
virtual int stack_limit_slack(); int stack_limit_slack() override;
virtual void AdvanceCurrentPosition(int by); void AdvanceCurrentPosition(int by) override;
virtual void AdvanceRegister(int reg, int by); void AdvanceRegister(int reg, int by) override;
virtual void Backtrack(); void Backtrack() override;
virtual void Bind(Label* label); void Bind(Label* label) override;
virtual void CheckAtStart(int cp_offset, Label* on_at_start); void CheckAtStart(int cp_offset, Label* on_at_start) override;
virtual void CheckCharacter(unsigned c, Label* on_equal); void CheckCharacter(unsigned c, Label* on_equal) override;
virtual void CheckCharacterAfterAnd(unsigned c, unsigned mask, void CheckCharacterAfterAnd(unsigned c, unsigned mask,
Label* on_equal); Label* on_equal) override;
virtual void CheckCharacterGT(base::uc16 limit, Label* on_greater); void CheckCharacterGT(base::uc16 limit, Label* on_greater) override;
virtual void CheckCharacterLT(base::uc16 limit, Label* on_less); void CheckCharacterLT(base::uc16 limit, Label* on_less) override;
// A "greedy loop" is a loop that is both greedy and with a simple // A "greedy loop" is a loop that is both greedy and with a simple
// body. It has a particularly simple implementation. // body. It has a particularly simple implementation.
virtual void CheckGreedyLoop(Label* on_tos_equals_current_position); void CheckGreedyLoop(Label* on_tos_equals_current_position) override;
virtual void CheckNotAtStart(int cp_offset, Label* on_not_at_start); void CheckNotAtStart(int cp_offset, Label* on_not_at_start) override;
virtual void CheckNotBackReference(int start_reg, bool read_backward, void CheckNotBackReference(int start_reg, bool read_backward,
Label* on_no_match); Label* on_no_match) override;
virtual void CheckNotBackReferenceIgnoreCase(int start_reg, void CheckNotBackReferenceIgnoreCase(int start_reg, bool read_backward,
bool read_backward, bool unicode, bool unicode,
Label* on_no_match); Label* on_no_match) override;
virtual void CheckNotCharacter(unsigned c, Label* on_not_equal); void CheckNotCharacter(unsigned c, Label* on_not_equal) override;
virtual void CheckNotCharacterAfterAnd(unsigned c, unsigned mask, void CheckNotCharacterAfterAnd(unsigned c, unsigned mask,
Label* on_not_equal); Label* on_not_equal) override;
virtual void CheckNotCharacterAfterMinusAnd(base::uc16 c, base::uc16 minus, void CheckNotCharacterAfterMinusAnd(base::uc16 c, base::uc16 minus,
base::uc16 mask, base::uc16 mask,
Label* on_not_equal); Label* on_not_equal) override;
virtual void CheckCharacterInRange(base::uc16 from, base::uc16 to, void CheckCharacterInRange(base::uc16 from, base::uc16 to,
Label* on_in_range); Label* on_in_range) override;
virtual void CheckCharacterNotInRange(base::uc16 from, base::uc16 to, void CheckCharacterNotInRange(base::uc16 from, base::uc16 to,
Label* on_not_in_range); Label* on_not_in_range) override;
virtual void CheckBitInTable(Handle<ByteArray> table, Label* on_bit_set); void CheckBitInTable(Handle<ByteArray> table, Label* on_bit_set) override;
// Checks whether the given offset from the current position is before // Checks whether the given offset from the current position is before
// the end of the string. // the end of the string.
virtual void CheckPosition(int cp_offset, Label* on_outside_input); void CheckPosition(int cp_offset, Label* on_outside_input) override;
virtual bool CheckSpecialCharacterClass(base::uc16 type, Label* on_no_match); bool CheckSpecialCharacterClass(base::uc16 type, Label* on_no_match) override;
virtual void Fail(); void Fail() override;
virtual Handle<HeapObject> GetCode(Handle<String> source); Handle<HeapObject> GetCode(Handle<String> source) override;
virtual void GoTo(Label* label); void GoTo(Label* label) override;
virtual void IfRegisterGE(int reg, int comparand, Label* if_ge); void IfRegisterGE(int reg, int comparand, Label* if_ge) override;
virtual void IfRegisterLT(int reg, int comparand, Label* if_lt); void IfRegisterLT(int reg, int comparand, Label* if_lt) override;
virtual void IfRegisterEqPos(int reg, Label* if_eq); void IfRegisterEqPos(int reg, Label* if_eq) override;
virtual IrregexpImplementation Implementation(); IrregexpImplementation Implementation() override;
virtual void LoadCurrentCharacterUnchecked(int cp_offset, void LoadCurrentCharacterUnchecked(int cp_offset,
int character_count); int character_count) override;
virtual void PopCurrentPosition(); void PopCurrentPosition() override;
virtual void PopRegister(int register_index); void PopRegister(int register_index) override;
virtual void PushBacktrack(Label* label); void PushBacktrack(Label* label) override;
virtual void PushCurrentPosition(); void PushCurrentPosition() override;
virtual void PushRegister(int register_index, void PushRegister(int register_index,
StackCheckFlag check_stack_limit); StackCheckFlag check_stack_limit) override;
virtual void ReadCurrentPositionFromRegister(int reg); void ReadCurrentPositionFromRegister(int reg) override;
virtual void ReadStackPointerFromRegister(int reg); void ReadStackPointerFromRegister(int reg) override;
virtual void SetCurrentPositionFromEnd(int by); void SetCurrentPositionFromEnd(int by) override;
virtual void SetRegister(int register_index, int to); void SetRegister(int register_index, int to) override;
virtual bool Succeed(); bool Succeed() override;
virtual void WriteCurrentPositionToRegister(int reg, int cp_offset); void WriteCurrentPositionToRegister(int reg, int cp_offset) override;
virtual void ClearRegisters(int reg_from, int reg_to); void ClearRegisters(int reg_from, int reg_to) override;
virtual void WriteStackPointerToRegister(int reg); void WriteStackPointerToRegister(int reg) override;
// Called from RegExp if the stack-guard is triggered. // Called from RegExp if the stack-guard is triggered.
// If the code object is relocated, the return address is fixed before // If the code object is relocated, the return address is fixed before
......
...@@ -16,65 +16,67 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerS390 ...@@ -16,65 +16,67 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerS390
public: public:
RegExpMacroAssemblerS390(Isolate* isolate, Zone* zone, Mode mode, RegExpMacroAssemblerS390(Isolate* isolate, Zone* zone, Mode mode,
int registers_to_save); int registers_to_save);
virtual ~RegExpMacroAssemblerS390(); ~RegExpMacroAssemblerS390() override;
virtual int stack_limit_slack(); int stack_limit_slack() override;
virtual void AdvanceCurrentPosition(int by); void AdvanceCurrentPosition(int by) override;
virtual void AdvanceRegister(int reg, int by); void AdvanceRegister(int reg, int by) override;
virtual void Backtrack(); void Backtrack() override;
virtual void Bind(Label* label); void Bind(Label* label) override;
virtual void CheckAtStart(int cp_offset, Label* on_at_start); void CheckAtStart(int cp_offset, Label* on_at_start) override;
virtual void CheckCharacter(unsigned c, Label* on_equal); void CheckCharacter(unsigned c, Label* on_equal) override;
virtual void CheckCharacterAfterAnd(unsigned c, unsigned mask, void CheckCharacterAfterAnd(unsigned c, unsigned mask,
Label* on_equal); Label* on_equal) override;
virtual void CheckCharacterGT(base::uc16 limit, Label* on_greater); void CheckCharacterGT(base::uc16 limit, Label* on_greater) override;
virtual void CheckCharacterLT(base::uc16 limit, Label* on_less); void CheckCharacterLT(base::uc16 limit, Label* on_less) override;
// A "greedy loop" is a loop that is both greedy and with a simple // A "greedy loop" is a loop that is both greedy and with a simple
// body. It has a particularly simple implementation. // body. It has a particularly simple implementation.
virtual void CheckGreedyLoop(Label* on_tos_equals_current_position); void CheckGreedyLoop(Label* on_tos_equals_current_position) override;
virtual void CheckNotAtStart(int cp_offset, Label* on_not_at_start); void CheckNotAtStart(int cp_offset, Label* on_not_at_start) override;
virtual void CheckNotBackReference(int start_reg, bool read_backward, void CheckNotBackReference(int start_reg, bool read_backward,
Label* on_no_match); Label* on_no_match) override;
virtual void CheckNotBackReferenceIgnoreCase(int start_reg, void CheckNotBackReferenceIgnoreCase(int start_reg, bool read_backward,
bool read_backward, bool unicode, bool unicode,
Label* on_no_match); Label* on_no_match) override;
virtual void CheckNotCharacter(unsigned c, Label* on_not_equal); void CheckNotCharacter(unsigned c, Label* on_not_equal) override;
virtual void CheckNotCharacterAfterAnd(unsigned c, unsigned mask, void CheckNotCharacterAfterAnd(unsigned c, unsigned mask,
Label* on_not_equal); Label* on_not_equal) override;
virtual void CheckNotCharacterAfterMinusAnd(base::uc16 c, base::uc16 minus, void CheckNotCharacterAfterMinusAnd(base::uc16 c, base::uc16 minus,
base::uc16 mask, base::uc16 mask,
Label* on_not_equal); Label* on_not_equal) override;
virtual void CheckCharacterInRange(base::uc16 from, base::uc16 to, void CheckCharacterInRange(base::uc16 from, base::uc16 to,
Label* on_in_range); Label* on_in_range) override;
virtual void CheckCharacterNotInRange(base::uc16 from, base::uc16 to, void CheckCharacterNotInRange(base::uc16 from, base::uc16 to,
Label* on_not_in_range); Label* on_not_in_range) override;
virtual void CheckBitInTable(Handle<ByteArray> table, Label* on_bit_set); void CheckBitInTable(Handle<ByteArray> table, Label* on_bit_set) override;
// Checks whether the given offset from the current position is before // Checks whether the given offset from the current position is before
// the end of the string. // the end of the string.
virtual void CheckPosition(int cp_offset, Label* on_outside_input); void CheckPosition(int cp_offset, Label* on_outside_input) override;
virtual bool CheckSpecialCharacterClass(base::uc16 type, Label* on_no_match); bool CheckSpecialCharacterClass(base::uc16 type, Label* on_no_match) override;
virtual void Fail(); void Fail() override;
virtual Handle<HeapObject> GetCode(Handle<String> source); Handle<HeapObject> GetCode(Handle<String> source) override;
virtual void GoTo(Label* label); void GoTo(Label* label) override;
virtual void IfRegisterGE(int reg, int comparand, Label* if_ge); void IfRegisterGE(int reg, int comparand, Label* if_ge) override;
virtual void IfRegisterLT(int reg, int comparand, Label* if_lt); void IfRegisterLT(int reg, int comparand, Label* if_lt) override;
virtual void IfRegisterEqPos(int reg, Label* if_eq); void IfRegisterEqPos(int reg, Label* if_eq) override;
virtual IrregexpImplementation Implementation(); IrregexpImplementation Implementation() override;
void LoadCurrentCharacterUnchecked(int cp_offset, int character_count); void LoadCurrentCharacterUnchecked(int cp_offset,
virtual void PopCurrentPosition(); int character_count) override;
virtual void PopRegister(int register_index); void PopCurrentPosition() override;
virtual void PushBacktrack(Label* label); void PopRegister(int register_index) override;
virtual void PushCurrentPosition(); void PushBacktrack(Label* label) override;
virtual void PushRegister(int register_index, void PushCurrentPosition() override;
StackCheckFlag check_stack_limit); void PushRegister(int register_index,
virtual void ReadCurrentPositionFromRegister(int reg); StackCheckFlag check_stack_limit) override;
virtual void ReadStackPointerFromRegister(int reg); void ReadCurrentPositionFromRegister(int reg) override;
virtual void SetCurrentPositionFromEnd(int by); void ReadStackPointerFromRegister(int reg) override;
virtual void SetRegister(int register_index, int to); void SetCurrentPositionFromEnd(int by) override;
virtual bool Succeed(); void SetRegister(int register_index, int to) override;
virtual void WriteCurrentPositionToRegister(int reg, int cp_offset); bool Succeed() override;
virtual void ClearRegisters(int reg_from, int reg_to); void WriteCurrentPositionToRegister(int reg, int cp_offset) override;
virtual void WriteStackPointerToRegister(int reg); void ClearRegisters(int reg_from, int reg_to) override;
void WriteStackPointerToRegister(int reg) override;
// Called from RegExp if the stack-guard is triggered. // Called from RegExp if the stack-guard is triggered.
// If the code object is relocated, the return address is fixed before // If the code object is relocated, the return address is fixed before
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment