diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 09:54:21 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-15 09:54:21 +0000 |
| commit | d0582a6c46733687d045e4188a1bcd0123c758a1 (patch) | |
| tree | 4139657adad206f69647f3d03f6fb2da2e8ae14e /src/regexp-macro-assembler.cc | |
| parent | 3ce2e2076e8e3e60cf1810eec160ea2d8557e9e7 (diff) | |
| download | android_external_v8-d0582a6c46733687d045e4188a1bcd0123c758a1.tar.gz android_external_v8-d0582a6c46733687d045e4188a1bcd0123c758a1.tar.bz2 android_external_v8-d0582a6c46733687d045e4188a1bcd0123c758a1.zip | |
Update V8 to r3431 as required by WebKit r51976.
Change-Id: I567392c3f8c0a0d5201a4249611ac4ccf468cd5b
Diffstat (limited to 'src/regexp-macro-assembler.cc')
| -rw-r--r-- | src/regexp-macro-assembler.cc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/regexp-macro-assembler.cc b/src/regexp-macro-assembler.cc index 0d00ceec..9ae19d72 100644 --- a/src/regexp-macro-assembler.cc +++ b/src/regexp-macro-assembler.cc @@ -30,13 +30,7 @@ #include "assembler.h" #include "regexp-stack.h" #include "regexp-macro-assembler.h" -#if V8_TARGET_ARCH_ARM -#include "arm/simulator-arm.h" -#elif V8_TARGET_ARCH_IA32 -#include "ia32/simulator-ia32.h" -#elif V8_TARGET_ARCH_X64 -#include "x64/simulator-x64.h" -#endif +#include "simulator.h" namespace v8 { namespace internal { @@ -130,11 +124,6 @@ NativeRegExpMacroAssembler::Result NativeRegExpMacroAssembler::Match( if (StringShape(subject_ptr).IsCons()) { subject_ptr = ConsString::cast(subject_ptr)->first(); - } else if (StringShape(subject_ptr).IsSliced()) { - SlicedString* slice = SlicedString::cast(subject_ptr); - start_offset += slice->start(); - end_offset += slice->start(); - subject_ptr = slice->buffer(); } // Ensure that an underlying string has the same ascii-ness. ASSERT(subject_ptr->IsAsciiRepresentation() == is_ascii); |