TokenPositions on more nodes when running from Kernel

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_
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 
 #include "vm/growable_array.h"
@@ skipping 543 matching lines @@
   virtual void VisitTryCatch(TryCatch* node);
   virtual void VisitTryFinally(TryFinally* node);
   virtual void VisitYieldStatement(YieldStatement* node);
   virtual void VisitAssertStatement(AssertStatement* node);
 
   virtual void VisitFunctionNode(FunctionNode* node);
 
   virtual void VisitConstructor(Constructor* node);
 
  private:
-  void EnterScope(TreeNode* node);
-  void ExitScope();
+  void EnterScope(TreeNode* node, TokenPosition start_position);
+  void ExitScope(TokenPosition end_position);
 
   const Type& TranslateVariableType(VariableDeclaration* variable);
-  LocalVariable* MakeVariable(const dart::String& name,
-                              const AbstractType& type);
+  LocalVariable* MakeVariable(
+      const dart::String& name,
+      const AbstractType& type,
+      TokenPosition declaration_pos = TokenPosition::kNoSource,
+      TokenPosition token_pos = TokenPosition::kNoSource);
 
   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();
@@ skipping 215 matching lines @@
                            intptr_t offset,
                            const Type& type,
                            intptr_t class_id,
                            bool is_immutable = false);
   Fragment LoadLocal(LocalVariable* variable);
   Fragment InitStaticField(const dart::Field& field);
   Fragment LoadStaticField();
   Fragment NullConstant();
   Fragment NativeCall(const dart::String* name, const Function* function);
   Fragment PushArgument();
-  Fragment Return();
+  Fragment Return(TokenPosition position = TokenPosition::kNoSource);

[Kevin Millikin (Google), 2017/01/12 13:43:04]

None of the other methods have default values for position.  I suggest getting
rid of the default and forcing it to be passed at all the call sites (there
shouldn't be too many).  That's for consistency, but also for forcing a
developer to make a decision and for making it easy to grep for kNoSource and
find use sites.

[jensj, 2017/01/13 10:14:44]

Done.

   Fragment StaticCall(TokenPosition position,
                       const Function& target,
                       intptr_t argument_count);
   Fragment StaticCall(TokenPosition position,
                       const Function& target,
                       intptr_t argument_count,
                       const Array& argument_names);
   Fragment StoreIndexed(intptr_t class_id);
   Fragment StoreInstanceFieldGuarded(const dart::Field& field);
   Fragment StoreInstanceField(
       const dart::Field& field,
       StoreBarrierType emit_store_barrier = kEmitStoreBarrier);
   Fragment StoreInstanceField(
       intptr_t offset,
       StoreBarrierType emit_store_barrier = kEmitStoreBarrier);
-  Fragment StoreLocal(LocalVariable* variable);
+  Fragment StoreLocal(LocalVariable* variable,
+                      TokenPosition position = TokenPosition::kNoSource);

[Kevin Millikin (Google), 2017/01/12 13:43:04]

Also here, I'd make this required.  For consistency, token position is normally
the first argument.  I'd really like it to be always first or always last (first
is fine with me).

[jensj, 2017/01/13 10:14:44]

Done.

   Fragment StoreStaticField(const dart::Field& field);
-  Fragment StringInterpolate();
+  Fragment StringInterpolate(TokenPosition position);
   Fragment ThrowTypeError();
   Fragment ThrowNoSuchMethodError();
   Fragment BuildImplicitClosureCreation(const Function& target);
   Fragment GuardFieldLength(const dart::Field& field, intptr_t deopt_id);
   Fragment GuardFieldClass(const dart::Field& field, intptr_t deopt_id);
 
   dart::RawFunction* LookupMethodByMember(Member* target,
                                           const dart::String& method_name);
 
   LocalVariable* MakeTemporary();
@@ skipping 107 matching lines @@
   friend class SwitchBlock;
   friend class TryCatchBlock;
   friend class TryFinallyBlock;
 };
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
 #endif  // RUNTIME_VM_KERNEL_TO_IL_H_