From 3ef787dbeca8a5fb1086949cda830dccee07bfbd Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 12 Apr 2012 10:51:47 +0100 Subject: Merge V8 at 3.9.24.13 Bug: 5688872 Change-Id: Id0aa8d23375030494d3189c31774059c0f5398fc --- src/regexp-macro-assembler.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/regexp-macro-assembler.cc') diff --git a/src/regexp-macro-assembler.cc b/src/regexp-macro-assembler.cc index f91ea934..b6fb3c52 100644 --- a/src/regexp-macro-assembler.cc +++ b/src/regexp-macro-assembler.cc @@ -81,7 +81,7 @@ const byte* NativeRegExpMacroAssembler::StringCharacterPosition( if (subject->IsAsciiRepresentation()) { const byte* address; if (StringShape(subject).IsExternal()) { - const char* data = ExternalAsciiString::cast(subject)->resource()->data(); + const char* data = ExternalAsciiString::cast(subject)->GetChars(); address = reinterpret_cast(data); } else { ASSERT(subject->IsSeqAsciiString()); @@ -92,7 +92,7 @@ const byte* NativeRegExpMacroAssembler::StringCharacterPosition( } const uc16* data; if (StringShape(subject).IsExternal()) { - data = ExternalTwoByteString::cast(subject)->resource()->data(); + data = ExternalTwoByteString::cast(subject)->GetChars(); } else { ASSERT(subject->IsSeqTwoByteString()); data = SeqTwoByteString::cast(subject)->GetChars(); @@ -133,7 +133,7 @@ NativeRegExpMacroAssembler::Result NativeRegExpMacroAssembler::Match( subject_ptr = slice->parent(); slice_offset = slice->offset(); } - // Ensure that an underlying string has the same ascii-ness. + // Ensure that an underlying string has the same ASCII-ness. bool is_ascii = subject_ptr->IsAsciiRepresentation(); ASSERT(subject_ptr->IsExternalString() || subject_ptr->IsSeqString()); // String is now either Sequential or External -- cgit v1.2.3