Mercurial > hg > release > icedtea7-forest-2.4 > hotspot

changeset 4789:cd8439e6d2d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author zgu
date Thu, 11 Jul 2013 04:47:12 +0200
parents 6fa8cb2866c0 (current diff) c0b13febbf45 (diff)
children 1118c5d38ac0
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/services/memBaseline.cpp	Wed Jul 10 13:42:15 2013 -0700
+++ b/src/share/vm/services/memBaseline.cpp	Thu Jul 11 04:47:12 2013 +0200
@@ -486,7 +486,7 @@
   const MemPointerRecord* mp1 = (const MemPointerRecord*)p1;
   const MemPointerRecord* mp2 = (const MemPointerRecord*)p2;
   int delta = UNSIGNED_COMPARE(mp1->addr(), mp2->addr());
-  assert(delta != 0, "dup pointer");
+  assert(p1 == p2 || delta != 0, "dup pointer");
   return delta;
 }