VM: Fix bug in canonicalization of identical in the optimizing compiler.

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 2812 matching lines @@
                               BranchInstr* branch) = 0;
 
   void SetDeoptId(intptr_t deopt_id) {
     deopt_id_ = deopt_id;
   }
 
   // Operation class id is computed from collected ICData.
   void set_operation_cid(intptr_t value) { operation_cid_ = value; }
   intptr_t operation_cid() const { return operation_cid_; }
 
+  void NegateComparison() {
+    kind_ = Token::NegateComparison(kind_);
+  }
+
  protected:
   ComparisonInstr(intptr_t token_pos,
                   Token::Kind kind,
                   Value* left,
                   Value* right)
       : token_pos_(token_pos), kind_(kind), operation_cid_(kIllegalCid) {
     SetInputAt(0, left);
     SetInputAt(1, right);
   }
 
+ private:
   intptr_t token_pos_;

[srdjan, 2013/10/15 15:10:16]

const

[Florian Schneider, 2013/10/15 15:15:03]

Done.

   Token::Kind kind_;
-
- private:
   intptr_t operation_cid_;  // Set by optimizer.
 
   DISALLOW_COPY_AND_ASSIGN(ComparisonInstr);
 };
 
 
 // Inlined functions from class BranchInstr that forward to their comparison.
 inline intptr_t BranchInstr::ArgumentCount() const {
   return comparison()->ArgumentCount();
 }
@@ skipping 72 matching lines @@
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
   virtual void EmitBranchCode(FlowGraphCompiler* compiler,
                               BranchInstr* branch);
 
   bool needs_number_check() const { return needs_number_check_; }
   void set_needs_number_check(bool value) { needs_number_check_ = value; }
-  void set_kind(Token::Kind value) { kind_ = value; }
 
   virtual bool AllowsCSE() const { return true; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const;
 
   virtual bool MayThrow() const { return false; }
 
  private:
   // True if the comparison must check for double, Mint or Bigint and
@@ skipping 3870 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_