More source position improvements and tests

runtime/vm/intermediate_language.h

 // Copyright (c) 2013, 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 VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 25 matching lines @@
 class Range;
 class RangeAnalysis;
 class RangeBoundary;
 class UnboxIntegerInstr;
 
 // These token positions are used to classify instructions that can't be
 // directly tied to an actual source position.
 #define CLASSIFYING_TOKEN_POSITIONS(V)                                         \
     V(Box, -2)                                                                 \
     V(ParallelMove, -3)                                                        \
-    V(TempMove, -4)
+    V(TempMove, -4)                                                            \
+    V(Constant, -5)
 
 // COMPILE_ASSERT that all CLASSIFYING_TOKEN_POSITIONS are less than
 // Scanner::kNoSourcePos.
 #define SANITY_CHECK_VALUES(name, value)                                       \
   COMPILE_ASSERT(value < Scanner::kNoSourcePos);
   CLASSIFYING_TOKEN_POSITIONS(SANITY_CHECK_VALUES);
 #undef SANITY_CHECK_VALUES
 
 class ClassifyingTokenPositions : public AllStatic {
  public:
@@ skipping 2518 matching lines @@
   Range* constraint_;
   TargetEntryInstr* target_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstraintInstr);
 };
 
 
 class ConstantInstr : public TemplateDefinition<0, NoThrow, Pure> {
  public:
   ConstantInstr(const Object& value,
-                intptr_t token_pos = Scanner::kNoSourcePos);
+                intptr_t token_pos = ClassifyingTokenPositions::kConstant);
 
   DECLARE_INSTRUCTION(Constant)
   virtual CompileType ComputeType() const;
 
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
   const Object& value() const { return value_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual void InferRange(RangeAnalysis* analysis, Range* range);
 
   virtual bool AttributesEqual(Instruction* other) const;
 
+  virtual intptr_t token_pos() const { return token_pos_; }
+
  private:
   const Object& value_;
   const intptr_t token_pos_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstantInstr);
 };
 
 
 // Merged ConstantInstr -> UnboxedXXX into UnboxedConstantInstr.
 // TODO(srdjan): Implemented currently for doubles only, should implement
@@ skipping 5584 matching lines @@
   LocationSummary* Name::MakeLocationSummary(Zone* zone, bool opt) const {    \
     UNIMPLEMENTED();                                                          \
     return NULL;                                                              \
   }                                                                           \
   void Name::EmitNativeCode(FlowGraphCompiler* compiler) { UNIMPLEMENTED(); }
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_