Split inference type-info accessors into members, parameters and local functions

pkg/compiler/lib/src/types/types.dart

Index: pkg/compiler/lib/src/types/types.dart
diff --git a/pkg/compiler/lib/src/types/types.dart b/pkg/compiler/lib/src/types/types.dart
index 5ef999e753a0373d519e1a0404f9845b8622eff5..fda77470b8ceeb5b9e299f5a681c760254bc6c50 100644
--- a/pkg/compiler/lib/src/types/types.dart
+++ b/pkg/compiler/lib/src/types/types.dart
@@ -72,7 +72,7 @@ abstract class GlobalTypeInferenceElementResult {
   TypeMask typeOfIteratorCurrent(ForIn node);
 }
 
-class GlobalTypeInferenceElementResultImpl
+abstract class GlobalTypeInferenceElementResultImpl
     implements GlobalTypeInferenceElementResult {
   // TODO(sigmund): delete, store data directly here.
   final Element _owner;
@@ -85,16 +85,26 @@ class GlobalTypeInferenceElementResultImpl
   final bool _isJsInterop;
   final TypeMask _dynamic;
 
-  GlobalTypeInferenceElementResultImpl(this._owner, this._data, this._inferrer,
-      this._isJsInterop, this._dynamic);
-
-  bool get isCalledOnce => _inferrer.isCalledOnce(_owner);
-
-  TypeMask get returnType =>
-      _isJsInterop ? _dynamic : _inferrer.getReturnTypeOfElement(_owner);
+  factory GlobalTypeInferenceElementResultImpl(
+      Element owner,
+      GlobalTypeInferenceElementData data,
+      TypesInferrer inferrer,
+      bool isJsInterop,
+      TypeMask _dynamic) {
+    if (owner.isParameter) {
+      return new GlobalTypeInferenceParameterResult(
+          owner, data, inferrer, isJsInterop, _dynamic);
+    } else if (owner.isLocal) {
+      return new GlobalTypeInferenceLocalFunctionResult(
+          owner, data, inferrer, isJsInterop, _dynamic);
+    } else {
+      return new GlobalTypeInferenceMemberResult(
+          owner, data, inferrer, isJsInterop, _dynamic);
+    }
+  }
 
-  TypeMask get type =>
-      _isJsInterop ? _dynamic : _inferrer.getTypeOfElement(_owner);
+  GlobalTypeInferenceElementResultImpl.internal(this._owner, this._data,
+      this._inferrer, this._isJsInterop, this._dynamic);
 
   bool get throwsAlways {
     TypeMask mask = this.returnType;
@@ -118,6 +128,83 @@ class GlobalTypeInferenceElementResultImpl
       _data?.typeOfIteratorCurrent(node);
 }
 
+class GlobalTypeInferenceMemberResult
+    extends GlobalTypeInferenceElementResultImpl {
+  GlobalTypeInferenceMemberResult(
+      MemberElement owner,
+      GlobalTypeInferenceElementData data,
+      TypesInferrer inferrer,
+      bool isJsInterop,
+      TypeMask _dynamic)
+      : super.internal(owner, data, inferrer, isJsInterop, _dynamic);
+
+  bool get isCalledOnce => _inferrer.isMemberCalledOnce(_owner);
+
+  TypeMask get returnType =>
+      _isJsInterop ? _dynamic : _inferrer.getReturnTypeOfMember(_owner);
+
+  TypeMask get type =>
+      _isJsInterop ? _dynamic : _inferrer.getTypeOfMember(_owner);
+}
+
+class GlobalTypeInferenceParameterResult
+    extends GlobalTypeInferenceElementResultImpl {
+  GlobalTypeInferenceParameterResult(
+      ParameterElement owner,
+      GlobalTypeInferenceElementData data,
+      TypesInferrer inferrer,
+      bool isJsInterop,
+      TypeMask _dynamic)
+      : super.internal(owner, data, inferrer, isJsInterop, _dynamic);
+
+  bool get isCalledOnce => _inferrer.isParameterCalledOnce(_owner);
+
+  TypeMask get returnType =>
+      _isJsInterop ? _dynamic : _inferrer.getReturnTypeOfParameter(_owner);
+
+  TypeMask get type =>
+      _isJsInterop ? _dynamic : _inferrer.getTypeOfParameter(_owner);
+}
+
+@deprecated
+class GlobalTypeInferenceLocalFunctionResult
+    extends GlobalTypeInferenceElementResultImpl {
+  GlobalTypeInferenceLocalFunctionResult(
+      LocalFunctionElement owner,
+      GlobalTypeInferenceElementData data,
+      TypesInferrer inferrer,
+      bool isJsInterop,
+      TypeMask _dynamic)
+      : super.internal(owner, data, inferrer, isJsInterop, _dynamic);
+
+  bool get isCalledOnce => _inferrer.isLocalFunctionCalledOnce(_owner);
+
+  TypeMask get returnType =>
+      _isJsInterop ? _dynamic : _inferrer.getReturnTypeOfLocalFunction(_owner);
+
+  TypeMask get type =>
+      _isJsInterop ? _dynamic : _inferrer.getTypeOfLocalFunction(_owner);
+}
+
+class GlobalTypeInferenceLocalFunctionResultImpl
+    extends GlobalTypeInferenceElementResultImpl {
+  GlobalTypeInferenceLocalFunctionResultImpl(
+      LocalFunctionElement owner,
+      GlobalTypeInferenceElementData data,
+      TypesInferrer inferrer,
+      bool isJsInterop,
+      TypeMask _dynamic)
+      : super.internal(owner, data, inferrer, isJsInterop, _dynamic);
+
+  bool get isCalledOnce => _inferrer.isLocalFunctionCalledOnce(_owner);
+
+  TypeMask get returnType =>
+      _isJsInterop ? _dynamic : _inferrer.getReturnTypeOfLocalFunction(_owner);
+
+  TypeMask get type =>
+      _isJsInterop ? _dynamic : _inferrer.getTypeOfLocalFunction(_owner);
+}
+
 /// Internal data used during type-inference to store intermediate results about
 /// a single element.
 class GlobalTypeInferenceElementData {
@@ -173,12 +260,21 @@ class GlobalTypeInferenceElementData {
 /// API to interact with the global type-inference engine.
 abstract class TypesInferrer {
   void analyzeMain(FunctionEntity element);
-  TypeMask getReturnTypeOfElement(Element element);
-  TypeMask getTypeOfElement(Element element);
+  @deprecated

[Siggi Cherem (dart-lang), 2017/06/28 16:30:24]

might be worth commenting what is this going to be replaced with.

For instance: we are moving away from using LocalFunctionElement to represent
closures, but plan to use the <closure-class>.callMethod instead as the
representation. At that point, we should be able to sue
getReturnTypeOfMember(callMethod). (I guess?)

Might be worth also sprinkling hints about this in the other @deprecated
annotations in the other files. 

[Johnni Winther, 2017/06/29 12:36:49]

Done.

+  TypeMask getReturnTypeOfLocalFunction(LocalFunctionElement element);
+  TypeMask getReturnTypeOfMember(MemberElement element);
+  TypeMask getReturnTypeOfParameter(ParameterElement element);
+  @deprecated
+  TypeMask getTypeOfLocalFunction(LocalFunctionElement element);
+  TypeMask getTypeOfMember(MemberElement element);
+  TypeMask getTypeOfParameter(ParameterElement element);
   TypeMask getTypeForNewList(Element owner, Node node);
   TypeMask getTypeOfSelector(Selector selector, TypeMask mask);
   void clear();
-  bool isCalledOnce(Element element);
+  @deprecated
+  bool isLocalFunctionCalledOnce(LocalFunctionElement element);
+  bool isMemberCalledOnce(MemberElement element);
+  bool isParameterCalledOnce(ParameterElement element);
   bool isFixedArrayCheckedForGrowable(Node node);
 }