Index: sdk/lib/_internal/compiler/implementation/js_emitter/old_emitter/container_builder.dart |
diff --git a/sdk/lib/_internal/compiler/implementation/js_emitter/old_emitter/container_builder.dart b/sdk/lib/_internal/compiler/implementation/js_emitter/old_emitter/container_builder.dart |
index d04357e334e867941f5a72a993b2accffb5b93f4..9c07202d286db3a475e0cee37bf81d5fe50cdf94 100644 |
--- a/sdk/lib/_internal/compiler/implementation/js_emitter/old_emitter/container_builder.dart |
+++ b/sdk/lib/_internal/compiler/implementation/js_emitter/old_emitter/container_builder.dart |
@@ -96,12 +96,12 @@ class ContainerBuilder extends CodeEmitterHelper { |
parametersBuffer[optionalParameterStart + index] = |
new jsAst.Parameter(jsName); |
} else { |
- ConstExp constant = handler.getConstantForVariable(element); |
+ ConstantExpression constant = handler.getConstantForVariable(element); |
if (constant == null) { |
argumentsBuffer[count] = |
- emitter.constantReference(new NullConstant()); |
+ emitter.constantReference(new NullConstantValue()); |
} else { |
- Constant value = constant.value; |
+ ConstantValue value = constant.value; |
if (!value.isNull) { |
// If the value is the null constant, we should not pass it |
// down to the native method. |
@@ -517,7 +517,7 @@ class ContainerBuilder extends CodeEmitterHelper { |
if (backend.mustRetainMetadata) { |
Iterable<int> metadataIndices = |
parameter.metadata.map((MetadataAnnotation annotation) { |
- Constant constant = |
+ ConstantValue constant = |
backend.constants.getConstantForMetadata(annotation).value; |
backend.constants.addCompileTimeConstantForEmission(constant); |
return emitter.metadataEmitter.reifyMetadata(annotation); |