Revert of CPUProfiler: Push deopt reason further to ProfileNode.

src/deoptimizer.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_DEOPTIMIZER_H_
 #define V8_DEOPTIMIZER_H_
 
 #include "src/v8.h"
 
 #include "src/allocation.h"
@@ skipping 170 matching lines @@
     DEOPT_MESSAGES_LIST(DEOPT_MESSAGES_CONSTANTS) kLastDeoptReason
   };
 #undef DEOPT_MESSAGES_CONSTANTS
 
   static const char* GetDeoptReason(DeoptReason deopt_reason);
 
   struct DeoptInfo {
     DeoptInfo(int r, const char* m, DeoptReason d)
         : raw_position(r), mnemonic(m), deopt_reason(d) {}
 
+    bool operator==(const DeoptInfo& other) const {
+      return raw_position == other.raw_position &&
+             CStringEquals(mnemonic, other.mnemonic) &&
+             deopt_reason == other.deopt_reason;
+    }
+
+    bool operator!=(const DeoptInfo& other) const { return !(*this == other); }
+
     int raw_position;
     const char* mnemonic;
     DeoptReason deopt_reason;
   };
 
   static DeoptInfo GetDeoptInfo(Code* code, int bailout_id);
 
   struct JumpTableEntry : public ZoneObject {
     inline JumpTableEntry(Address entry, const DeoptInfo& deopt_info,
                           Deoptimizer::BailoutType type, bool frame)
         : label(),
           address(entry),
           deopt_info(deopt_info),
           bailout_type(type),
           needs_frame(frame) {}
 
     bool IsEquivalentTo(const JumpTableEntry& other) const {
       return address == other.address && bailout_type == other.bailout_type &&
-             needs_frame == other.needs_frame;
+             needs_frame == other.needs_frame &&
+             (!FLAG_trace_deopt || deopt_info == other.deopt_info);
     }
 
     Label label;
     Address address;
     DeoptInfo deopt_info;
     Deoptimizer::BailoutType bailout_type;
     bool needs_frame;
   };
 
   static bool TraceEnabledFor(BailoutType deopt_type,
@@ skipping 837 matching lines @@
   Object** parameters_;
   Object** expression_stack_;
   int source_position_;
 
   friend class Deoptimizer;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_DEOPTIMIZER_H_