Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(631)

Side by Side Diff: src/jsregexp.cc

Issue 10442015: Rollback of r11638, r11636 on trunk branch. (Closed) Base URL: https://v8.googlecode.com/svn/trunk
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/ic.cc ('k') | src/lithium.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 ? SearchString(isolate, 317 ? SearchString(isolate,
318 subject_content.ToAsciiVector(), 318 subject_content.ToAsciiVector(),
319 needle_content.ToUC16Vector(), 319 needle_content.ToUC16Vector(),
320 index) 320 index)
321 : SearchString(isolate, 321 : SearchString(isolate,
322 subject_content.ToUC16Vector(), 322 subject_content.ToUC16Vector(),
323 needle_content.ToUC16Vector(), 323 needle_content.ToUC16Vector(),
324 index))); 324 index)));
325 if (index == -1) return isolate->factory()->null_value(); 325 if (index == -1) return isolate->factory()->null_value();
326 } 326 }
327 ASSERT(last_match_info->HasFastObjectElements()); 327 ASSERT(last_match_info->HasFastElements());
328 328
329 { 329 {
330 NoHandleAllocation no_handles; 330 NoHandleAllocation no_handles;
331 FixedArray* array = FixedArray::cast(last_match_info->elements()); 331 FixedArray* array = FixedArray::cast(last_match_info->elements());
332 SetAtomLastCapture(array, *subject, index, index + needle_len); 332 SetAtomLastCapture(array, *subject, index, index + needle_len);
333 } 333 }
334 return last_match_info; 334 return last_match_info;
335 } 335 }
336 336
337 337
(...skipping 5566 matching lines...) Expand 10 before | Expand all | Expand 10 after
5904 macro_assembler.set_global(is_global); 5904 macro_assembler.set_global(is_global);
5905 5905
5906 return compiler.Assemble(&macro_assembler, 5906 return compiler.Assemble(&macro_assembler,
5907 node, 5907 node,
5908 data->capture_count, 5908 data->capture_count,
5909 pattern); 5909 pattern);
5910 } 5910 }
5911 5911
5912 5912
5913 }} // namespace v8::internal 5913 }} // namespace v8::internal
OLDNEW
« no previous file with comments | « src/ic.cc ('k') | src/lithium.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698