Mercurial > hg > graal-compiler

changeset 11103:2839ce15e450

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author zgu
date Tue, 09 Jul 2013 19:56:07 +0200
parents 72fce0b2d341 (diff) e79a9f26ba2e (current diff)
children 22baec423e2f
files src/share/vm/runtime/aprofiler.cpp src/share/vm/runtime/aprofiler.hpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/services/memBaseline.cpp	Mon Jul 08 18:26:26 2013 -0700
+++ b/src/share/vm/services/memBaseline.cpp	Tue Jul 09 19:56:07 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;
 }