Refactor computation of NativeBehavior.

pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart

 // Copyright (c) 2016, 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.
 
 import 'package:js_runtime/shared/embedded_names.dart';
 import 'package:kernel/ast.dart' as ir;
 
 import '../common.dart';
 import '../compiler.dart';
 import '../constants/expressions.dart';
@@ skipping 570 matching lines @@
   @override
   InterfaceType getRawType(ClassElement cls) {
     return cls.rawType;
   }
 
   @override
   InterfaceType getThisType(ClassElement cls) {
     return cls.thisType;
   }
 
+  native.BehaviorComputer get nativeBehaviorComputer =>
+      new native.BehaviorComputerImpl(_compiler);
+
   /// Computes the native behavior for reading the native [field].
   // TODO(johnniwinther): Cache this for later use.
   native.NativeBehavior getNativeBehaviorForFieldLoad(ir.Field field) {
     ResolutionDartType type = getDartType(field.type);
     List<ConstantExpression> metadata = getMetadata(field.annotations);
-    return native.NativeBehavior.ofFieldLoad(CURRENT_ELEMENT_SPANNABLE, type,
-        metadata, typeLookup(resolveAsRaw: false), _compiler,
+    // TODO(johnniwinther): Provide the correct value for [isJsInterop].

[Siggi Cherem (dart-lang), 2017/02/08 17:00:28]

was this working before? (are there tests that will stop working after this
change as a result?) - that is OK, but it would be good to know.

[Johnni Winther, 2017/02/10 09:11:45]

Same behavior as before (probably not working).

+    return nativeBehaviorComputer.ofFieldLoad(
+        type, metadata, typeLookup(resolveAsRaw: false),
         isJsInterop: false);
   }
 
   /// Computes the native behavior for writing to the native [field].
   // TODO(johnniwinther): Cache this for later use.
   native.NativeBehavior getNativeBehaviorForFieldStore(ir.Field field) {
-    ResolutionDartType type = getDartType(field.type);
-    return native.NativeBehavior.ofFieldStore(type, _compiler.resolution);
+    DartType type = getDartType(field.type);
+    return nativeBehaviorComputer.ofFieldStore(type);
   }
 
   /// Computes the native behavior for calling [procedure].
   // TODO(johnniwinther): Cache this for later use.
   native.NativeBehavior getNativeBehaviorForMethod(ir.Procedure procedure) {
-    ResolutionDartType type = getFunctionType(procedure.function);
+    DartType type = getFunctionType(procedure.function);
     List<ConstantExpression> metadata = getMetadata(procedure.annotations);
-    return native.NativeBehavior.ofMethod(CURRENT_ELEMENT_SPANNABLE, type,
-        metadata, typeLookup(resolveAsRaw: false), _compiler,
+    // TODO(johnniwinther): Provide the correct value for [isJsInterop].
+    return nativeBehaviorComputer.ofMethod(
+        type, metadata, typeLookup(resolveAsRaw: false),
         isJsInterop: false);
   }
 
   MemberEntity getConstructorBodyEntity(ir.Constructor constructor) {
     AstElement element = getElement(constructor);
     MemberEntity constructorBody =
         ConstructorBodyElementX.createFromResolvedAst(element.resolvedAst);
     assert(constructorBody != null);
     return constructorBody;
   }
@@ skipping 196 matching lines @@
       JumpTarget continueTarget =
           astAdapter.getJumpTarget(switchCase, isContinueTarget: true);
       assert(continueTarget is KernelJumpTarget);
       targetIndexMap[continueTarget] = switchIndex;
       assert(builder.jumpTargets[continueTarget] == null);
       builder.jumpTargets[continueTarget] = this;
       switchIndex++;
     }
   }
 }