diff options
| author | isaacs <i@izs.me> | 2012-05-29 15:05:24 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-06-01 22:31:04 -0700 |
| commit | cbdf3393a21690178822c2d6ce2513270d70a02e (patch) | |
| tree | ebbf375e5d7aa32bf5fe988d2b3fe5fe788b404d /deps/v8/src/regexp-macro-assembler.cc | |
| parent | 0262b6d2a563e8b96f02c3066b69fed66d956675 (diff) | |
| download | node-cbdf3393a21690178822c2d6ce2513270d70a02e.tar.gz | |
Upgrade v8 to 3.11.7
Diffstat (limited to 'deps/v8/src/regexp-macro-assembler.cc')
| -rw-r--r-- | deps/v8/src/regexp-macro-assembler.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/deps/v8/src/regexp-macro-assembler.cc b/deps/v8/src/regexp-macro-assembler.cc index b6fb3c521..08568de9e 100644 --- a/deps/v8/src/regexp-macro-assembler.cc +++ b/deps/v8/src/regexp-macro-assembler.cc @@ -1,4 +1,4 @@ -// Copyright 2008 the V8 project authors. All rights reserved. +// Copyright 2012 the V8 project authors. All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are // met: @@ -35,7 +35,9 @@ namespace v8 { namespace internal { -RegExpMacroAssembler::RegExpMacroAssembler() : slow_safe_compiler_(false) { +RegExpMacroAssembler::RegExpMacroAssembler() + : slow_safe_compiler_(false), + global_(false) { } @@ -149,6 +151,7 @@ NativeRegExpMacroAssembler::Result NativeRegExpMacroAssembler::Match( input_start, input_end, offsets_vector, + offsets_vector_length, isolate); return res; } @@ -161,6 +164,7 @@ NativeRegExpMacroAssembler::Result NativeRegExpMacroAssembler::Execute( const byte* input_start, const byte* input_end, int* output, + int output_size, Isolate* isolate) { ASSERT(isolate == Isolate::Current()); // Ensure that the minimum stack has been allocated. @@ -174,10 +178,10 @@ NativeRegExpMacroAssembler::Result NativeRegExpMacroAssembler::Execute( input_start, input_end, output, + output_size, stack_base, direct_call, isolate); - ASSERT(result <= SUCCESS); ASSERT(result >= RETRY); if (result == EXCEPTION && !isolate->has_pending_exception()) { |