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

Unified Diff: runtime/vm/code_generator_ia32.cc

Issue 10080015: Implement checked mode in new compiler. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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
« no previous file with comments | « no previous file | runtime/vm/flow_graph_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/code_generator_ia32.cc
===================================================================
--- runtime/vm/code_generator_ia32.cc (revision 6541)
+++ runtime/vm/code_generator_ia32.cc (working copy)
@@ -1750,6 +1750,11 @@
__ CompareObject(EDX, Type::ZoneHandle(Type::NumberInterface()));
__ j(EQUAL, &done, Assembler::kNearJump);
__ Bind(&not_smi);
+ // The instantiated type parameter may not be a Type, but could be an
+ // InstantiatedType. It is therefore necessary to check its class.
+ __ movl(ECX, FieldAddress(EDX, Object::class_offset()));
+ __ CompareObject(ECX, Object::ZoneHandle(Object::type_class()));
+ __ j(NOT_EQUAL, &fall_through, Assembler::kNearJump);
__ movl(EDX, FieldAddress(EDX, Type::type_class_offset()));
__ movl(ECX, FieldAddress(EDX, Class::type_parameters_offset()));
// Check that class of dst_type has no type parameters.
« no previous file with comments | « no previous file | runtime/vm/flow_graph_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698