Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: runtime/vm/flow_graph_compiler_arm64.cc

Issue 289333004: Fixes bug in megamorphic instance call on arm64. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 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
« no previous file with comments | « no previous file | tests/language/language.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler_arm64.cc
===================================================================
--- runtime/vm/flow_graph_compiler_arm64.cc (revision 36300)
+++ runtime/vm/flow_graph_compiler_arm64.cc (working copy)
@@ -1278,8 +1278,8 @@
__ Bind(&loop);
__ and_(R3, R3, Operand(R1));
const intptr_t base = Array::data_offset();
- // R3 is smi tagged, but table entries are 8 bytes, so LSL 2.
- __ add(TMP, R2, Operand(R3, LSL, 2));
Florian Schneider 2014/05/20 13:12:49 Use kWordSizeLog2 instead.
+ // R3 is smi tagged, but table entries are 16 bytes, so LSL 3.
Florian Schneider 2014/05/20 13:12:49 ...entries are 2 words, so use LSL kWordSizeLog2.
+ __ add(TMP, R2, Operand(R3, LSL, 3));
Florian Schneider 2014/05/20 13:12:49 Use kWordSizeLog2 instead.
__ LoadFieldFromOffset(R4, TMP, base, PP);
ASSERT(kIllegalCid == 0);
@@ -1293,7 +1293,7 @@
// proper target for the given name and arguments descriptor. If the
// illegal class id was found, the target is a cache miss handler that can
// be invoked as a normal Dart function.
- __ add(TMP, R2, Operand(R3, LSL, 2));
Florian Schneider 2014/05/20 13:12:49 Use kWordSizeLog2 instead.
+ __ add(TMP, R2, Operand(R3, LSL, 3));
Florian Schneider 2014/05/20 13:12:49 Use kWordSizeLog2 instead.
__ LoadFieldFromOffset(R0, TMP, base + kWordSize, PP);
__ LoadFieldFromOffset(R1, R0, Function::code_offset(), PP);
__ LoadFieldFromOffset(R1, R1, Code::instructions_offset(), PP);
« no previous file with comments | « no previous file | tests/language/language.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698