Add new style of string interpolation optimization: new nodes, working constant folding.

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 284 matching lines @@
   static CompileType Dynamic();
 
   static CompileType Null();
 
   // Create non-nullable Bool type.
   static CompileType Bool();
 
   // Create non-nullable Int type.
   static CompileType Int();
 
+  // Create non-nullable String type.
+  static CompileType String();
+
   // Perform a join operation over the type lattice.
   void Union(CompileType* other);
 
   // Returns true if this and other types are the same.
   bool IsEqualTo(CompileType* other) {
     return (is_nullable_ == other->is_nullable_) &&
         (ToNullableCid() == other->ToNullableCid()) &&
         (ToAbstractType()->Equals(*other->ToAbstractType()));
   }
 
@@ skipping 328 matching lines @@
   M(BoxUint32x4)                                                               \
   M(UnboxUint32x4)                                                             \
   M(UnboxInteger)                                                              \
   M(BoxInteger)                                                                \
   M(BinaryMintOp)                                                              \
   M(ShiftMintOp)                                                               \
   M(UnaryMintOp)                                                               \
   M(CheckArrayBound)                                                           \
   M(Constraint)                                                                \
   M(StringFromCharCode)                                                        \
+  M(StringInterpolate)                                                         \
   M(InvokeMathCFunction)                                                       \
   M(GuardField)                                                                \
   M(IfThenElse)                                                                \
   M(BinaryFloat32x4Op)                                                         \
   M(Float32x4Shuffle)                                                          \
   M(Simd32x4GetSignMask)                                                       \
   M(Float32x4Constructor)                                                      \
   M(Float32x4Zero)                                                             \
   M(Float32x4Splat)                                                            \
   M(Float32x4Comparison)                                                       \
@@ skipping 2979 matching lines @@
 
   virtual bool MayThrow() const { return false; }
 
  private:
   const intptr_t cid_;
 
   DISALLOW_COPY_AND_ASSIGN(StringFromCharCodeInstr);
 };
 
 
+class StringInterpolateInstr : public TemplateDefinition<1> {
+ public:
+  StringInterpolateInstr(Value* value, intptr_t token_pos)
+      : token_pos_(token_pos), function_(Function::Handle()) {
+    SetInputAt(0, value);
+  }
+
+  Value* value() const { return inputs_[0]; }
+  intptr_t token_pos() const { return token_pos_; }
+  virtual bool CanDeoptimize() const { return true; }

[Kevin Millikin (Google), 2013/10/16 15:14:03]

Really?

[srdjan, 2013/10/16 17:46:37]

Offline discsussion: adapt Effects, CanDeoptimize, Dependencies to behave same
as the static call instruction. StrinfInterpolation emits a static call to dart
code which in turn calls toString on individual objects.

+  virtual EffectSet Effects() const { return EffectSet::None(); }
+  virtual EffectSet Dependencies() const { return EffectSet::None(); }
+
+  virtual CompileType ComputeType() const;
+  // Calls toString on objects, which could throw exceptions
+  virtual bool MayThrow() const { return true; }
+  virtual bool AllowsCSE() const { return true; }
+
+  const Function& CallFunction() const;
+
+  DECLARE_INSTRUCTION(StringInterpolate)
+
+ private:
+  const intptr_t token_pos_;
+  Function& function_;
+
+  DISALLOW_COPY_AND_ASSIGN(StringInterpolateInstr);
+};
+
+
 class StoreIndexedInstr : public TemplateDefinition<3> {
  public:
   StoreIndexedInstr(Value* array,
                     Value* index,
                     Value* value,
                     StoreBarrierType emit_store_barrier,
                     intptr_t index_scale,
                     intptr_t class_id,
                     intptr_t deopt_id)
       : emit_store_barrier_(emit_store_barrier),
@@ skipping 3160 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_