Use JavaScript runtime semantics when constant folding.

lib/compiler/implementation/compile_time_constants.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 Constant implements Hashable {
   const Constant();
 
   bool isNull() => false;
   bool isBool() => false;
   bool isTrue() => false;
   bool isFalse() => false;
   bool isInt() => false;
   bool isDouble() => false;
   bool isNum() => false;
   bool isString() => false;
   bool isList() => false;
   bool isMap() => false;
   bool isConstructedObject() => false;
   /** Returns true if the constant is null, a bool, a number or a string. */
   bool isPrimitive() => false;
   /** Returns true if the constant is a list, a map or a constructed object. */
   bool isObject() => false;
 
   bool isNaN() => false;
+  bool isMinusZero() => false;
 
   abstract void _writeJsCode(CodeBuffer buffer, ConstantHandler handler);
   /**
     * Unless the constant can be emitted multiple times (as for numbers and
     * strings) adds its canonical name to the buffer.
     */
   abstract void _writeCanonicalizedJsCode(CodeBuffer buffer,
                                           ConstantHandler handler);
   abstract List<Constant> getDependencies();
 }
@@ skipping 98 matching lines @@
       return const DoubleConstant._internal(0.0);
     } else if (value == 1.0) {
       return const DoubleConstant._internal(1.0);
     } else {
       return new DoubleConstant._internal(value);
     }
   }
   const DoubleConstant._internal(this.value);
   bool isDouble() => true;
   bool isNaN() => value.isNaN();
+  bool isMinusZero() => value == 0.0 && value.isNegative();

[ngeoffray, 2012/08/17 08:32:59]

Please add a comment why -0.0 doesn't work.

[floitsch, 2012/09/03 14:34:52]

