From: Michael Snyder <msnyder@vmware.com>
Date: Thu, 10 Mar 2011 20:25:44 +0000 (+0000)
Subject: Revert previous change.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c96d965cf2fb9fac4412c20d35312636a239fbda;p=binutils-gdb.git

Revert previous change.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a9991eaba0b..19a767eaa30 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,8 +1,5 @@
 2011-03-10  Michael Snyder  <msnyder@vmware.com>
 
-	* p-typeprint.c (pascal_type_print_method_args): Don't use 
-	pointer until after null-check.
-
 	* tracepoint.c (cmd_qtv): Discard unused value 'packet'.
 	(cmd_qtframe): Ditto.
 	(cmd_qtbuffer): Ditto.
diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index fb3f3a14b1b..54a761d464a 100644
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -156,18 +156,18 @@ void
 pascal_type_print_method_args (char *physname, char *methodname,
 			       struct ui_file *stream)
 {
-  fputs_filtered (methodname, stream);
+  int is_constructor = (strncmp (physname, "__ct__", 6) == 0);
+  int is_destructor = (strncmp (physname, "__dt__", 6) == 0);
 
-  if (physname && (*physname != 0))
+  if (is_constructor || is_destructor)
     {
-      int is_constructor = (strncmp (physname, "__ct__", 6) == 0);
-      int is_destructor = (strncmp (physname, "__dt__", 6) == 0);
+      physname += 6;
+    }
 
-      if (is_constructor || is_destructor)
-	{
-	  physname += 6;
-	}
+  fputs_filtered (methodname, stream);
 
+  if (physname && (*physname != 0))
+    {
       fputs_filtered (" (", stream);
       /* We must demangle this.  */
       while (isdigit (physname[0]))