Commit 4703805b authored by Florian Sattler's avatar Florian Sattler Committed by Commit Bot

[cleanup] Mark regexp methods in subclasses with override.

Fixing clang-tidy warning.

Bug: v8:8015
Change-Id: I46b96899f0a5973f2fbf8af94eb43d14955a3f45
Reviewed-on: https://chromium-review.googlesource.com/1227072Reviewed-by: 's avatarYang Guo <yangguo@chromium.org>
Commit-Queue: Florian Sattler <sattlerf@google.com>
Cr-Commit-Position: refs/heads/master@{#55978}
parent 3f6d90b1
This diff is collapsed.
...@@ -14,71 +14,62 @@ namespace internal { ...@@ -14,71 +14,62 @@ namespace internal {
class RegExpMacroAssemblerTracer: public RegExpMacroAssembler { class RegExpMacroAssemblerTracer: public RegExpMacroAssembler {
public: public:
RegExpMacroAssemblerTracer(Isolate* isolate, RegExpMacroAssembler* assembler); RegExpMacroAssemblerTracer(Isolate* isolate, RegExpMacroAssembler* assembler);
virtual ~RegExpMacroAssemblerTracer(); ~RegExpMacroAssemblerTracer() override;
virtual void AbortedCodeGeneration(); void AbortedCodeGeneration() override;
virtual int stack_limit_slack() { return assembler_->stack_limit_slack(); } int stack_limit_slack() override { return assembler_->stack_limit_slack(); }
virtual bool CanReadUnaligned() { return assembler_->CanReadUnaligned(); } bool CanReadUnaligned() override { return assembler_->CanReadUnaligned(); }
virtual void AdvanceCurrentPosition(int by); // Signed cp change. void AdvanceCurrentPosition(int by) override; // Signed cp change.
virtual void AdvanceRegister(int reg, int by); // r[reg] += by. void AdvanceRegister(int reg, int by) override; // r[reg] += by.
virtual void Backtrack(); void Backtrack() override;
virtual void Bind(Label* label); void Bind(Label* label) override;
virtual void CheckAtStart(Label* on_at_start); void CheckAtStart(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, void CheckCharacterAfterAnd(unsigned c, unsigned and_with,
unsigned and_with, Label* on_equal) override;
Label* on_equal); void CheckCharacterGT(uc16 limit, Label* on_greater) override;
virtual void CheckCharacterGT(uc16 limit, Label* on_greater); void CheckCharacterLT(uc16 limit, Label* on_less) override;
virtual void CheckCharacterLT(uc16 limit, Label* on_less); void CheckGreedyLoop(Label* on_tos_equals_current_position) override;
virtual void CheckGreedyLoop(Label* on_tos_equals_current_position); void CheckNotAtStart(int cp_offset, Label* on_not_at_start) override;
virtual void CheckNotAtStart(int cp_offset, Label* on_not_at_start); void CheckNotBackReference(int start_reg, bool read_backward,
virtual void CheckNotBackReference(int start_reg, bool read_backward, Label* on_no_match) override;
Label* on_no_match); void CheckNotBackReferenceIgnoreCase(int start_reg, bool read_backward,
virtual void CheckNotBackReferenceIgnoreCase(int start_reg, bool unicode,
bool read_backward, bool unicode, Label* on_no_match) override;
Label* on_no_match); void CheckNotCharacter(unsigned c, Label* on_not_equal) override;
virtual void CheckNotCharacter(unsigned c, Label* on_not_equal); void CheckNotCharacterAfterAnd(unsigned c, unsigned and_with,
virtual void CheckNotCharacterAfterAnd(unsigned c, Label* on_not_equal) override;
unsigned and_with, void CheckNotCharacterAfterMinusAnd(uc16 c, uc16 minus, uc16 and_with,
Label* on_not_equal); Label* on_not_equal) override;
virtual void CheckNotCharacterAfterMinusAnd(uc16 c, void CheckCharacterInRange(uc16 from, uc16 to, Label* on_in_range) override;
uc16 minus, void CheckCharacterNotInRange(uc16 from, uc16 to,
uc16 and_with, Label* on_not_in_range) override;
Label* on_not_equal); void CheckBitInTable(Handle<ByteArray> table, Label* on_bit_set) override;
virtual void CheckCharacterInRange(uc16 from, void CheckPosition(int cp_offset, Label* on_outside_input) override;
uc16 to, bool CheckSpecialCharacterClass(uc16 type, Label* on_no_match) override;
Label* on_in_range); void Fail() override;
virtual void CheckCharacterNotInRange(uc16 from, Handle<HeapObject> GetCode(Handle<String> source) override;
uc16 to, void GoTo(Label* label) override;
Label* on_not_in_range); void IfRegisterGE(int reg, int comparand, Label* if_ge) override;
virtual void CheckBitInTable(Handle<ByteArray> table, Label* on_bit_set); void IfRegisterLT(int reg, int comparand, Label* if_lt) override;
virtual void CheckPosition(int cp_offset, Label* on_outside_input); void IfRegisterEqPos(int reg, Label* if_eq) override;
virtual bool CheckSpecialCharacterClass(uc16 type, IrregexpImplementation Implementation() override;
Label* on_no_match); void LoadCurrentCharacter(int cp_offset, Label* on_end_of_input,
virtual void Fail(); bool check_bounds = true,
virtual Handle<HeapObject> GetCode(Handle<String> source); int characters = 1) override;
virtual void GoTo(Label* label); void PopCurrentPosition() override;
virtual void IfRegisterGE(int reg, int comparand, Label* if_ge); void PopRegister(int register_index) override;
virtual void IfRegisterLT(int reg, int comparand, Label* if_lt); void PushBacktrack(Label* label) override;
virtual void IfRegisterEqPos(int reg, Label* if_eq); void PushCurrentPosition() override;
virtual IrregexpImplementation Implementation(); void PushRegister(int register_index,
virtual void LoadCurrentCharacter(int cp_offset, StackCheckFlag check_stack_limit) override;
Label* on_end_of_input, void ReadCurrentPositionFromRegister(int reg) override;
bool check_bounds = true, void ReadStackPointerFromRegister(int reg) override;
int characters = 1); void SetCurrentPositionFromEnd(int by) override;
virtual void PopCurrentPosition(); void SetRegister(int register_index, int to) override;
virtual void PopRegister(int register_index); bool Succeed() override;
virtual void PushBacktrack(Label* label); void WriteCurrentPositionToRegister(int reg, int cp_offset) override;
virtual void PushCurrentPosition(); void ClearRegisters(int reg_from, int reg_to) override;
virtual void PushRegister(int register_index, void WriteStackPointerToRegister(int reg) override;
StackCheckFlag check_stack_limit);
virtual void ReadCurrentPositionFromRegister(int reg);
virtual void ReadStackPointerFromRegister(int reg);
virtual void SetCurrentPositionFromEnd(int by);
virtual void SetRegister(int register_index, int to);
virtual bool Succeed();
virtual void WriteCurrentPositionToRegister(int reg, int cp_offset);
virtual void ClearRegisters(int reg_from, int reg_to);
virtual void WriteStackPointerToRegister(int reg);
private: private:
RegExpMacroAssembler* assembler_; RegExpMacroAssembler* assembler_;
......
...@@ -212,8 +212,8 @@ class NativeRegExpMacroAssembler: public RegExpMacroAssembler { ...@@ -212,8 +212,8 @@ class NativeRegExpMacroAssembler: public RegExpMacroAssembler {
enum Result { RETRY = -2, EXCEPTION = -1, FAILURE = 0, SUCCESS = 1 }; enum Result { RETRY = -2, EXCEPTION = -1, FAILURE = 0, SUCCESS = 1 };
NativeRegExpMacroAssembler(Isolate* isolate, Zone* zone); NativeRegExpMacroAssembler(Isolate* isolate, Zone* zone);
virtual ~NativeRegExpMacroAssembler(); ~NativeRegExpMacroAssembler() override;
virtual bool CanReadUnaligned(); bool CanReadUnaligned() override;
static Result Match(Handle<Code> regexp, static Result Match(Handle<Code> regexp,
Handle<String> subject, Handle<String> subject,
......
...@@ -19,74 +19,65 @@ class RegExpMacroAssemblerX64: public NativeRegExpMacroAssembler { ...@@ -19,74 +19,65 @@ class RegExpMacroAssemblerX64: public NativeRegExpMacroAssembler {
public: public:
RegExpMacroAssemblerX64(Isolate* isolate, Zone* zone, Mode mode, RegExpMacroAssemblerX64(Isolate* isolate, Zone* zone, Mode mode,
int registers_to_save); int registers_to_save);
virtual ~RegExpMacroAssemblerX64(); ~RegExpMacroAssemblerX64() 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(Label* on_at_start); void CheckAtStart(Label* on_at_start) override;
virtual void CheckCharacter(uint32_t c, Label* on_equal); void CheckCharacter(uint32_t c, Label* on_equal) override;
virtual void CheckCharacterAfterAnd(uint32_t c, void CheckCharacterAfterAnd(uint32_t c, uint32_t mask,
uint32_t mask, Label* on_equal) override;
Label* on_equal); void CheckCharacterGT(uc16 limit, Label* on_greater) override;
virtual void CheckCharacterGT(uc16 limit, Label* on_greater); void CheckCharacterLT(uc16 limit, Label* on_less) override;
virtual void CheckCharacterLT(uc16 limit, Label* on_less);
// 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(uint32_t c, Label* on_not_equal); void CheckNotCharacter(uint32_t c, Label* on_not_equal) override;
virtual void CheckNotCharacterAfterAnd(uint32_t c, void CheckNotCharacterAfterAnd(uint32_t c, uint32_t mask,
uint32_t mask, Label* on_not_equal) override;
Label* on_not_equal); void CheckNotCharacterAfterMinusAnd(uc16 c, uc16 minus, uc16 mask,
virtual void CheckNotCharacterAfterMinusAnd(uc16 c, Label* on_not_equal) override;
uc16 minus, void CheckCharacterInRange(uc16 from, uc16 to, Label* on_in_range) override;
uc16 mask, void CheckCharacterNotInRange(uc16 from, uc16 to,
Label* on_not_equal); Label* on_not_in_range) override;
virtual void CheckCharacterInRange(uc16 from, void CheckBitInTable(Handle<ByteArray> table, Label* on_bit_set) override;
uc16 to,
Label* on_in_range);
virtual void CheckCharacterNotInRange(uc16 from,
uc16 to,
Label* on_not_in_range);
virtual void CheckBitInTable(Handle<ByteArray> table, Label* on_bit_set);
// 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(uc16 type, bool CheckSpecialCharacterClass(uc16 type, Label* on_no_match) override;
Label* on_no_match); void Fail() override;
virtual void Fail(); Handle<HeapObject> GetCode(Handle<String> source) override;
virtual Handle<HeapObject> GetCode(Handle<String> source); void GoTo(Label* label) override;
virtual void GoTo(Label* label); void IfRegisterGE(int reg, int comparand, Label* if_ge) override;
virtual void IfRegisterGE(int reg, int comparand, Label* if_ge); void IfRegisterLT(int reg, int comparand, Label* if_lt) override;
virtual void IfRegisterLT(int reg, int comparand, Label* if_lt); void IfRegisterEqPos(int reg, Label* if_eq) override;
virtual void IfRegisterEqPos(int reg, Label* if_eq); IrregexpImplementation Implementation() override;
virtual IrregexpImplementation Implementation(); void LoadCurrentCharacter(int cp_offset, Label* on_end_of_input,
virtual void LoadCurrentCharacter(int cp_offset, bool check_bounds = true,
Label* on_end_of_input, int characters = 1) override;
bool check_bounds = true, void PopCurrentPosition() override;
int characters = 1); void PopRegister(int register_index) override;
virtual void PopCurrentPosition(); void PushBacktrack(Label* label) override;
virtual void PopRegister(int register_index); void PushCurrentPosition() override;
virtual void PushBacktrack(Label* label); void PushRegister(int register_index,
virtual void PushCurrentPosition(); StackCheckFlag check_stack_limit) override;
virtual void PushRegister(int register_index, void ReadCurrentPositionFromRegister(int reg) override;
StackCheckFlag check_stack_limit); void ReadStackPointerFromRegister(int reg) override;
virtual void ReadCurrentPositionFromRegister(int reg); void SetCurrentPositionFromEnd(int by) override;
virtual void ReadStackPointerFromRegister(int reg); void SetRegister(int register_index, int to) override;
virtual void SetCurrentPositionFromEnd(int by); bool Succeed() override;
virtual void SetRegister(int register_index, int to); void WriteCurrentPositionToRegister(int reg, int cp_offset) override;
virtual bool Succeed(); void ClearRegisters(int reg_from, int reg_to) override;
virtual void WriteCurrentPositionToRegister(int reg, int cp_offset); void WriteStackPointerToRegister(int reg) override;
virtual void ClearRegisters(int reg_from, int reg_to);
virtual void WriteStackPointerToRegister(int reg);
static Result Match(Handle<Code> regexp, static Result Match(Handle<Code> regexp,
Handle<String> subject, Handle<String> subject,
......
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