Implement type cast in the VM.

runtime/vm/flow_graph_builder.cc

Index: runtime/vm/flow_graph_builder.cc
===================================================================
--- runtime/vm/flow_graph_builder.cc	(revision 9048)
+++ runtime/vm/flow_graph_builder.cc	(working copy)
@@ -311,7 +311,6 @@
 // destination type is Dynamic or if the static type of the value is a subtype
 // of the destination type.
 static bool CanSkipTypeCheck(Value* value, const AbstractType& dst_type) {
-  ASSERT(FLAG_enable_type_checks);
   ASSERT(!dst_type.IsNull());
   ASSERT(dst_type.IsFinalized());
   if (!FLAG_eliminate_type_checks) {
@@ -657,7 +656,7 @@
 }
 
 
-// Used to to test assignments.
+// Used for type casts and to test assignments.
 Value* EffectGraphVisitor::BuildAssignableValue(intptr_t token_pos,
                                                 Value* value,
                                                 const AbstractType& dst_type,
@@ -675,24 +674,42 @@
 }
 
 
-void EffectGraphVisitor::BuildInstanceOf(ComparisonNode* node) {
-  ASSERT(Token::IsInstanceofOperator(node->kind()));
+void EffectGraphVisitor::BuildTypeTest(ComparisonNode* node) {
+  ASSERT(Token::IsTypeTestOperator(node->kind()));
   EffectGraphVisitor for_left_value(owner(), temp_index());
   node->left()->Visit(&for_left_value);
   Append(for_left_value);
 }
 
 
-void ValueGraphVisitor::BuildInstanceOf(ComparisonNode* node) {
-  ASSERT(Token::IsInstanceofOperator(node->kind()));
+void EffectGraphVisitor::BuildTypeCast(ComparisonNode* node) {
+  ASSERT(Token::IsTypeCastOperator(node->kind()));
+  const AbstractType& type = node->right()->AsTypeNode()->type();
+  ASSERT(type.IsFinalized());  // The type in a type cast may be malformed.
+  ValueGraphVisitor for_value(owner(), temp_index());
+  node->left()->Visit(&for_value);
+  Append(for_value);
+  const String& dst_name = String::ZoneHandle(String::NewSymbol("type cast"));

[srdjan, 2012/06/23 00:04:29]

Factor out the string "type cast" used at least in two places.

[regis, 2012/06/25 17:34:56]

Done.

+  if (!CanSkipTypeCheck(for_value.value(), type)) {
+    AssertAssignableComp* assert_assignable =
+        BuildAssertAssignable(node->token_pos(),
+                              for_value.value(),
+                              type,
+                              dst_name);
+    AddInstruction(new DoInstr(assert_assignable));
+  }
+}
+
+
+void ValueGraphVisitor::BuildTypeTest(ComparisonNode* node) {
+  ASSERT(Token::IsTypeTestOperator(node->kind()));
   const Bool& bool_true = Bool::ZoneHandle(Bool::True());
   const Bool& bool_false = Bool::ZoneHandle(Bool::False());
   const AbstractType& type = node->right()->AsTypeNode()->type();
   ASSERT(type.IsFinalized() && !type.IsMalformed());
   const bool negate_result = (node->kind() == Token::kISNOT);
   // All objects are instances of type T if Object type is a subtype of type T.
-  const Type& object_type =
-      Type::Handle(Isolate::Current()->object_store()->object_type());
+  const Type& object_type = Type::Handle(Type::ObjectType());
   Error& malformed_error = Error::Handle();
   if (type.IsInstantiated() &&
       object_type.IsSubtypeOf(type, &malformed_error)) {
@@ -757,14 +774,32 @@
 }
 
 
+void ValueGraphVisitor::BuildTypeCast(ComparisonNode* node) {
+  ASSERT(Token::IsTypeCastOperator(node->kind()));
+  const AbstractType& type = node->right()->AsTypeNode()->type();
+  ASSERT(type.IsFinalized());  // The type in a type cast may be malformed.
+  ValueGraphVisitor for_value(owner(), temp_index());
+  node->left()->Visit(&for_value);
+  Append(for_value);
+  const String& dst_name = String::ZoneHandle(String::NewSymbol("type cast"));
+  ReturnValue(BuildAssignableValue(node->token_pos(),
+                                   for_value.value(),
+                                   type,
+                                   dst_name));
+}
+
+
 // <Expression> :: Comparison { kind:  Token::Kind
 //                              left:  <Expression>
 //                              right: <Expression> }
 // TODO(srdjan): Implement new equality.
 void EffectGraphVisitor::VisitComparisonNode(ComparisonNode* node) {
-  if (Token::IsInstanceofOperator(node->kind())) {
-    BuildInstanceOf(node);
+  if (Token::IsTypeTestOperator(node->kind())) {
+    BuildTypeTest(node);
     return;
+  } else if (Token::IsTypeCastOperator(node->kind())) {

[srdjan, 2012/06/23 00:04:29]

No else needed.

[regis, 2012/06/25 17:34:56]

Done.

+    BuildTypeCast(node);
+    return;
   }
   if ((node->kind() == Token::kEQ_STRICT) ||
       (node->kind() == Token::kNE_STRICT)) {