Fix potential overwriting of debug jumps of following code.

src/safepoint-table.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 203 matching lines @@
   unsigned index = info.deoptimization_index;
   unsigned gap_size = info.pc_after_gap - info.pc;
   uint32_t encoding = SafepointEntry::DeoptimizationIndexField::encode(index);
   encoding |= SafepointEntry::GapCodeSizeField::encode(gap_size);
   encoding |= SafepointEntry::ArgumentsField::encode(info.arguments);
   encoding |= SafepointEntry::SaveDoublesField::encode(info.has_doubles);
   return encoding;
 }
 
 
+int SafepointTableBuilder::CountShortDeoptimizationIntervals(unsigned limit) {
+  int res = 0;

[fschneider, 2011/02/02 12:54:16]

small nit: result instead of res

[Kevin Millikin (Chromium), 2011/02/02 13:05:33]

No reason not to spell out 'result'.

[Lasse Reichstein, 2011/02/03 14:14:12]

Done.

+  if (deoptimization_info_.length() > 0) {

[Kevin Millikin (Chromium), 2011/02/02 13:05:33]

if (!deoptimization_info_.is_empty()) ...

[Lasse Reichstein, 2011/02/03 14:14:12]

Done.

+    unsigned last_gap_end = deoptimization_info_[0].pc_after_gap;

[Kevin Millikin (Chromium), 2011/02/02 13:05:33]

It's not necessarily the last one, it's the previous one.

[Lasse Reichstein, 2011/02/03 14:14:12]

Ack. Pardon my bad Danglish.
(Not that it's even good Danish).

+    for (int i = 0, n = deoptimization_info_.length(); i < n; i++) {
+      DeoptimizationInfo info = deoptimization_info_[i];
+      if (static_cast<int>(info.deoptimization_index) ==

[Kevin Millikin (Chromium), 2011/02/02 13:05:33]

It's probably clearer without the continue:

if (deopt_index != kNoDeopt...) {
  // stuff
}

[Lasse Reichstein, 2011/02/03 14:14:12]

Done.

+          Safepoint::kNoDeoptimizationIndex) {
+        continue;
+      }
+      if (last_gap_end + limit > info.pc) {
+        res++;
+      }
+      last_gap_end = info.pc_after_gap;
+    }
+  }
+  return res;
+}
+
+
+
 } }  // namespace v8::internal