Merge (x & y) == 0 pattern to emit a single test instruction.

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 679 matching lines @@
   M(Float32x4Clamp)                                                            \
   M(Float32x4With)                                                             \
   M(Float32x4ToInt32x4)                                                       \
   M(MaterializeObject)                                                         \
   M(Int32x4BoolConstructor)                                                   \
   M(Int32x4GetFlag)                                                           \
   M(Int32x4Select)                                                            \
   M(Int32x4SetFlag)                                                           \
   M(Int32x4ToFloat32x4)                                                       \
   M(BinaryInt32x4Op)                                                          \
+  M(TestSmi)

[zra, 2013/11/05 18:38:03]

It looks like we usually put a trailing \ after the last line of a macro.

[Florian Schneider, 2013/11/06 12:13:42]

Done.

 
 
 #define FORWARD_DECLARATION(type) class type##Instr;
 FOR_EACH_INSTRUCTION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 
 // Functions required in all concrete instruction classes.
 #define DECLARE_INSTRUCTION(type)                                              \
   virtual Tag tag() const { return k##type; }                                  \
@@ skipping 2268 matching lines @@
 
  private:
   // True if the comparison must check for double, Mint or Bigint and
   // use value comparison instead.
   bool needs_number_check_;
 
   DISALLOW_COPY_AND_ASSIGN(StrictCompareInstr);
 };
 
 
+// Comparison instruction that is equivalent to the (left & right) == 0
+// comparison pattern.
+class TestSmiInstr : public ComparisonInstr {
+ public:
+  TestSmiInstr(intptr_t token_pos, Token::Kind kind, Value* left, Value* right)
+      : ComparisonInstr(token_pos, kind, left, right) {
+    ASSERT(kind == Token::kEQ || kind == Token::kNE);
+  }
+
+  DECLARE_INSTRUCTION(TestSmi);
+  virtual CompileType ComputeType() const;
+
+  virtual bool CanDeoptimize() const { return false; }
+
+  virtual bool CanBecomeDeoptimizationTarget() const {
+    // TestSmi can be merged into Branch and thus needs an environment.
+    return true;
+  }
+
+  virtual intptr_t DeoptimizationTarget() const {
+    return GetDeoptId();
+  }
+
+  virtual Representation RequiredInputRepresentation(intptr_t idx) const {
+    return kTagged;
+  }
+
+  virtual EffectSet Effects() const { return EffectSet::None(); }
+
+  virtual bool MayThrow() const { return false; }
+
+  virtual void EmitBranchCode(FlowGraphCompiler* compiler,
+                              BranchInstr* branch);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestSmiInstr);
+};
+
+
 class EqualityCompareInstr : public ComparisonInstr {
  public:
   EqualityCompareInstr(intptr_t token_pos,
                        Token::Kind kind,
                        Value* left,
                        Value* right,
                        intptr_t cid,
                        intptr_t deopt_id)
       : ComparisonInstr(token_pos, kind, left, right) {
     ASSERT(Token::IsEqualityOperator(kind));
     set_operation_cid(cid);
     deopt_id_ = deopt_id;  // Override generated deopt-id.
   }
 
   DECLARE_INSTRUCTION(EqualityCompare)
   virtual CompileType ComputeType() const;
-  virtual bool RecomputeType();
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual bool CanBecomeDeoptimizationTarget() const {
     // EqualityCompare can be merged into Branch and thus needs an environment.
     return true;
   }
 
@@ skipping 29 matching lines @@
                     intptr_t cid,
                     intptr_t deopt_id)
       : ComparisonInstr(token_pos, kind, left, right) {
     ASSERT(Token::IsRelationalOperator(kind));
     set_operation_cid(cid);
     deopt_id_ = deopt_id;  // Override generated deopt-id.
   }
 
   DECLARE_INSTRUCTION(RelationalOp)
   virtual CompileType ComputeType() const;
-  virtual bool RecomputeType();
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual bool CanBecomeDeoptimizationTarget() const {
     // RelationalOp can be merged into Branch and thus needs an environment.
     return true;
   }
 
@@ skipping 3839 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_