src/x64/assembler-x64-inl.h - Issue 6873076: Revert revisions 7644 and 7632, they are causing assertion failures in interactive_ui_tests debug...

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/x64/assembler-x64-inl.h

Issue 6873076: Revert revisions 7644 and 7632, they are causing assertion failures in interactive_ui_tests debug... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/

Patch Set: Created 9 years, 8 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/x64/assembler-x64-inl.h

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

--- src/x64/assembler-x64-inl.h (revision 7663)

+++ src/x64/assembler-x64-inl.h (working copy)

@@ -61,15 +61,9 @@

}

-void Assembler::emit_code_target(Handle<Code> target,

- RelocInfo::Mode rmode,

- unsigned ast_id) {

+void Assembler::emit_code_target(Handle<Code> target, RelocInfo::Mode rmode) {

ASSERT(RelocInfo::IsCodeTarget(rmode));

- if (rmode == RelocInfo::CODE_TARGET && ast_id != kNoASTId) {

- RecordRelocInfo(RelocInfo::CODE_TARGET_WITH_ID, ast_id);

- } else {

- RecordRelocInfo(rmode);

- }

+ RecordRelocInfo(rmode);

int current = code_targets_.length();

if (current > 0 && code_targets_.last().is_identical_to(target)) {

// Optimization if we keep jumping to the same code target.

« no previous file with comments | « src/x64/assembler-x64.cc ('k') | src/x64/full-codegen-x64.cc » ('j') | no next file with comments »