The simplest change to enable optimizing compiler in type checked mode. Every node that needs type checking code will be executed by unoptimized code.

Review URL: https://chromereviews.googleplex.com/3577012

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@208 260f80e4-7a28-3924-810f-c04153c831b5

runtime/vm/code_generator_ia32.cc

@@ -328,8 +328,7 @@ void CodeGenerator::GeneratePreEntryCode() {
   const bool may_optimize =
       !FLAG_report_invocation_count &&
       (FLAG_optimization_invocation_threshold >= 0) &&
-      parsed_function_.function().is_optimizable() &&
-      !FLAG_enable_type_checks;
+      parsed_function_.function().is_optimizable();
   // Count invocation and check.
   if (FLAG_report_invocation_count || may_optimize) {
     const Function& function =

runtime/vm/intrinsifier_ia32.cc

@@ -23,6 +23,7 @@
 namespace dart {
 
 DEFINE_FLAG(bool, intrinsify, true, "Instrinsify when possible");
+DECLARE_FLAG(bool, enable_type_checks);
 
 // List of intrinsics: (class-name, function-name, intrinsification method).
 #define INTRINSIC_LIST(V)                                                      \
@@ -183,6 +184,9 @@ static bool Array_getIndexed(Assembler* assembler) {
 // Intrinsify only for Smi value and index. Non-smi values need a store buffer
 // update. Array length is always a Smi.
 static bool Array_setIndexed(Assembler* assembler) {
+  if (FLAG_enable_type_checks) {
+    return false;
+  }
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   Label fall_through;

runtime/vm/opt_code_generator_ia32.cc

@@ -20,6 +20,7 @@ namespace dart {
 #define __ assembler_->
 
 DEFINE_FLAG(bool, trace_optimization, false, "Trace optimizations.");
+DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, intrinsify);
 DECLARE_FLAG(bool, trace_functions);
 
@@ -478,6 +479,10 @@ void OptimizingCodeGenerator::VisitLoadLocalNode(LoadLocalNode* node) {
 
 
 void OptimizingCodeGenerator::VisitStoreLocalNode(StoreLocalNode* node) {
+  if (FLAG_enable_type_checks) {
+    CodeGenerator::VisitStoreLocalNode(node);
+    return;
+  }
   CodeGenInfo value_info(node->value());
   value_info.set_request_result_in_eax(true);
   node->value()->Visit(this);
@@ -995,6 +1000,10 @@ void OptimizingCodeGenerator::VisitBinaryOpNode(BinaryOpNode* node) {
   // Operators "&&" and "||" cannot be overloaded, therefore inline them
   // instead of calling the operator.
   if ((node->kind() == Token::kAND) || (node->kind() == Token::kOR)) {
+    if (FLAG_enable_type_checks) {
+      CodeGenerator::VisitBinaryOpNode(node);
+      return;
+    }
     GenerateLogicalBinaryOp(node);
     return;
   }
@@ -1030,6 +1039,10 @@ void OptimizingCodeGenerator::VisitBinaryOpNode(BinaryOpNode* node) {
 
 
 void OptimizingCodeGenerator::VisitIncrOpLocalNode(IncrOpLocalNode* node) {
+  if (FLAG_enable_type_checks) {
+    CodeGenerator::VisitIncrOpLocalNode(node);
+    return;
+  }
   const char* kOptMessage = "Inlines IncrOpLocal";
   ASSERT((node->kind() == Token::kINCR) || (node->kind() == Token::kDECR));
   if (!NodeHasOnlyClass(node, smi_class_)) {
@@ -1242,6 +1255,10 @@ void OptimizingCodeGenerator::VisitInstanceGetterNode(
 // The result of the assignment to a field is the value being stored.
 void OptimizingCodeGenerator::VisitInstanceSetterNode(
     InstanceSetterNode* node) {
+  if (FLAG_enable_type_checks) {
+    CodeGenerator::VisitInstanceSetterNode(node);
+    return;
+  }
   const char* kMessage = "Inline instance setter";
   const ZoneGrowableArray<const Class*>* classes =
       node->CollectedClassesAtId(node->id());
@@ -1740,6 +1757,10 @@ void OptimizingCodeGenerator::VisitLoadIndexedNode(LoadIndexedNode* node) {
 
 
 void OptimizingCodeGenerator::VisitStoreIndexedNode(StoreIndexedNode* node) {
+  if (FLAG_enable_type_checks) {
+    CodeGenerator::VisitStoreIndexedNode(node);
+    return;
+  }
   node->array()->Visit(this);
   // TODO(srdjan): Use VisitLoadTwo and check if index is smi (CodeGenInfo).
   ObjectStore* object_store = Isolate::Current()->object_store();
@@ -1778,6 +1799,10 @@ void OptimizingCodeGenerator::VisitStoreIndexedNode(StoreIndexedNode* node) {
 
 
 void OptimizingCodeGenerator::VisitForNode(ForNode* node) {
+  if (FLAG_enable_type_checks) {
+    CodeGenerator::VisitForNode(node);
+    return;
+  }
   const Bool& bool_true = Bool::ZoneHandle(Bool::True());
   node->initializer()->Visit(this);
   SourceLabel* label = node->label();
@@ -1808,6 +1833,10 @@ void OptimizingCodeGenerator::VisitForNode(ForNode* node) {
 
 
 void OptimizingCodeGenerator::VisitDoWhileNode(DoWhileNode* node) {
+  if (FLAG_enable_type_checks) {
+    CodeGenerator::VisitDoWhileNode(node);
+    return;
+  }
   const Bool& bool_true = Bool::ZoneHandle(Bool::True());
   SourceLabel* label = node->label();
   Label loop;
@@ -1830,6 +1859,10 @@ void OptimizingCodeGenerator::VisitDoWhileNode(DoWhileNode* node) {
 
 
 void OptimizingCodeGenerator::VisitWhileNode(WhileNode* node) {
+  if (FLAG_enable_type_checks) {
+    CodeGenerator::VisitWhileNode(node);
+    return;
+  }
   const Bool& bool_true = Bool::ZoneHandle(Bool::True());
   SourceLabel* label = node->label();
   __ Bind(label->continue_label());
@@ -1854,6 +1887,10 @@ void OptimizingCodeGenerator::VisitWhileNode(WhileNode* node) {
 
 
 void OptimizingCodeGenerator::VisitIfNode(IfNode* node) {
+  if (FLAG_enable_type_checks) {
+    CodeGenerator::VisitIfNode(node);
+    return;
+  }
   const Bool& bool_true = Bool::ZoneHandle(Bool::True());
   Label false_label, true_label, done;
   CodeGenInfo condition_info(node->condition());