2009-12-10 Basile Starynkevitch <basile@starynkevitch.net>

	* gcc/testsuite/melt/tletrec.melt: added a quoted string...
	* gcc/melt-runtime.h (struct meltobject_st): removed obj_serial.
	(melt_obj_serial, melt_object_set_serial): trivial deprecated
	functions.
	(MELT_OBJECT_STRUCT): removed obj_serial inside it.
	* gcc/melt-runtime.c (forwarded_copy, melt_serial_1, melt_serial_2)
	(melt_serial_3, melt_countserial, melt_object_set_serial):
	removed.
	(meltgc_new_raw_object): removed obj_serial inside it.
	* gcc/melt/warmelt-first.melt: removed or trivialized all serial
	related code.
	* gcc/melt/warmelt-normal.melt: updated normletrec_list,
	normletrec_pair, normletrec_instance
	* gcc/melt/warmelt-genobj.melt: added compilobj_conspairbind,
	compilobj_conslistbind, compilobj_consinstancebind functions as
	methods for compile_obj of constructive bindings. added
	class_objinitlist class_objinitpair.
	* gcc/melt/warmelt-outobj.melt: added output_c_declinit &
	output_c_initial_fill methods of class_objinitlist &
	class_objinitpair.
	* gcc/melt/ana-simple.melt: removed obj_serial...



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@155135 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 5 insertions, 25 deletions

diff --git a/gcc/melt-runtime.h b/gcc/melt-runtime.h
index 382f9688b66..1316d91bff5 100644
--- a/gcc/melt-runtime.h
+++ b/gcc/melt-runtime.h
@@ -394,38 +394,21 @@ meltobject_st
 /* discriminate the melt_un containing it as discr */
 #define object_magic obj_num
   unsigned short obj_len;
-#if ENABLE_CHECKING
-  unsigned long obj_serial;
-#endif
   melt_ptr_t GTY ((length ("%h.obj_len"))) obj_vartab[FLEXIBLE_DIM];
 };
 
-#if ENABLE_CHECKING
 
 #define MELT_OBJECT_STRUCT(N) {		\
   meltobject_ptr_t obj_class;		\
   unsigned obj_hash;				\
   unsigned short obj_num;			\
   unsigned short obj_len;			\
-  unsigned long obj_serial;                     \
   melt_ptr_t* obj_vartab[N];			\
   long _gap; }
 
-void melt_object_set_serial(meltobject_ptr_t ob);
-
-#else /*!ENABLE_CHECKING*/
-
-#define MELT_OBJECT_STRUCT(N) {		\
-  meltobject_ptr_t obj_class;		\
-  unsigned obj_hash;				\
-  unsigned short obj_num;			\
-  unsigned short obj_len;			\
-  melt_ptr_t* obj_vartab[N];			\
-  long _gap; }
+/* set serial is an obsolete  nop */
+static inline void melt_object_set_serial(meltobject_ptr_t ob ATTRIBUTE_UNUSED) {}
 
-/* set serial is a nop */
-static inline void melt_object_set_serial(meltobject_ptr_t ob) {}
-#endif
 
 /* some types, including objects, strbuf, stringmaps, objectmaps, all
    the other *maps, contain a pointer to a non value; this pointer
@@ -493,7 +476,7 @@ meltclosure_st
   meltobject_ptr_t discr;			\
   meltroutine_ptr_t rout;			\
   unsigned nbval;				\
-  melt_ptr_t tabval[N];			\
+  melt_ptr_t tabval[N];				\
   long _gap; }
 
 /* when OBMAG_ROUTINE */
@@ -1545,13 +1528,10 @@ melt_obj_hash (melt_ptr_t v)
   return 0;
 }
 
+/* obsolete function */
 static inline unsigned long
-melt_obj_serial (melt_ptr_t v)
+melt_obj_serial (melt_ptr_t v ATTRIBUTE_UNUSED)
 {
-#if ENABLE_CHECKING
-  if (melt_magic_discr (v) == OBMAG_OBJECT)
-    return ((meltobject_ptr_t) (v))->obj_serial;
-#endif
   return 0;
 }