Enable merging of comparisons into branches in checked mode.

runtime/vm/intermediate_language_ia32.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 173 matching lines @@
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = 0;
   LocationSummary* locs =
       new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
   locs->set_in(0, Location::RegisterLocation(EAX));
   locs->set_out(Location::RegisterLocation(EAX));
   return locs;
 }
 
 
+static void EmitAssertBoolean(Register reg,
+                              intptr_t token_pos,
+                              LocationSummary* locs,
+                              FlowGraphCompiler* compiler) {
+  // Check that the type of the value is allowed in conditional context.
+  // Call the runtime if the object is not bool::true or bool::false.
+  ASSERT(locs->always_calls());
+  Label done;
+  __ CompareObject(reg, compiler->bool_true());
+  __ j(EQUAL, &done, Assembler::kNearJump);
+  __ CompareObject(reg, compiler->bool_false());
+  __ j(EQUAL, &done, Assembler::kNearJump);

[srdjan, 2012/10/23 18:06:06]

Would it be faster to get cid of reg and check if it is Boolean?

[Florian Schneider, 2012/10/24 13:02:09]

I have not measured that yet, but I'll do a measurement once this is landed.

+
+  __ pushl(reg);  // Push the source object.
+  compiler->GenerateCallRuntime(token_pos,
+                                kConditionTypeErrorRuntimeEntry,
+                                locs);
+  // We should never return here.
+  __ int3();
+  __ Bind(&done);
+}
+
+
 void AssertBooleanInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register obj = locs()->in(0).reg();
   Register result = locs()->out().reg();
 
   if (!is_eliminated()) {
-    // Check that the type of the value is allowed in conditional context.
-    // Call the runtime if the object is not bool::true or bool::false.
-    Label done;
-    __ CompareObject(obj, compiler->bool_true());
-    __ j(EQUAL, &done, Assembler::kNearJump);
-    __ CompareObject(obj, compiler->bool_false());
-    __ j(EQUAL, &done, Assembler::kNearJump);
-
-    __ pushl(obj);  // Push the source object.
-    compiler->GenerateCallRuntime(token_pos(),
-                                  kConditionTypeErrorRuntimeEntry,
-                                  locs());
-    // We should never return here.
-    __ int3();
-    __ Bind(&done);
+    EmitAssertBoolean(obj, token_pos(), locs(), compiler);
   }
   ASSERT(obj == result);
 }
 
 
 LocationSummary* ArgumentDefinitionTestInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = 0;
   LocationSummary* locs =
       new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
@@ skipping 226 matching lines @@
           Label false_label;
           __ CompareObject(EAX, compiler->bool_true());
           __ j(EQUAL, &false_label, Assembler::kNearJump);
           __ LoadObject(EAX, compiler->bool_true());
           __ jmp(&done);
           __ Bind(&false_label);
           __ LoadObject(EAX, compiler->bool_false());
           __ jmp(&done);
         }
       } else {
+        if (branch->is_checked()) {
+          EmitAssertBoolean(EAX, token_pos, locs, compiler);
+        }
         __ CompareObject(EAX, compiler->bool_true());
         branch->EmitBranchOnCondition(compiler, cond);
       }
     }
     __ jmp(&done);
     __ Bind(&next_test);
   }
   // Fall through leads to deoptimization
   __ jmp(deopt);
   __ Bind(&done);
@@ skipping 300 matching lines @@
   }
   Register left = locs()->in(0).reg();
   Register right = locs()->in(1).reg();
   __ pushl(left);
   __ pushl(right);
   EmitEqualityAsInstanceCall(compiler,
                              deopt_id(),
                              token_pos(),
                              Token::kEQ,  // kNE reverse occurs at branch.
                              locs());
+  if (branch->is_checked()) {
+    EmitAssertBoolean(EAX, token_pos(), locs(), compiler);
+  }
   Condition branch_condition = (kind() == Token::kNE) ? NOT_EQUAL : EQUAL;
   __ CompareObject(EAX, compiler->bool_true());
   branch->EmitBranchOnCondition(compiler, branch_condition);
 }
 
 
 LocationSummary* RelationalOpInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 2;
   const intptr_t kNumTemps = 0;
   if (operands_class_id() == kDoubleCid) {
@@ skipping 1778 matching lines @@
   __ pcmpeqq(XMM0, XMM0);  // Generate all 1's.
   __ pxor(value, XMM0);
 }
 
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64