More PcDescriptor cleanups.

runtime/vm/code_descriptors.h

 // 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.
 
 #ifndef VM_CODE_DESCRIPTORS_H_
 #define VM_CODE_DESCRIPTORS_H_
 
 #include "vm/ast.h"
 #include "vm/code_generator.h"
 #include "vm/globals.h"
@@ skipping 12 matching lines @@
     intptr_t try_index;        // Try block index of PC or deopt array index.
     void SetTokenPos(intptr_t value) { data = value; }
     intptr_t TokenPos() const { return data; }
     void SetDeoptReason(ICData::DeoptReasonId value) { data = value; }
     ICData::DeoptReasonId DeoptReason() const {
       ASSERT((0 <= data) && (data < ICData::kDeoptNumReasons));
       return static_cast<ICData::DeoptReasonId>(data);
     }
   };
 
-  explicit DescriptorList(intptr_t initial_capacity) : list_(initial_capacity) {
-  }
+  explicit DescriptorList(intptr_t initial_capacity)
+      : list_(initial_capacity), has_try_index_(false) {}
   ~DescriptorList() { }
 
   intptr_t Length() const {
     return list_.length();
   }
 
   intptr_t PcOffset(intptr_t index) const {
     return list_[index].pc_offset;
   }
   RawPcDescriptors::Kind Kind(intptr_t index) const {
     return list_[index].kind;
   }
   intptr_t DeoptId(intptr_t index) const {
     return list_[index].deopt_id;
   }
   intptr_t TokenPos(intptr_t index) const {
     return list_[index].TokenPos();
   }
   ICData::DeoptReasonId DeoptReason(intptr_t index) const {
     return list_[index].DeoptReason();
   }
   intptr_t TryIndex(intptr_t index) const {
     return list_[index].try_index;

[siva, 2014/07/14 19:42:01]

Should this be:

return (!has_try_index_) ? -1 : list_[index].try_index;

[srdjan, 2014/07/14 23:55:25]

Done as:
return (has_try_index_) ? list_[index].try_index : -1;

   }
 
   void AddDescriptor(RawPcDescriptors::Kind kind,
                      intptr_t pc_offset,
                      intptr_t deopt_id,
                      intptr_t token_index,
                      intptr_t try_index);
 
   RawPcDescriptors* FinalizePcDescriptors(uword entry_point);
 
  private:
   GrowableArray<struct PcDesc> list_;
+  bool has_try_index_;
   DISALLOW_COPY_AND_ASSIGN(DescriptorList);
 };
 
 
 class StackmapTableBuilder : public ZoneAllocated {
  public:
   explicit StackmapTableBuilder()
       : stack_map_(Stackmap::ZoneHandle()),
         list_(GrowableObjectArray::ZoneHandle(
             GrowableObjectArray::New(Heap::kOld))) { }
@@ skipping 98 matching lines @@
   }
 
  private:
   GrowableArray<struct HandlerDesc> list_;
   DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerList);
 };
 
 }  // namespace dart
 
 #endif  // VM_CODE_DESCRIPTORS_H_