From: Julian Seward <jseward@acm.org>
Date: Sun, 26 Oct 2008 11:59:03 +0000 (+0000)
Subject: Re-copy r3515 into new demangler: "Deal with apparently non-cfront
X-Git-Tag: svn/VALGRIND_3_4_0~183
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab002e71dbf0075a48675658345eefe52d5bce48;p=thirdparty%2Fvalgrind.git

Re-copy r3515 into new demangler: "Deal with apparently non-cfront
compliant new[]/delete[] manglings generated by the Portland Group's
C++ compiler."



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8711
---

diff --git a/coregrind/m_demangle/cplus-dem.c b/coregrind/m_demangle/cplus-dem.c
index bc4cc18da4..7c3cefac23 100644
--- a/coregrind/m_demangle/cplus-dem.c
+++ b/coregrind/m_demangle/cplus-dem.c
@@ -4582,6 +4582,22 @@ demangle_function_name (struct work_stuff *work, const char **mangled,
 		}
 	    }
 	}
+
+      /* BEGIN hack inserted 20050403 by JRS to deal with apparently
+         non-cfront compliant new[]/delete[] manglings generated by
+         the Portland Group's C++ compiler. */
+      else 
+      if (strcmp (declp -> b, "__nwa") == 0) {
+         string_clear (declp);
+         string_append (declp, "operator new[]");
+      }
+      else 
+      if (strcmp (declp -> b, "__dla") == 0) {
+         string_clear (declp);
+         string_append (declp, "operator delete[]");
+      }
+      /* END hack */
+
       else
 	{
 	  if (declp->b[2] == 'a' && declp->b[5] == '\0')