third_party/WebKit/JavaScriptCore/bytecompiler/CodeGenerator.h - Issue 10670: Do another merge using nifty new merge script (CL for that coming soon).

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: third_party/WebKit/JavaScriptCore/bytecompiler/CodeGenerator.h

Issue 10670: Do another merge using nifty new merge script (CL for that coming soon). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years, 1 month 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

« no previous file with comments | « third_party/WebKit/JavaScriptCore/VM/Machine.cpp ('k') | third_party/WebKit/JavaScriptCore/bytecompiler/CodeGenerator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/JavaScriptCore/bytecompiler/CodeGenerator.h

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

--- third_party/WebKit/JavaScriptCore/bytecompiler/CodeGenerator.h (revision 5296)

+++ third_party/WebKit/JavaScriptCore/bytecompiler/CodeGenerator.h (working copy)

@@ -273,8 +273,8 @@

RegisterID* emitPutGetter(RegisterID* base, const Identifier& property, RegisterID* value);

RegisterID* emitPutSetter(RegisterID* base, const Identifier& property, RegisterID* value);

- RegisterID* emitCall(RegisterID* dst, RegisterID* func, RegisterID* base, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);

- RegisterID* emitCallEval(RegisterID* dst, RegisterID* func, RegisterID* base, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);

+ RegisterID* emitCall(RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);

+ RegisterID* emitCallEval(RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);

RegisterID* emitReturn(RegisterID* src);

RegisterID* emitEnd(RegisterID* src) { return emitUnaryNoDstOp(op_end, src); }

@@ -345,7 +345,7 @@

typedef HashMap<double, JSValue*> NumberMap;

typedef HashMap<UString::Rep*, JSString*, IdentifierRepHash> IdentifierStringMap;

- RegisterID* emitCall(OpcodeID, RegisterID*, RegisterID*, RegisterID*, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);

+ RegisterID* emitCall(OpcodeID, RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);

RegisterID* newRegister();