[vm] Read interface_target_reference from kernel binaries

runtime/vm/kernel_binary_flowgraph.cc

 // 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.
 
 #include "vm/kernel_binary_flowgraph.h"
 #include "vm/compiler.h"
 #include "vm/longjump.h"
 #include "vm/object_store.h"
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
@@ skipping 924 matching lines @@
       intptr_t variable_kernel_offset =
           builder_->ReadUInt();  // read kernel position.
       LookupVariable(variable_kernel_offset);
       VisitExpression();  // read expression.
       return;
     }
     case kPropertyGet:
       builder_->ReadPosition();  // read position.
       VisitExpression();         // read receiver.
       builder_->SkipName();      // read name.
-      // Read unused "interface_target_reference".
+      // read interface_target_reference.
       builder_->SkipCanonicalNameReference();
       return;
     case kPropertySet:
       builder_->ReadPosition();  // read position.
       VisitExpression();         // read receiver.
       builder_->SkipName();      // read name.
       VisitExpression();         // read value.
-      // read unused "interface_target_reference".
+      // read interface_target_reference.
       builder_->SkipCanonicalNameReference();
       return;
     case kDirectPropertyGet:
       builder_->ReadPosition();                // read position.
       VisitExpression();                       // read receiver.
       builder_->SkipCanonicalNameReference();  // read target_reference.
       return;
     case kDirectPropertySet:
       builder_->ReadPosition();                // read position.
       VisitExpression();                       // read receiver.
       builder_->SkipCanonicalNameReference();  // read target_reference.
       VisitExpression();                       // read value·
       return;
     case kStaticGet:
       builder_->ReadPosition();                // read position.
       builder_->SkipCanonicalNameReference();  // read target_reference.
       return;
     case kStaticSet:
       builder_->ReadPosition();                // read position.
       builder_->SkipCanonicalNameReference();  // read target_reference.
       VisitExpression();                       // read expression.
       return;
     case kMethodInvocation:
       builder_->ReadPosition();  // read position.
       VisitExpression();         // read receiver.
       builder_->SkipName();      // read name.
       VisitArguments();          // read arguments.
-      // read unused "interface_target_reference".
+      // read interface_target_reference.
       builder_->SkipCanonicalNameReference();
       return;
     case kDirectMethodInvocation:
       VisitExpression();                       // read receiver.
       builder_->SkipCanonicalNameReference();  // read target_reference.
       VisitArguments();                        // read arguments.
       return;
     case kStaticInvocation:
     case kConstStaticInvocation:
       builder_->ReadPosition();                // read position.
@@ skipping 1405 matching lines @@
   LocalVariable* variable = builder_->LookupVariable(variable_kernel_position);
   ASSERT(variable->IsConst());
   result_ = variable->ConstValue()->raw();
 }
 
 void StreamingConstantEvaluator::EvaluatePropertyGet() {
   builder_->ReadPosition();  // read position.
   intptr_t expression_offset = builder_->ReaderOffset();
   builder_->SkipExpression();                            // read receiver.
   StringIndex name = builder_->ReadNameAsStringIndex();  // read name.
-  // Read unused "interface_target_reference".
-  builder_->SkipCanonicalNameReference();
+  builder_->SkipCanonicalNameReference();  // read interface_target_reference.
 
   if (H.StringEquals(name, "length")) {
     EvaluateExpression(expression_offset);
     if (result_.IsString()) {
       const dart::String& str =
           dart::String::Handle(Z, dart::String::RawCast(result_.raw()));
       result_ = Integer::New(str.Length());
     } else {
       H.ReportError(
           "Constant expressions can only call "
@@ skipping 65 matching lines @@
   intptr_t argument_count = builder_->PeekArgumentsCount();
   // Dart does not support generic methods yet.
   ASSERT(builder_->PeekArgumentsTypeCount() == 0);
   builder_->SkipArgumentsBeforeActualArguments();
 
   // Run the method and canonicalize the result.
   const Object& result = RunFunction(function, argument_count, &receiver, NULL);
   result_ ^= result.raw();
   result_ = H.Canonicalize(result_);
 
-  builder_->SkipCanonicalNameReference();  // read "interface_target_reference"
+  builder_->SkipCanonicalNameReference();  // read interface_target_reference.
 }
 
 void StreamingConstantEvaluator::EvaluateStaticInvocation() {
   builder_->ReadPosition();  // read position.
   NameIndex procedue_reference =
       builder_->ReadCanonicalNameReference();  // read procedure reference.
 
   const Function& function = Function::ZoneHandle(
       Z, H.LookupStaticMethodByKernelProcedure(procedue_reference));
   dart::Class& klass = dart::Class::Handle(Z, function.Owner());
@@ skipping 1808 matching lines @@
       return;
     case kSpecializedVariableSet:
       ReadPosition();    // read position.
       ReadUInt();        // read kernel position.
       SkipExpression();  // read expression.
       return;
     case kPropertyGet:
       ReadPosition();    // read position.
       SkipExpression();  // read receiver.
       SkipName();        // read name.
-      // Read unused "interface_target_reference".
-      SkipCanonicalNameReference();
+      SkipCanonicalNameReference();  // read interface_target_reference.
       return;
     case kPropertySet:
       ReadPosition();    // read position.
       SkipExpression();  // read receiver.
       SkipName();        // read name.
       SkipExpression();  // read value.
-      // read unused "interface_target_reference".
-      SkipCanonicalNameReference();
+      SkipCanonicalNameReference();  // read interface_target_reference.
       return;
     case kDirectPropertyGet:
       ReadPosition();                // read position.
       SkipExpression();              // read receiver.
       SkipCanonicalNameReference();  // read target_reference.
       return;
     case kDirectPropertySet:
       ReadPosition();                // read position.
       SkipExpression();              // read receiver.
       SkipCanonicalNameReference();  // read target_reference.
       SkipExpression();              // read value·
       return;
     case kStaticGet:
       ReadPosition();                // read position.
       SkipCanonicalNameReference();  // read target_reference.
       return;
     case kStaticSet:
       ReadPosition();                // read position.
       SkipCanonicalNameReference();  // read target_reference.
       SkipExpression();              // read expression.
       return;
     case kMethodInvocation:
       ReadPosition();    // read position.
       SkipExpression();  // read receiver.
       SkipName();        // read name.
       SkipArguments();   // read arguments.
-      // read unused "interface_target_reference".
-      SkipCanonicalNameReference();
+      SkipCanonicalNameReference();  // read interface_target_reference.
       return;
     case kDirectMethodInvocation:
       SkipExpression();              // read receiver.
       SkipCanonicalNameReference();  // read target_reference.
       SkipArguments();               // read arguments.
       return;
     case kStaticInvocation:
     case kConstStaticInvocation:
       ReadPosition();                // read position.
       SkipCanonicalNameReference();  // read procedure_reference.
@@ skipping 586 matching lines @@
   return flow_graph_builder_->StaticCall(position, target, argument_count,
                                          argument_names, type_args_count);
 }
 
 Fragment StreamingFlowGraphBuilder::InstanceCall(
     TokenPosition position,
     const dart::String& name,
     Token::Kind kind,
     intptr_t argument_count,
     intptr_t checked_argument_count) {
-  return flow_graph_builder_->InstanceCall(position, name, kind, argument_count,
-                                           checked_argument_count);
+  const intptr_t kTypeArgsLen = 0;
+  return flow_graph_builder_->InstanceCall(
+      position, name, kind, kTypeArgsLen, argument_count, Array::null_array(),
+      checked_argument_count, Function::null_function());
+}
+
+Fragment StreamingFlowGraphBuilder::InstanceCall(
+    TokenPosition position,
+    const dart::String& name,
+    Token::Kind kind,
+    intptr_t type_args_len,
+    intptr_t argument_count,
+    const Array& argument_names,
+    intptr_t checked_argument_count,
+    const Function& interface_target) {
+  return flow_graph_builder_->InstanceCall(
+      position, name, kind, type_args_len, argument_count, argument_names,
+      checked_argument_count, interface_target);
 }
 
 Fragment StreamingFlowGraphBuilder::ThrowException(TokenPosition position) {
   return flow_graph_builder_->ThrowException(position);
 }
 
 Fragment StreamingFlowGraphBuilder::BooleanNegate() {
   return flow_graph_builder_->BooleanNegate();
 }
 
@@ skipping 21 matching lines @@
 }
 
 Fragment StreamingFlowGraphBuilder::AllocateContext(intptr_t size) {
   return flow_graph_builder_->AllocateContext(size);
 }
 
 Fragment StreamingFlowGraphBuilder::LoadField(intptr_t offset) {
   return flow_graph_builder_->LoadField(offset);
 }
 
-Fragment StreamingFlowGraphBuilder::InstanceCall(
-    TokenPosition position,
-    const dart::String& name,
-    Token::Kind kind,
-    intptr_t type_args_len,
-    intptr_t argument_count,
-    const Array& argument_names,
-    intptr_t checked_argument_count) {
-  return flow_graph_builder_->InstanceCall(position, name, kind, type_args_len,
-                                           argument_count, argument_names,
-                                           checked_argument_count);
-}
-
 Fragment StreamingFlowGraphBuilder::StoreLocal(TokenPosition position,
                                                LocalVariable* variable) {
   return flow_graph_builder_->StoreLocal(position, variable);
 }
 
 Fragment StreamingFlowGraphBuilder::StoreStaticField(TokenPosition position,
                                                      const dart::Field& field) {
   return flow_graph_builder_->StoreStaticField(position, field);
 }
 
@@ skipping 275 matching lines @@
 }
 
 Fragment StreamingFlowGraphBuilder::BuildPropertyGet(TokenPosition* p) {
   TokenPosition position = ReadPosition();  // read position.
   if (p != NULL) *p = position;
 
   Fragment instructions = BuildExpression();  // read receiver.
   instructions += PushArgument();
 
   const dart::String& getter_name = ReadNameAsGetterName();  // read name.
-  SkipCanonicalNameReference();  // Read unused "interface_target_reference".
 
-  return instructions + InstanceCall(position, getter_name, Token::kGET, 1);
+  const Function* interface_target = &Function::null_function();
+  NameIndex itarget_name =
+      ReadCanonicalNameReference();  // read interface_target_reference.
+  if (FLAG_experimental_strong_mode && !H.IsRoot(itarget_name) &&
+      (H.IsGetter(itarget_name) || H.IsField(itarget_name))) {
+    interface_target = &Function::ZoneHandle(
+        Z, LookupMethodByMember(itarget_name, H.DartGetterName(itarget_name)));
+  }
+
+  const intptr_t kTypeArgsLen = 0;
+  const intptr_t kNumArgsChecked = 1;
+  return instructions + InstanceCall(position, getter_name, Token::kGET,
+                                     kTypeArgsLen, 1, Array::null_array(),
+                                     kNumArgsChecked, *interface_target);
 }
 
 Fragment StreamingFlowGraphBuilder::BuildPropertySet(TokenPosition* p) {
   Fragment instructions(NullConstant());
   LocalVariable* variable = MakeTemporary();
 
   TokenPosition position = ReadPosition();  // read position.
   if (p != NULL) *p = position;
 
   instructions += BuildExpression();  // read receiver.
   instructions += PushArgument();
 
   const dart::String& setter_name = ReadNameAsSetterName();  // read name.
 
   instructions += BuildExpression();  // read value.
   instructions += StoreLocal(TokenPosition::kNoSource, variable);
   instructions += PushArgument();
 
-  SkipCanonicalNameReference();  // read unused "interface_target_reference".
+  const Function* interface_target = &Function::null_function();
+  NameIndex itarget_name =
+      ReadCanonicalNameReference();  // read interface_target_reference.
+  if (FLAG_experimental_strong_mode && !H.IsRoot(itarget_name)) {
+    interface_target = &Function::ZoneHandle(
+        Z, LookupMethodByMember(itarget_name, H.DartSetterName(itarget_name)));
+  }
 
-  instructions += InstanceCall(position, setter_name, Token::kSET, 2);
+  const intptr_t kTypeArgsLen = 0;
+  const intptr_t kNumArgsChecked = 1;
+  instructions +=
+      InstanceCall(position, setter_name, Token::kSET, kTypeArgsLen, 2,
+                   Array::null_array(), kNumArgsChecked, *interface_target);
+
   return instructions + Drop();
 }
 
 Fragment StreamingFlowGraphBuilder::BuildDirectPropertyGet(TokenPosition* p) {
   TokenPosition position = ReadPosition();  // read position.
   if (p != NULL) *p = position;
 
   Fragment instructions = BuildExpression();  // read receiver.
   NameIndex kernel_name =
       ReadCanonicalNameReference();  // read target_reference.
@@ skipping 145 matching lines @@
 
     SkipExpression();  // read receiver (it's just a number literal).
 
     const dart::String& name = ReadNameAsMethodName();  // read name.
     const Token::Kind token_kind = MethodKind(name);
     intptr_t argument_count = PeekArgumentsCount() + 1;
 
     if ((argument_count == 1) && (token_kind == Token::kNEGATE)) {
       const Object& result = constant_evaluator_.EvaluateExpressionSafe(offset);
       if (!result.IsError()) {
-        SkipArguments();  // read arguments,
-        // read unused "interface_target_reference".
-        SkipCanonicalNameReference();
+        SkipArguments();               // read arguments.
+        SkipCanonicalNameReference();  // read interface_target_reference.
         return Constant(result);
       }
     } else if ((argument_count == 2) &&
                Token::IsBinaryArithmeticOperator(token_kind) &&
                IsNumberLiteral(PeekArgumentsFirstPositionalTag())) {
       const Object& result = constant_evaluator_.EvaluateExpressionSafe(offset);
       if (!result.IsError()) {
-        SkipArguments();
-        // read unused "interface_target_reference".
-        SkipCanonicalNameReference();
+        SkipArguments();               // read arguments.
+        SkipCanonicalNameReference();  // read interface_target_reference.
         return Constant(result);
       }
     }
 
     SetOffset(before_branch_offset);
   }
 
   Fragment instructions = BuildExpression();  // read receiver.
 
   const dart::String& name = ReadNameAsMethodName();  // read name.
   const Token::Kind token_kind = MethodKind(name);
 
   // Detect comparison with null.
   if ((token_kind == Token::kEQ || token_kind == Token::kNE) &&
       PeekArgumentsCount() == 1 &&
       (receiver_tag == kNullLiteral ||
        PeekArgumentsFirstPositionalTag() == kNullLiteral)) {
     // "==" or "!=" with null on either side.
     instructions += BuildArguments(NULL, NULL, true);  // read arguments.
-    SkipCanonicalNameReference();  // read unused "interface_target_reference".
+    SkipCanonicalNameReference();  // read interface_target_reference.
     Token::Kind strict_cmp_kind =
         token_kind == Token::kEQ ? Token::kEQ_STRICT : Token::kNE_STRICT;
     return instructions +
            StrictCompare(strict_cmp_kind, /*number_check = */ true);
   }
 
   instructions += PushArgument();  // push receiver as argument.
 
   // TODO(28109) Support generic methods in the VM or reify them away.
   const intptr_t kTypeArgsLen = 0;
   Array& argument_names = Array::ZoneHandle(Z);
   intptr_t argument_count;
   instructions +=
       BuildArguments(&argument_names, &argument_count);  // read arguments.
   ++argument_count;
 
   intptr_t checked_argument_count = 1;
   // If we have a special operation (e.g. +/-/==) we mark both arguments as
   // to be checked.
   if (token_kind != Token::kILLEGAL) {
     ASSERT(argument_count <= 2);
     checked_argument_count = argument_count;
   }
 
+  const Function* interface_target = &Function::null_function();
+  NameIndex itarget_name =
+      ReadCanonicalNameReference();  // read interface_target_reference.
+  if (FLAG_experimental_strong_mode && !H.IsRoot(itarget_name)) {
+    interface_target = &Function::ZoneHandle(
+        Z,
+        LookupMethodByMember(itarget_name, H.DartProcedureName(itarget_name)));
+  }
+
   instructions +=
       InstanceCall(position, name, token_kind, kTypeArgsLen, argument_count,
-                   argument_names, checked_argument_count);
+                   argument_names, checked_argument_count, *interface_target);
   // Later optimization passes assume that result of a x.[]=(...) call is not
   // used. We must guarantee this invariant because violation will lead to an
   // illegal IL once we replace x.[]=(...) with a sequence that does not
   // actually produce any value. See http://dartbug.com/29135 for more details.
   if (name.raw() == Symbols::AssignIndexToken().raw()) {
     instructions += Drop();
     instructions += NullConstant();
   }
 
-  SkipCanonicalNameReference();  // read unused "interface_target_reference".
-
   return instructions;
 }
 
 Fragment StreamingFlowGraphBuilder::BuildDirectMethodInvocation(
     TokenPosition* position) {
   if (position != NULL) *position = TokenPosition::kNoSource;
 
   // TODO(28109) Support generic methods in the VM or reify them away.
   Tag receiver_tag = PeekTag();               // peek tag for receiver.
   Fragment instructions = BuildExpression();  // read receiver.
@@ skipping 2192 matching lines @@
     }
   }
 
   return Array::Handle(Array::null());
 }
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)