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 bc4cc18da43f5b859bef2a962398b65accaf4d7a..7c3cefac23f24c03adb9f0248258b8d47b8337da 100644 (file)
--- 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')