carbon2-commit: put back patch to get more informative staticpro debugging

[Ben Wing]

changeset:   5019:bcdf496e49d0
user:        Ben Wing <ben at xemacs.org>
date:        Thu Feb 04 05:55:25 2010 -0600
files:       src/ChangeLog src/symbols.c src/symeval.h
description:
put back patch to get more informative staticpro debugging

-------------------- ChangeLog entries follow: --------------------

src/ChangeLog addition:

2010-02-04  Ben Wing  <ben at xemacs.org>

	* symbols.c (defsymbol_massage_name_1):
	* symbols.c (defsymbol_nodump):
	* symbols.c (defsymbol):
	* symbols.c (defkeyword):
	* symeval.h (DEFVAR_SYMVAL_FWD_OBJECT):
	Put this back again:

	Make the various calls to staticpro() instead call staticpro_1(),
	passing in the name of the C var being staticpro'ed, so that it
	shows up in staticpro_names.  Otherwise staticpro_names just has
	1000+ copies of the word `location'.


diff -r 5c89ceb69819 -r bcdf496e49d0 src/ChangeLog
--- a/src/ChangeLog	Thu Feb 04 05:39:00 2010 -0600
+++ b/src/ChangeLog	Thu Feb 04 05:55:25 2010 -0600
@@ -1,3 +1,17 @@
+2010-02-04  Ben Wing  <ben at xemacs.org>
+
+	* symbols.c (defsymbol_massage_name_1):
+	* symbols.c (defsymbol_nodump):
+	* symbols.c (defsymbol):
+	* symbols.c (defkeyword):
+	* symeval.h (DEFVAR_SYMVAL_FWD_OBJECT):
+	Put this back again:
+	
+	Make the various calls to staticpro() instead call staticpro_1(),
+	passing in the name of the C var being staticpro'ed, so that it
+	shows up in staticpro_names.  Otherwise staticpro_names just has
+	1000+ copies of the word `location'.
+
 2010-02-04  Ben Wing  <ben at xemacs.org>
 
 	* bytecode.c (assert_failed_with_remembered_ops):
diff -r 5c89ceb69819 -r bcdf496e49d0 src/symbols.c
--- a/src/symbols.c	Thu Feb 04 05:39:00 2010 -0600
+++ b/src/symbols.c	Thu Feb 04 05:55:25 2010 -0600
@@ -3621,9 +3621,9 @@
       temp[i] = '-';
   *location = Fintern (make_string ((const Ibyte *) temp, len), Qnil);
   if (dump_p)
-    staticpro (location);
-  else
-    staticpro_nodump (location);
+    staticpro_1 (location, name);
+  else
+    staticpro_nodump_1 (location, name);
 }
 
 void
@@ -3657,7 +3657,7 @@
   *location = Fintern (make_string_nocopy ((const Ibyte *) name,
 					   strlen (name)),
 		       Qnil);
-  staticpro_nodump (location);
+  staticpro_nodump_1 (location, name);
 }
 
 void
@@ -3666,7 +3666,7 @@
   *location = Fintern (make_string_nocopy ((const Ibyte *) name,
 					   strlen (name)),
 		       Qnil);
-  staticpro (location);
+  staticpro_1 (location, name);
 }
 
 void
diff -r 5c89ceb69819 -r bcdf496e49d0 src/symeval.h
--- a/src/symeval.h	Thu Feb 04 05:39:00 2010 -0600
+++ b/src/symeval.h	Thu Feb 04 05:55:25 2010 -0600
@@ -460,7 +460,7 @@
   DEFVAR_SYMVAL_FWD (lname, c_location, forward_type, magicfun);	    \
   {									    \
     Lisp_Object *DSF_location = c_location; /* Type check */		    \
-    staticpro (DSF_location);						    \
+    staticpro_1 (DSF_location, lname);					    \
     if (EQ (*DSF_location, Qnull_pointer)) *DSF_location = Qnil;	    \
   }									    \
 } while (0)