languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 02:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

dart2js cps: Use dummy constant in dummy receiver optimization.

Browse source 
Also addresses some other post-commit comments from
https://codereview.chromium.org/1312393002

BUG=
R=sra@google.com

Review URL: https://codereview.chromium.org//1317903002 .
This commit is contained in:
Asger Feldthaus 2015-08-27 11:34:00 +02:00
parent bad2786f6c
commit 4d20c86fd0
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkg/compiler/lib/src/cps_ir/type_propagation.dart
View file

@ -15,7 +15,8 @@ import '../diagnostics/invariant.dart' as dart2js show
InternalErrorFunction;
import '../elements/elements.dart';
import '../io/source_information.dart' show SourceInformation;
import '../js_backend/js_backend.dart' show JavaScriptBackend;
import '../js_backend/js_backend.dart' show JavaScriptBackend,
SyntheticConstantKind;
import '../js_backend/codegen/task.dart' show CpsFunctionCompiler;
import '../resolution/access_semantics.dart';
import '../resolution/operators.dart';
@ -1609,6 +1610,8 @@ class TransformingVisitor extends LeafVisitor {
// Check if any of the possible targets depend on the extra receiver
// argument. Mixins do this, and tear-offs always needs the extra receiver
// argument because BoundClosure uses it for equality and hash code.
// TODO(15933): Make automatically generated property extraction
// closures work with the dummy receiver optimization.
bool needsReceiver(Element target) {
if (target is! FunctionElement) return false;
FunctionElement function = target;
@ -1618,7 +1621,10 @@ class TransformingVisitor extends LeafVisitor {
if (!getAllTargets(receiver.type, node.selector).any(needsReceiver)) {
// Replace the extra receiver argument with a dummy value if the
// target definitely does not use it.
Constant dummy = makeConstantPrimitive(new IntConstantValue(0));
ConstantValue constant = new SyntheticConstantValue(
SyntheticConstantKind.DUMMY_INTERCEPTOR,
receiver.type);
Constant dummy = makeConstantPrimitive(constant);
insertLetPrim(node, dummy);
node.arguments[0].unlink();
node.arguments[0] = new Reference<Primitive>(dummy);
@ -2476,13 +2482,7 @@ class TypePropagationVisitor implements Visitor {
}
void visitConstant(Constant node) {
ConstantValue value = node.value;
if (value.isDummy || !value.isConstant) {
// TODO(asgerf): Explain how this happens and why we don't want them.
setValue(node, nonConstant(typeSystem.getTypeOf(value)));
} else {
setValue(node, constantValue(value, typeSystem.getTypeOf(value)));
}
setValue(node, constantValue(node.value, typeSystem.getTypeOf(node.value)));
}
void visitCreateFunction(CreateFunction node) {
@ -2635,8 +2635,13 @@ class AbstractValue {
AbstractValue.nothing()
: this._internal(NOTHING, null, new TypeMask.nonNullEmpty());
AbstractValue.constantValue(ConstantValue constant, TypeMask type)
: this._internal(CONSTANT, constant, type);
factory AbstractValue.constantValue(ConstantValue constant, TypeMask type) {
if (constant.isDummy || !constant.isConstant) {
return new AbstractValue._internal(NONCONST, null, type);
} else {
return new AbstractValue._internal(CONSTANT, constant, type);
}
}
factory AbstractValue.nonConstant(TypeMask type) {
if (type.isEmpty) {

4
pkg/compiler/lib/src/js_backend/codegen/glue.dart
View file

@ -54,8 +54,8 @@ class Glue {
_compiler.internalError(_compiler.currentElement, message);
}
bool isUsedAsMixin(ClassElement clazz) {
return classWorld.isUsedAsMixin(clazz);
bool isUsedAsMixin(ClassElement classElement) {
return classWorld.isUsedAsMixin(classElement);
}
ConstantValue getConstantValueForVariable(VariableElement variable) {