src/regexp-macro-assembler.cc - Issue 6697023: Merge 6800:7180 from the bleeding edge branch to the experimental/gc branch.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/regexp-macro-assembler.cc

Issue 6697023: Merge 6800:7180 from the bleeding edge branch to the experimental/gc branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/

Patch Set: Created 9 years, 9 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 side-by-side diff with in-line comments

Download patch

Index: src/regexp-macro-assembler.cc

===================================================================

--- src/regexp-macro-assembler.cc (revision 7180)

+++ src/regexp-macro-assembler.cc (working copy)

@@ -154,16 +154,12 @@

const byte* input_start,

const byte* input_end,

int* output) {

- typedef int (*matcher)(String*, int, const byte*,

- const byte*, int*, Address, int);

- matcher matcher_func = FUNCTION_CAST<matcher>(code->entry());

// Ensure that the minimum stack has been allocated.

RegExpStack stack;

Address stack_base = RegExpStack::stack_base();

int direct_call = 0;

- int result = CALL_GENERATED_REGEXP_CODE(matcher_func,

+ int result = CALL_GENERATED_REGEXP_CODE(code->entry(),

input,

start_offset,

input_start,

« no previous file with comments | « src/regexp.js ('k') | src/runtime.h » ('j') | no next file with comments »