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

Use entities in ParameterTypeInformation

Browse source 
R=sigmund@google.com

Review-Url: https://codereview.chromium.org/2970953003 .
This commit is contained in:
Johnni Winther 2017-07-06 12:31:00 +02:00
parent ae532f70c4
commit f32dbe2d27
2 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkg/compiler/lib/src/inferrer/type_graph_nodes.dart
View file

@ -666,38 +666,48 @@ class GenerativeConstructorTypeInformation extends MemberTypeInformation {
* the [ElementTypeInformation] factory.
*/
class ParameterTypeInformation extends ElementTypeInformation {
final ParameterElement _parameter;
final MethodElement _method;
bool _isInstanceMemberParameter;
bool _isClosureParameter;
final Local _parameter;
final DartType _type;
final FunctionEntity _method;
final bool _isInstanceMemberParameter;
final bool _isClosureParameter;
final bool _isInitializingFormal;
bool _isTearOffClosureParameter = false;
ParameterTypeInformation.localFunction(
MemberTypeInformation context, this._parameter, this._method)
MemberTypeInformation context, this._parameter, this._type, this._method)
: _isInstanceMemberParameter = false,
_isClosureParameter = true,
_isInitializingFormal = false,
super._internal(context);
ParameterTypeInformation.static(
MemberTypeInformation context, this._parameter, this._method)
MemberTypeInformation context, this._parameter, this._type, this._method,
{bool isInitializingFormal: false})
: _isInstanceMemberParameter = false,
_isClosureParameter = false,
_isInitializingFormal = isInitializingFormal,
super._internal(context);
ParameterTypeInformation.instanceMember(MemberTypeInformation context,
this._parameter, this._method, ParameterAssignments assignments)
ParameterTypeInformation.instanceMember(
MemberTypeInformation context,
this._parameter,
this._type,
this._method,
ParameterAssignments assignments)
: _isInstanceMemberParameter = true,
_isClosureParameter = false,
_isInitializingFormal = false,
super._withAssignments(context, assignments);
MethodElement get method => _method;
FunctionEntity get method => _method;
Local get parameter => _parameter;
String get debugName => '$parameter';
void tagAsTearOffClosureParameter(InferrerEngine inferrer) {
assert(_parameter.isRegularParameter);
assert(!_isInitializingFormal);
_isTearOffClosureParameter = true;
// We have to add a flow-edge for the default value (if it exists), as we
// might not see all call-sites and thus miss the use of it.
@ -719,7 +729,7 @@ class ParameterTypeInformation extends ElementTypeInformation {
// The below do not apply to parameters of constructors, so skip
// initializing formals.
if (_parameter.isInitializingFormal) return null;
if (_isInitializingFormal) return null;
if ((_isTearOffClosureParameter || _isClosureParameter) &&
disableInferenceForClosures) {
@ -766,7 +776,7 @@ class ParameterTypeInformation extends ElementTypeInformation {
// ignore type annotations to ensure that the checks are actually inserted
// into the function body and retained until runtime.
assert(!compiler.options.enableTypeAssertions);
return _narrowType(inferrer.closedWorld, mask, _parameter.type);
return _narrowType(inferrer.closedWorld, mask, _type);
}
TypeMask computeType(InferrerEngine inferrer) {

11
pkg/compiler/lib/src/inferrer/type_system.dart
View file

@ -345,18 +345,25 @@ class TypeSystem {
LocalFunctionElement localFunction = parameter.functionDeclaration;
MethodElement callMethod = localFunction.callMethod;
return new ParameterTypeInformation.localFunction(
getInferredTypeOfMember(callMethod), parameter, callMethod);
getInferredTypeOfMember(callMethod),
parameter,
parameter.type,
callMethod);
} else if (parameter.functionDeclaration.isInstanceMember) {
MethodElement method = parameter.functionDeclaration;
return new ParameterTypeInformation.instanceMember(
getInferredTypeOfMember(method),
parameter,
parameter.type,
method,
new ParameterAssignments());
} else {
MethodElement method = parameter.functionDeclaration;
return new ParameterTypeInformation.static(
getInferredTypeOfMember(method), parameter, method);
getInferredTypeOfMember(method), parameter, parameter.type, method,
// TODO(johnniwinther): Is this still valid now that initializing
// formals also introduce locals?
isInitializingFormal: parameter.isInitializingFormal);
}
}