hotspot/src/share/vm/compiler/methodLiveness.cpp

rev 611 : Merge

*** 77,88 ****
    int _count;
   public:
    BitCounter() : _count(0) {}
  
    // Callback when bit in map is set
!   virtual void do_bit(size_t offset) {
      _count++;
    }
  
    int count() {
      return _count;
    }
--- 77,89 ----
    int _count;
   public:
    BitCounter() : _count(0) {}
  
    // Callback when bit in map is set
!   virtual bool do_bit(size_t offset) {
      _count++;
+     return true;
    }
  
    int count() {
      return _count;
    }
*** 468,478 ****
    if (entry_bci == InvocationEntryBci) {
      is_entry = true;
      bci = 0;
    }
  
!   MethodLivenessResult answer(NULL,0);
  
    if (_block_count > 0) {
      if (TimeLivenessAnalysis) _time_total.start();
      if (TimeLivenessAnalysis) _time_query.start();
  
--- 469,479 ----
    if (entry_bci == InvocationEntryBci) {
      is_entry = true;
      bci = 0;
    }
  
!   MethodLivenessResult answer((uintptr_t*)NULL,0);
  
    if (_block_count > 0) {
      if (TimeLivenessAnalysis) _time_total.start();
      if (TimeLivenessAnalysis) _time_query.start();