Return dgs.alc on success

libiberty/

2010-01-09  Ian Lance Taylor  <iant@google.com>

	PR other/42230
	* cp-demangle.c (d_demangle): Return dgs.alc on success.

libstdc++-v3/

2010-01-09  H.J. Lu  <hongjiu.lu@intel.com>

	PR other/42230
	* testsuite/abi/pr42230.cc: New.

From-SVN: r155785

libiberty/ChangeLog

+2010-01-09  Ian Lance Taylor  <iant@google.com>
+
+	PR other/42230
+	* cp-demangle.c (d_demangle): Return dgs.alc on success.
+
 2010-01-04  Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
 
 	PR target/42316

libiberty/cp-demangle.c

@@ -4777,7 +4777,7 @@ d_demangle (const char *mangled, int options, size_t *palc)
       return NULL;
     }
 
-  *palc = dgs.allocation_failure ? 1 : 0;
+  *palc = dgs.allocation_failure ? 1 : dgs.alc;
   return dgs.buf;
 }
 

libstdc++-v3/ChangeLog

+2010-01-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR other/42230
+	* testsuite/abi/pr42230.cc: New.
+
 2010-01-09  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/debug/set.h: Revert last change, per DR 1204 [Ready];

libstdc++-v3/testsuite/abi/pr42230.cc

+// { dg-do run }
+
+#include <cxxabi.h>
+#include <cassert>
+#include <cstddef>
+
+int main()
+{
+  std::size_t length = 0;
+  int cc;
+
+  char* ret = abi::__cxa_demangle("e", 0, &length, &cc);
+
+  assert( (cc < 0 && !ret) || (ret && length) );
+  return 0;
+}