|
From: <sv...@va...> - 2014-09-14 07:41:00
|
Author: florian
Date: Sun Sep 14 07:40:19 2014
New Revision: 14534
Log:
ML_(dinfo_zalloc/strdup) never return NULL. Remove pointless
asserts at call sites.
Modified:
trunk/coregrind/m_debuginfo/priv_misc.h
trunk/coregrind/m_debuginfo/readdwarf3.c
trunk/coregrind/m_debuginfo/readpdb.c
Modified: trunk/coregrind/m_debuginfo/priv_misc.h
==============================================================================
--- trunk/coregrind/m_debuginfo/priv_misc.h (original)
+++ trunk/coregrind/m_debuginfo/priv_misc.h Sun Sep 14 07:40:19 2014
@@ -38,7 +38,8 @@
#include "pub_core_basics.h" // SizeT
-/* Allocate(zeroed), free, strdup, memdup, shrink, all in VG_AR_DINFO. */
+/* Allocate(zeroed), free, strdup, memdup, shrink, all in VG_AR_DINFO.
+ The allocation functions never return NULL. */
void* ML_(dinfo_zalloc)( const HChar* cc, SizeT szB );
void ML_(dinfo_free)( void* v );
HChar* ML_(dinfo_strdup)( const HChar* cc, const HChar* str );
Modified: trunk/coregrind/m_debuginfo/readdwarf3.c
==============================================================================
--- trunk/coregrind/m_debuginfo/readdwarf3.c (original)
+++ trunk/coregrind/m_debuginfo/readdwarf3.c Sun Sep 14 07:40:19 2014
@@ -632,7 +632,6 @@
gx = ML_(dinfo_zalloc)( "di.readdwarf3.msGX.1",
sizeof(GExpr) + bytesReqd );
- vg_assert(gx);
p = pstart = &gx->payload[0];
@@ -747,7 +746,6 @@
vg_assert(nbytes >= 1);
gx = ML_(dinfo_zalloc)( "di.readdwarf3.mgGX.2", sizeof(GExpr) + nbytes );
- vg_assert(gx);
VG_(memcpy)( &gx->payload[0], (UChar*)VG_(indexXA)(xa,0), nbytes );
vg_assert( &gx->payload[nbytes]
== ((UChar*)gx) + sizeof(GExpr) + nbytes );
@@ -3451,7 +3449,6 @@
fieldE.Te.Field.name
= ML_(dinfo_strdup)( "di.readdwarf3.ptD.member.3",
"<anon_field>" );
- vg_assert(fieldE.Te.Field.name);
if (fieldE.Te.Field.typeR == D3_INVALID_CUOFF)
goto_bad_DIE;
if (fieldE.Te.Field.nLoc) {
Modified: trunk/coregrind/m_debuginfo/readpdb.c
==============================================================================
--- trunk/coregrind/m_debuginfo/readpdb.c (original)
+++ trunk/coregrind/m_debuginfo/readpdb.c Sun Sep 14 07:40:19 2014
@@ -2448,7 +2448,6 @@
+ VG_(strlen)(egrep) + VG_(strlen)(tmpname)
+ 100/*misc*/;
HChar* cmd = ML_(dinfo_zalloc)("di.readpe.fnopf.cmd", cmdlen);
- vg_assert(cmd);
VG_(sprintf)(cmd, "%s -c \"%s '%s' | %s '\\.pdb|\\.PDB' >> %s\"",
sh, strings, pename, egrep, tmpname);
vg_assert(cmd[cmdlen-1] == 0);
@@ -2484,7 +2483,6 @@
}
HChar* pdbname = ML_(dinfo_zalloc)("di.readpe.fnopf.pdbname", szB + 1);
- vg_assert(pdbname);
pdbname[szB] = 0;
Int nread = VG_(read)(fd, pdbname, szB);
|