src/arm/ic-arm.cc - Issue 142893003: Merge bleeding_edge 18658:18677

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/arm/ic-arm.cc

Issue 142893003: Merge bleeding_edge 18658:18677 (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/parser

Patch Set: Created 6 years, 11 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:

Index: src/arm/ic-arm.cc

diff --git a/src/arm/ic-arm.cc b/src/arm/ic-arm.cc

index c43012a7b130dbc4f460152edec9bb6b48a2d3f5..5ccbd734358a240fc9e6b3b88977032cd243d4ea 100644

--- a/src/arm/ic-arm.cc

+++ b/src/arm/ic-arm.cc

@@ -647,7 +647,7 @@ void LoadIC::GenerateMegamorphic(MacroAssembler* masm, ContextualMode mode) {

// -----------------------------------

// Probe the stub cache.

- ExtraICState extra_ic_state = IC::ComputeExtraICState(mode);

+ ExtraICState extra_ic_state = LoadIC::ComputeExtraICState(mode);

Code::Flags flags = Code::ComputeFlags(

Code::HANDLER, MONOMORPHIC, extra_ic_state,

Code::NORMAL, Code::LOAD_IC);

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