src/ia32/regexp-macro-assembler-ia32.h - Issue 7060010: Merge bleeding edge into the GC branch up to 7948. The asserts

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/ia32/regexp-macro-assembler-ia32.h

Issue 7060010: Merge bleeding edge into the GC branch up to 7948. The asserts (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/

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

Download patch

Index: src/ia32/regexp-macro-assembler-ia32.h

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

--- src/ia32/regexp-macro-assembler-ia32.h (revision 7948)

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

@@ -80,7 +80,7 @@

virtual void CheckPosition(int cp_offset, Label* on_outside_input);

virtual bool CheckSpecialCharacterClass(uc16 type, Label* on_no_match);

virtual void Fail();

- virtual Handle<Object> GetCode(Handle<String> source);

+ virtual Handle<HeapObject> GetCode(Handle<String> source);

virtual void GoTo(Label* label);

virtual void IfRegisterGE(int reg, int comparand, Label* if_ge);

virtual void IfRegisterLT(int reg, int comparand, Label* if_lt);

@@ -168,7 +168,7 @@

// Equivalent to a conditional branch to the label, unless the label

// is NULL, in which case it is a conditional Backtrack.

- void BranchOrBacktrack(Condition condition, Label* to, Hint hint = no_hint);

+ void BranchOrBacktrack(Condition condition, Label* to);

// Call and return internally in the generated code in a way that

// is GC-safe (i.e., doesn't leave absolute code addresses on the stack)

« no previous file with comments | « src/ia32/macro-assembler-ia32-inl.h ('k') | src/ia32/regexp-macro-assembler-ia32.cc » ('j') | no next file with comments »