From 813fbf95af77a531c57a8c497345ad2c61d475b3 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 18 Jun 2015 14:10:49 +0200 Subject: BASELINE: Update chromium to 44.0.2403.47 Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen --- chromium/v8/src/regexp-macro-assembler.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'chromium/v8/src/regexp-macro-assembler.h') diff --git a/chromium/v8/src/regexp-macro-assembler.h b/chromium/v8/src/regexp-macro-assembler.h index f72cc4d42db..c0a8d0027ed 100644 --- a/chromium/v8/src/regexp-macro-assembler.h +++ b/chromium/v8/src/regexp-macro-assembler.h @@ -32,6 +32,7 @@ class RegExpMacroAssembler { kARMImplementation, kARM64Implementation, kMIPSImplementation, + kPPCImplementation, kX64Implementation, kX87Implementation, kBytecodeImplementation @@ -42,7 +43,7 @@ class RegExpMacroAssembler { kCheckStackLimit = true }; - explicit RegExpMacroAssembler(Zone* zone); + RegExpMacroAssembler(Isolate* isolate, Zone* zone); virtual ~RegExpMacroAssembler(); // The maximal number of pushes between stack checks. Users must supply // kCheckStackLimit flag to push operations (instead of kNoStackLimitCheck) @@ -157,11 +158,13 @@ class RegExpMacroAssembler { return global_mode_ == GLOBAL; } + Isolate* isolate() const { return isolate_; } Zone* zone() const { return zone_; } private: bool slow_safe_compiler_; bool global_mode_; + Isolate* isolate_; Zone* zone_; }; @@ -184,7 +187,7 @@ class NativeRegExpMacroAssembler: public RegExpMacroAssembler { // capture positions. enum Result { RETRY = -2, EXCEPTION = -1, FAILURE = 0, SUCCESS = 1 }; - explicit NativeRegExpMacroAssembler(Zone* zone); + NativeRegExpMacroAssembler(Isolate* isolate, Zone* zone); virtual ~NativeRegExpMacroAssembler(); virtual bool CanReadUnaligned(); @@ -212,6 +215,12 @@ class NativeRegExpMacroAssembler: public RegExpMacroAssembler { static const byte* StringCharacterPosition(String* subject, int start_index); + static int CheckStackGuardState(Isolate* isolate, int start_index, + bool is_direct_call, Address* return_address, + Code* re_code, String** subject, + const byte** input_start, + const byte** input_end); + // Byte map of one byte characters with a 0xff if the character is a word // character (digit, letter or underscore) and 0x00 otherwise. // Used by generated RegExp code. -- cgit v1.2.1