Check boolean conversion in checked mode.

lib/compiler/implementation/ssa/builder.dart

 // 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.
 
 class Interceptors {
   Compiler compiler;
   Interceptors(Compiler this.compiler);
 
   SourceString mapOperatorToMethodName(Operator op) {
     String name = op.source.stringValue;
@@ skipping 1334 matching lines @@
         || functionElement.isGenerativeConstructor()) {
       ClassElement cls = functionElement.enclosingElement;
       cls.typeVariables.forEach((TypeVariableType typeVariable) {
         HParameterValue param = new HParameterValue(typeVariable.element);
         add(param);
         localsHandler.directLocals[typeVariable.element] = param;
       });
     }
   }
 
-  HInstruction potentiallyCheckType(HInstruction original,
-                                    Element sourceElement) {
+  HInstruction potentiallyCheckType(
+      HInstruction original, Element sourceElement,
+      { int kind: HTypeConversion.CHECKED_MODE_CHECK }) {
     if (!compiler.enableTypeAssertions) return original;
-    HInstruction other = original.convertType(
-        compiler, sourceElement, HTypeConversion.CHECKED_MODE_CHECK);
+    HInstruction other = original.convertType(compiler, sourceElement, kind);
     if (other != original) add(other);
     return other;
   }
 
   HGraph closeFunction() {
     // TODO(kasperl): Make this goto an implicit return.
     if (!isAborted()) close(new HGoto()).addSuccessor(graph.exit);
     graph.finalize();
     return graph;
   }
@@ skipping 56 matching lines @@
   }
 
   HInstruction pop() {
     return stack.removeLast();
   }
 
   void dup() {
     stack.add(stack.last());
   }
 
-  HBoolify popBoolified() {
-    HBoolify boolified = new HBoolify(pop());
-    add(boolified);
-    return boolified;
+  HInstruction popBoolified() {
+    HInstruction result;

[kasperl, 2012/09/13 10:34:19]

Maybe move this to the else branch and just return the result of calling
potentiallyCheckType?

[ngeoffray, 2012/09/13 10:52:32]

Done.

+    HInstruction value = pop();
+    if (compiler.enableTypeAssertions) {
+      result = potentiallyCheckType(
+          value,
+          compiler.boolClass,
+          kind: HTypeConversion.BOOLEAN_CONVERSION_CHECK);
+    } else {
+      result = new HBoolify(value);
+      add(result);
+    }
+    return result;
   }
 
   HInstruction attachPosition(HInstruction target, Node node) {
     target.sourcePosition = sourceFileLocationForToken(node.getBeginToken());
     return target;
   }
 
   SourceFileLocation sourceFileLocationForToken(Token token) {
     Element element = sourceElementStack.last();
     // TODO(johnniwinther): remove the 'element.patch' hack.
@@ skipping 2719 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }