VM: [Kernel] Set types on [LocalVariable] if they were introduced by [VariableDeclaration]s

runtime/vm/kernel_to_il.h

 // 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.
 
 #ifndef RUNTIME_VM_KERNEL_TO_IL_H_
 #define RUNTIME_VM_KERNEL_TO_IL_H_
 
 #include "vm/growable_array.h"
 #include "vm/hash_map.h"
 
@@ skipping 278 matching lines @@
         zone_(helper->zone()),
         result_(AbstractType::Handle(helper->zone())),
         finalize_(finalize) {}
 
   // Can return a malformed type.
   AbstractType& TranslateType(DartType* node);
 
   // Can return a malformed type.
   AbstractType& TranslateTypeWithoutFinalization(DartType* node);
 
+  // Is guaranteed to be not malformed.
+  const AbstractType& TranslateVariableType(VariableDeclaration* variable);
+
 
   virtual void VisitDefaultDartType(DartType* node) { UNREACHABLE(); }
 
   virtual void VisitInvalidType(InvalidType* node);
 
   virtual void VisitFunctionType(FunctionType* node);
 
   virtual void VisitTypeParameterType(TypeParameterType* node);
 
   virtual void VisitInterfaceType(InterfaceType* node);
@@ skipping 178 matching lines @@
 
 
 class ScopeBuilder : public RecursiveVisitor {
  public:
   ScopeBuilder(ParsedFunction* parsed_function, TreeNode* node)
       : result_(NULL),
         parsed_function_(parsed_function),
         node_(node),
         zone_(Thread::Current()->zone()),
         translation_helper_(Thread::Current(), zone_, Isolate::Current()),
+        type_translator_(&translation_helper_, &active_class_),
         current_function_scope_(NULL),
         scope_(NULL),
         depth_(0),
         name_index_(0) {}
 
   virtual ~ScopeBuilder() {}
 
   ScopeBuildingResult* BuildScopes();
 
   virtual void VisitName(Name* node) { /* NOP */
@@ skipping 20 matching lines @@
   virtual void VisitAssertStatement(AssertStatement* node);
 
   virtual void VisitFunctionNode(FunctionNode* node);
 
   virtual void VisitConstructor(Constructor* node);
 
  private:
   void EnterScope(TreeNode* node);
   void ExitScope();
 
-  LocalVariable* MakeVariable(const dart::String& name);
-  LocalVariable* MakeVariable(const dart::String& name, const Type& type);
+  const Type& TranslateVariableType(VariableDeclaration* variable);
+  LocalVariable* MakeVariable(const dart::String& name,
+                              const AbstractType& type);
 
   void AddParameters(FunctionNode* function, intptr_t pos = 0);
   void AddParameter(VariableDeclaration* declaration, intptr_t pos);
   void AddVariable(VariableDeclaration* declaration);
   void AddExceptionVariable(GrowableArray<LocalVariable*>* variables,
                             const char* prefix, intptr_t nesting_depth);
   void AddTryVariables();
   void AddCatchVariables();
   void AddIteratorVariable();
   void AddSwitchVariable();
@@ skipping 25 matching lines @@
     intptr_t try_;
     intptr_t catch_;
     intptr_t finally_;
     intptr_t for_in_;
   };
 
   ScopeBuildingResult* result_;
   ParsedFunction* parsed_function_;
   TreeNode* node_;
 
+  ActiveClass active_class_;
+
   Zone* zone_;
   TranslationHelper translation_helper_;
-
+  DartTypeTranslator type_translator_;
 
   FunctionNode* current_function_node_;
   LocalScope* current_function_scope_;
   LocalScope* scope_;
   DepthState depth_;
 
   intptr_t name_index_;
 };
 
 
@@ skipping 295 matching lines @@
   friend class SwitchBlock;
   friend class TryCatchBlock;
   friend class TryFinallyBlock;
 };
 
 }  // namespace kernel
 }  // namespace dart
 
 
 #endif  // RUNTIME_VM_KERNEL_TO_IL_H_