# HG changeset patch
# User acorn
# Date 1373402932 -7200
# Node ID 22baec423e2fd4d9c933bd7d70818114bb9b6cd6
# Parent  2839ce15e4509fbea19220d9f89f288e7a94a61e# Parent  50257d6f5aaab646f266a61cda3d26e4ea0f0430
Merge

diff -r 50257d6f5aaa -r 22baec423e2f src/share/vm/services/memBaseline.cpp
--- a/src/share/vm/services/memBaseline.cpp	Tue Jul 09 14:02:28 2013 -0400
+++ b/src/share/vm/services/memBaseline.cpp	Tue Jul 09 22:48:52 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;
 }