Done.

 
   void _writeJsCode(CodeBuffer buffer, ConstantHandler handler) {
     if (value.isNaN()) {
       buffer.add("(0/0)");
     } else if (value == double.INFINITY) {
       buffer.add("(1/0)");
     } else if (value == -double.INFINITY) {
       buffer.add("(-1/0)");
     } else {
       buffer.add("$value");
@@ skipping 17 matching lines @@
   DartString toDartString() => new DartString.literal(value.toString());
 }
 
 class BoolConstant extends PrimitiveConstant {
   factory BoolConstant(value) {
     return value ? new TrueConstant() : new FalseConstant();
   }
   const BoolConstant._internal();
   bool isBool() => true;
 
-  BoolConstant unaryFold(String op) {
-    if (op == "!") return new BoolConstant(!value);
-    return null;
-  }
-
   abstract BoolConstant negate();
 }
 
 class TrueConstant extends BoolConstant {
   final bool value = true;
 
   factory TrueConstant() => const TrueConstant._internal();
   const TrueConstant._internal() : super._internal();
   bool isTrue() => true;
 
@@ skipping 279 matching lines @@
   int hashCode() => _hashCode;
   List<Constant> getDependencies() => fields;
 }
 
 /**
  * The [ConstantHandler] keeps track of compile-time constants,
  * initializations of global and static fields, and default values of
  * optional parameters.
  */
 class ConstantHandler extends CompilerTask {
+  final FoldingOperations foldingOperations;
   // Contains the initial value of fields. Must contain all static and global
   // initializations of used fields. May contain caches for instance fields.
   final Map<VariableElement, Constant> initialVariableValues;
 
   // Map from compile-time constants to their JS name.
   final Map<Constant, String> compiledConstants;
 
   // The set of variable elements that are in the process of being computed.
   final Set<VariableElement> pendingVariables;
 
-  ConstantHandler(Compiler compiler)
+  ConstantHandler(Compiler compiler, this.foldingOperations)
       : initialVariableValues = new Map<VariableElement, Dynamic>(),
         compiledConstants = new Map<Constant, String>(),
         pendingVariables = new Set<VariableElement>(),
         super(compiler);
   String get name() => 'ConstantHandler';
 
   void registerCompileTimeConstant(Constant constant) {
     Function ifAbsentThunk = (() => compiler.namer.getFreshGlobalName("CTC"));
     compiledConstants.putIfAbsent(constant, ifAbsentThunk);
   }
@@ skipping 52 matching lines @@
       }
       initialVariableValues[element] = value;
       pendingVariables.remove(element);
       return value;
     });
   }
 
   Constant compileNodeWithDefinitions(Node node, TreeElements definitions) {
     return measure(() {
       assert(node !== null);
-      CompileTimeConstantEvaluator evaluator =
-          new CompileTimeConstantEvaluator(definitions, compiler);
+      CompileTimeConstantEvaluator evaluator = new CompileTimeConstantEvaluator(
+          foldingOperations, definitions, compiler);
       return evaluator.evaluate(node);
     });
   }
 
   /** Attempts to compile a constant expression. Returns null if not possible */
   Constant tryCompileNodeWithDefinitions(Node node, TreeElements definitions) {
     return measure(() {
       assert(node !== null);
       try {
         TryCompileTimeConstantEvaluator evaluator =
-            new TryCompileTimeConstantEvaluator(definitions, compiler);
+            new TryCompileTimeConstantEvaluator(foldingOperations,
+                                                definitions,
+                                                compiler);
         return evaluator.evaluate(node);
       } catch (CompileTimeConstantError exn) {
         return null;
       }
     });
   }
 
   /**
    * Returns a [List] of static non final fields that need to be initialized.
    * The list must be evaluated in order since the fields might depend on each
@@ skipping 116 matching lines @@
       }
     }
   }
 
   String getJsConstructor(ClassElement element) {
     return compiler.namer.isolatePropertiesAccess(element);
   }
 }
 
 class CompileTimeConstantEvaluator extends AbstractVisitor {
+  final FoldingOperations foldingOperations;
   final TreeElements elements;
   final Compiler compiler;
 
-  CompileTimeConstantEvaluator(this.elements, this.compiler);
+  CompileTimeConstantEvaluator(this.foldingOperations,
+                               this.elements,
+                               this.compiler);
 
   Constant evaluate(Node node) {
     return node.accept(this);
   }
 
   visitNode(Node node) {
     error(node);
   }
 
   Constant visitLiteralBool(LiteralBool node) {
@@ skipping 113 matching lines @@
         error(send);
       }
       return compiler.compileVariable(element);
     } else if (send.isPrefix) {
       assert(send.isOperator);
       Constant receiverConstant = evaluate(send.receiver);
       Operator op = send.selector;
       Constant folded;
       switch (op.source.stringValue) {
         case "!":
-          folded = const NotOperation().fold(receiverConstant);
+          folded = foldingOperations.not.fold(receiverConstant);
           break;
         case "-":
-          folded = const NegateOperation().fold(receiverConstant);
+          folded = foldingOperations.negate.fold(receiverConstant);
           break;
         case "~":
-          folded = const BitNotOperation().fold(receiverConstant);
+          folded = foldingOperations.bitNot.fold(receiverConstant);
           break;
         default:
           compiler.internalError("Unexpected operator.", node: op);
           break;
       }
       if (folded === null) error(send);
       return folded;
     } else if (send.isOperator && !send.isPostfix) {
       assert(send.argumentCount() == 1);
       Constant left = evaluate(send.receiver);
       Constant right = evaluate(send.argumentsNode.nodes.head);
       Operator op = send.selector.asOperator();
       Constant folded = null;
       switch (op.source.stringValue) {
         case "+":
-          folded = const AddOperation().fold(left, right);
+          folded = foldingOperations.add.fold(left, right);
           break;
         case "-":
-          folded = const SubtractOperation().fold(left, right);
+          folded = foldingOperations.subtract.fold(left, right);
           break;
         case "*":
-          folded = const MultiplyOperation().fold(left, right);
+          folded = foldingOperations.multiply.fold(left, right);
           break;
         case "/":
-          folded = const DivideOperation().fold(left, right);
+          folded = foldingOperations.divide.fold(left, right);
           break;
         case "%":
-          folded = const ModuloOperation().fold(left, right);
+          folded = foldingOperations.modulo.fold(left, right);
           break;
         case "~/":
-          folded = const TruncatingDivideOperation().fold(left, right);
+          folded = foldingOperations.truncatingDivide.fold(left, right);
           break;
         case "|":
-          folded = const BitOrOperation().fold(left, right);
+          folded = foldingOperations.bitOr.fold(left, right);
           break;
         case "&":
-          folded = const BitAndOperation().fold(left, right);
+          folded = foldingOperations.bitAnd.fold(left, right);
           break;
         case "^":
-          folded = const BitXorOperation().fold(left, right);
+          folded = foldingOperations.bitXor.fold(left, right);
           break;
         case "||":
-          folded = const BooleanOr().fold(left, right);
+          folded = foldingOperations.booleanOr.fold(left, right);
           break;
         case "&&":
-          folded = const BooleanAnd().fold(left, right);
+          folded = foldingOperations.booleanAnd.fold(left, right);
           break;
         case "<<":
-          folded = const ShiftLeftOperation().fold(left, right);
+          folded = foldingOperations.shiftLeft.fold(left, right);
           break;
         case ">>":
-          folded = const ShiftRightOperation().fold(left, right);
+          folded = foldingOperations.shiftRight.fold(left, right);
           break;
         case "<":
-          folded = const LessOperation().fold(left, right);
+          folded = foldingOperations.less.fold(left, right);
           break;
         case "<=":
-          folded = const LessEqualOperation().fold(left, right);
+          folded = foldingOperations.lessEqual.fold(left, right);
           break;
         case ">":
-          folded = const GreaterOperation().fold(left, right);
+          folded = foldingOperations.greater.fold(left, right);
           break;
         case ">=":
-          folded = const GreaterEqualOperation().fold(left, right);
+          folded = foldingOperations.greaterEqual.fold(left, right);
           break;
         case "==":
           if (left.isPrimitive() && right.isPrimitive()) {
-            folded = const EqualsOperation().fold(left, right);
+            folded = foldingOperations.equal.fold(left, right);
           }
           break;
         case "===":
           if (left.isPrimitive() && right.isPrimitive()) {
-            folded = const IdentityOperation().fold(left, right);
+            folded = foldingOperations.identity.fold(left, right);
           }
           break;
         case "!=":
           if (left.isPrimitive() && right.isPrimitive()) {
-            BoolConstant areEquals = const EqualsOperation().fold(left, right);
+            BoolConstant areEquals = foldingOperations.equal.fold(left, right);
             if (areEquals === null) {
               folded = null;
             } else {
               folded = areEquals.negate();
             }
           }
           break;
         case "!==":
           if (left.isPrimitive() && right.isPrimitive()) {
             BoolConstant areIdentical =
-                const IdentityOperation().fold(left, right);
+                foldingOperations.identity.fold(left, right);
             if (areIdentical === null) {
               folded = null;
             } else {
               folded = areIdentical.negate();
             }
           }
           break;
       }
       if (folded === null) error(send);
       return folded;
@@ skipping 32 matching lines @@
     if (classElement.isInterface()) {
       compiler.resolver.resolveMethodElement(constructor);
       constructor = constructor.defaultImplementation;
       classElement = constructor.getEnclosingClass();
     }
 
     Selector selector = elements.getSelector(send);
     List<Constant> arguments =
         evaluateArgumentsToConstructor(selector, send.arguments, constructor);
     ConstructorEvaluator evaluator =
-        new ConstructorEvaluator(constructor, compiler);
+        new ConstructorEvaluator(constructor, foldingOperations, compiler);
     evaluator.evaluateConstructorFieldValues(arguments);
     List<Constant> jsNewArguments = evaluator.buildJsNewArguments(classElement);
 
     compiler.registerInstantiatedClass(classElement);
     // TODO(floitsch): take generic types into account.
     Type type = classElement.computeType(compiler);
     Constant constant = new ConstructedConstant(type, jsNewArguments);
     compiler.constantHandler.registerCompileTimeConstant(constant);
     return constant;
   }
 
   Constant visitParenthesizedExpression(ParenthesizedExpression node) {
     return node.expression.accept(this);
   }
 
   error(Node node) {
     // TODO(floitsch): get the list of constants that are currently compiled
     // and present some kind of stack-trace.
     MessageKind kind = MessageKind.NOT_A_COMPILE_TIME_CONSTANT;
     compiler.reportError(node, new CompileTimeConstantError(kind, const []));
   }
 }
 
 class TryCompileTimeConstantEvaluator extends CompileTimeConstantEvaluator {
-  TryCompileTimeConstantEvaluator(TreeElements elements, Compiler compiler):
-      super(elements, compiler);
+  TryCompileTimeConstantEvaluator(FoldingOperations foldingOperations,
+                                  TreeElements elements,
+                                  Compiler compiler):
+      super(foldingOperations, elements, compiler);
 
   error(Node node) {
     // Just fail without reporting it anywhere.
     throw new CompileTimeConstantError(
         MessageKind.NOT_A_COMPILE_TIME_CONSTANT, const []);
   }
 }
 
 class ConstructorEvaluator extends CompileTimeConstantEvaluator {
   FunctionElement constructor;
   final Map<Element, Constant> definitions;
   final Map<Element, Constant> fieldValues;
 
-  ConstructorEvaluator(FunctionElement constructor, Compiler compiler)
+  ConstructorEvaluator(FunctionElement constructor,
+                       FoldingOperations foldingOperations,
+                       Compiler compiler)
       : this.constructor = constructor,
         this.definitions = new Map<Element, Constant>(),
         this.fieldValues = new Map<Element, Constant>(),
-        super(compiler.resolver.resolveMethodElement(constructor),
+        super(foldingOperations,
+              compiler.resolver.resolveMethodElement(constructor),
               compiler);
 
   Constant visitSend(Send send) {
     Element element = elements[send];
     if (Elements.isLocal(element)) {
       Constant constant = definitions[element];
       if (constant === null) {
         compiler.internalError("Local variable without value", node: send);
       }
       return constant;
@@ skipping 19 matching lines @@
       }
     });
   }
 
   void evaluateSuperOrRedirectSend(Selector selector,
                                    Link<Node> arguments,
                                    FunctionElement targetConstructor) {
     List<Constant> compiledArguments =
         evaluateArgumentsToConstructor(selector, arguments, targetConstructor);
 
-    ConstructorEvaluator evaluator =
-        new ConstructorEvaluator(targetConstructor, compiler);
+    ConstructorEvaluator evaluator = new ConstructorEvaluator(
+        targetConstructor, foldingOperations, compiler);
     evaluator.evaluateConstructorFieldValues(compiledArguments);
     // Copy over the fieldValues from the super/redirect-constructor.
     evaluator.fieldValues.forEach((key, value) => fieldValues[key] = value);
   }
 
   /**
    * Runs through the initializers of the given [constructor] and updates
    * the [fieldValues] map.
    */
   void evaluateConstructorInitializers() {
@@ skipping 72 matching lines @@
       Constant fieldValue = fieldValues[field];
       if (fieldValue === null) {
         // Use the default value.
         fieldValue = compiler.compileVariable(field);
       }
       jsNewArguments.add(fieldValue);
     });
     return jsNewArguments;
   }
 }