Stub implementation of patch invariants for the patch refactoring.

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.
 
 /**
  * The [ConstantHandler] keeps track of compile-time constants,
  * initializations of global and static fields, and default values of
  * optional parameters.
  */
 class ConstantHandler extends CompilerTask {
@@ skipping 511 matching lines @@
       if (folded === null) return signalNotCompileTimeConstant(send);
       return folded;
     }
     return signalNotCompileTimeConstant(send);
   }
 
   Constant visitSendSet(SendSet node) {
     return signalNotCompileTimeConstant(node);
   }
 
-  /** Returns the list of constants that are passed to the static function. */
+  /**
+   * Returns the list of constants that are passed to the static function.
+   *
+   * Invariant: [target] must be the implementation element.

[ahe, 2012/09/18 11:25:54]

the -> an.

[Johnni Winther, 2012/09/20 08:12:23]

Done.

+   */
   List<Constant> evaluateArgumentsToConstructor(Selector selector,
                                                 Link<Node> arguments,
                                                 FunctionElement target) {
+    assert(target.isImplementation);
     List<Constant> compiledArguments = <Constant>[];
 
     Function compileArgument = evaluateConstant;
     Function compileConstant = compiler.compileConstant;
     bool succeeded = selector.addArgumentsToList(arguments,
                                                  compiledArguments,
                                                  target,
                                                  compileArgument,
                                                  compileConstant,
                                                  compiler);
     assert(succeeded);
     return compiledArguments;
   }
 
   Constant visitNewExpression(NewExpression node) {
     if (!node.isConst()) {
       return signalNotCompileTimeConstant(node);
     }
 
     Send send = node.send;
     FunctionElement constructor = elements[send];
     ClassElement classElement = constructor.getEnclosingClass();
     if (classElement.isInterface()) {
       compiler.resolver.resolveMethodElement(constructor);
       constructor = constructor.defaultImplementation;
       classElement = constructor.getEnclosingClass();
     }
+    // The constructor must be the implementation to ensure that field

[ahe, 2012/09/18 11:25:54]

the -> an.

[Johnni Winther, 2012/09/20 08:12:23]

Done.

+    // initializers are handled correctly.
+    constructor = constructor.implementation;

[ahe, 2012/09/18 11:25:54]

Is this temporary?

[Johnni Winther, 2012/09/20 08:12:23]

No. That is why I put in the comment.

+    assert(constructor.isImplementation);
 
     Selector selector = elements.getSelector(send);
     List<Constant> arguments =
         evaluateArgumentsToConstructor(selector, send.arguments, constructor);
     ConstructorEvaluator evaluator =
         new ConstructorEvaluator(constructor, constantSystem, compiler);
     evaluator.evaluateConstructorFieldValues(arguments);
     List<Constant> jsNewArguments = evaluator.buildJsNewArguments(classElement);
 
     compiler.enqueuer.codegen.registerInstantiatedClass(classElement);
@@ skipping 35 matching lines @@
       : super(constantSystem, elements, compiler, isConst: true);
 
   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 FunctionElement constructor;
   final Map<Element, Constant> definitions;
   final Map<Element, Constant> fieldValues;
 
+  /**
+   * Invariant: [constructor] must be the implementation element.

[ahe, 2012/09/18 11:25:54]

This is not documentation.

[Johnni Winther, 2012/09/20 08:12:23]

Done.

+   */
   ConstructorEvaluator(FunctionElement constructor,
                        ConstantSystem constantSystem,
                        Compiler compiler)
       : this.constructor = constructor,
         this.definitions = new Map<Element, Constant>(),
         this.fieldValues = new Map<Element, Constant>(),
         super(constantSystem,
-              compiler.resolver.resolveMethodElement(constructor),
+              compiler.resolver.resolveMethodElement(constructor.declaration),
               compiler,
-              isConst: true);
+              isConst: true) {
+    assert(constructor.isImplementation);
+  }
 
   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 112 matching lines @@
       Constant fieldValue = fieldValues[field];
       if (fieldValue === null) {
         // Use the default value.
         fieldValue = compiler.compileConstant(field);
       }
       jsNewArguments.add(fieldValue);
     });
     return jsNewArguments;
   }
 }