Removed some impossible code (thanks to the way it's called), added an
assertion to ensure it remains impossible.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1329 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/mc_common.c b/memcheck/mc_common.c
index 1cfd195..e080976 100644
--- a/memcheck/mc_common.c
+++ b/memcheck/mc_common.c
@@ -153,12 +153,14 @@
{
MemCheckError* e1_extra = VG_(get_error_extra)(e1);
MemCheckError* e2_extra = VG_(get_error_extra)(e2);
+
+ /* Guaranteed by calling function */
+ sk_assert(VG_(get_error_kind)(e1) == VG_(get_error_kind)(e2));
switch (VG_(get_error_kind)(e1)) {
case CoreMemErr: {
Char *e1s, *e2s;
if (e1_extra->isWrite != e2_extra->isWrite) return False;
- if (VG_(get_error_kind)(e2) != CoreMemErr) return False;
e1s = VG_(get_error_string)(e1);
e2s = VG_(get_error_string)(e2);
if (e1s == e2s) return True;