Mercurial > hg > graal-compiler

changeset 11105:22baec423e2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author acorn
date Tue, 09 Jul 2013 22:48:52 +0200
parents 2839ce15e450 (diff) 50257d6f5aaa (current diff)
children ec173c8f3739 dbc0b5dc08f5
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }