Merge RawICData::range_feedback_ field into RawICData::state_bits_.

runtime/vm/object.cc

 // Copyright (c) 2012, 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.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 11416 matching lines @@
 }
 
 
 void ICData::SetDeoptReasons(uint32_t reasons) const {
   StoreNonPointer(&raw_ptr()->state_bits_,
                   DeoptReasonBits::update(reasons, raw_ptr()->state_bits_));
 }
 
 
 bool ICData::HasDeoptReason(DeoptReasonId reason) const {
+  ASSERT(reason <= kLastRecordedDeoptReason);
   return (DeoptReasons() & (1 << reason)) != 0;
 }
 
 
 void ICData::AddDeoptReason(DeoptReasonId reason) const {
-  SetDeoptReasons(DeoptReasons() | (1 << reason));
+  if (reason <= kLastRecordedDeoptReason) {

[zra, 2014/12/15 20:57:38]

Why is this not an assert?

[Vyacheslav Egorov (Google), 2014/12/15 21:02:21]

Caller (deoptimizer) can try to add deopt reason which we don't care about -
this is fine, we just drop it to the floor.

On the other hand if optimizer is checking (via HasDeoptReason) for a deopt
reason, which we don't record, then this is a bug. Because reason has to be
recordable for HasDeoptReason to make sense.

That's why this is guarded with an if and the other one is an assert.

Alternatively I could move this *if* to the caller (deoptimizer), but that felt
like a wrong place.

WDYT? 

[zra, 2014/12/15 21:04:58]

Makes sense. I think it's fine as-is. Thanks!

+    SetDeoptReasons(DeoptReasons() | (1 << reason));
+  }
 }
 
 
 bool ICData::IssuedJSWarning() const {
   return IssuedJSWarningBit::decode(raw_ptr()->state_bits_);
 }
 
 
 void ICData::SetIssuedJSWarning() const {
   StoreNonPointer(&raw_ptr()->state_bits_,
@@ skipping 12 matching lines @@
   }
   // Warning issued in ic miss handler.
   // No decoding necessary, so allow optimization if warning already issued.
   if (name.Equals(Symbols::toString()) && !IssuedJSWarning()) {
     return true;
   }
   return false;
 }
 
 
-void ICData::set_range_feedback(uint32_t feedback) {
-  StoreNonPointer(&raw_ptr()->range_feedback_, feedback);
-}
-
-
 void ICData::set_state_bits(uint32_t bits) const {
   StoreNonPointer(&raw_ptr()->state_bits_, bits);
 }
 
 
 intptr_t ICData::TestEntryLengthFor(intptr_t num_args) {
   return num_args + 1 /* target function*/ + 1 /* frequency */;
 }
 
 
@@ skipping 435 matching lines @@
                                       ICData::InstanceSize(),
                                       Heap::kOld);
     NoGCScope no_gc;
     result ^= raw;
   }
   result.set_owner(owner);
   result.set_target_name(target_name);
   result.set_arguments_descriptor(arguments_descriptor);
   result.set_deopt_id(deopt_id);
   result.set_state_bits(0);
-  result.set_range_feedback(0);
   result.SetNumArgsTested(num_args_tested);
   // Number of array elements in one test entry.
   intptr_t len = result.TestEntryLength();
   // IC data array must be null terminated (sentinel entry).
   const Array& ic_data = Array::Handle(Array::New(len, Heap::kOld));
   result.set_ic_data(ic_data);
   result.WriteSentinel(ic_data);
   return result.raw();
 }
 
@@ skipping 60 matching lines @@
       }
     }
   }
 
   return initialized;
 }
 
 
 ICData::RangeFeedback ICData::DecodeRangeFeedbackAt(intptr_t idx) const {
   ASSERT((0 <= idx) && (idx < 3));
+  const uint32_t raw_feedback =
+      RangeFeedbackBits::decode(raw_ptr()->state_bits_);
   const uint32_t feedback =
-      (range_feedback() >> (idx * kBitsPerRangeFeedback)) & kRangeFeedbackMask;
+      (raw_feedback >> (idx * kBitsPerRangeFeedback)) & kRangeFeedbackMask;
   if ((feedback & kInt64RangeBit) != 0) {
     return kInt64Range;
   }
 
   if ((feedback & kUint32RangeBit) != 0) {
     if ((feedback & kSignedRangeBit) == 0) {
       return kUint32Range;
     }
 
     // Check if Smi is large enough to accomodate Int33: a mixture of Uint32
@@ skipping 8557 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart