Index: src/backend/nodes/nodes.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/nodes/nodes.c,v
retrieving revision 1.15
diff -c -c -r1.15 nodes.c
*** src/backend/nodes/nodes.c	20 Jun 2002 20:29:29 -0000	1.15
--- src/backend/nodes/nodes.c	9 Oct 2002 05:17:13 -0000
***************
*** 28,42 ****
   *	  macro makeNode. eg. to create a Resdom node, use makeNode(Resdom)
   *
   */
! Node *
! newNode(Size size, NodeTag tag)
! {
! 	Node	   *newNode;
  
- 	Assert(size >= sizeof(Node));		/* need the tag, at least */
- 
- 	newNode = (Node *) palloc(size);
- 	MemSet((char *) newNode, 0, size);
- 	newNode->type = tag;
- 	return newNode;
- }
--- 28,32 ----
   *	  macro makeNode. eg. to create a Resdom node, use makeNode(Resdom)
   *
   */
! Node *newNodeMacroHolder;
  
Index: src/backend/utils/mmgr/mcxt.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/utils/mmgr/mcxt.c,v
retrieving revision 1.32
diff -c -c -r1.32 mcxt.c
*** src/backend/utils/mmgr/mcxt.c	12 Aug 2002 00:36:12 -0000	1.32
--- src/backend/utils/mmgr/mcxt.c	9 Oct 2002 05:17:17 -0000
***************
*** 453,458 ****
--- 453,481 ----
  }
  
  /*
+  * MemoryContextAllocC
+  *		Like MemoryContextAlloc, but clears allocated memory
+  *
+  *	We could just call MemoryContextAlloc then clear the memory, but this
+  *	function is called too many times, so we have a separate version.
+  */
+ void *
+ MemoryContextAllocC(MemoryContext context, Size size)
+ {
+ 	void *ret;
+ 
+ 	AssertArg(MemoryContextIsValid(context));
+ 
+ 	if (!AllocSizeIsValid(size))
+ 		elog(ERROR, "MemoryContextAlloc: invalid request size %lu",
+ 			 (unsigned long) size);
+ 
+ 	ret = (*context->methods->alloc) (context, size);
+ 	MemSet(ret, 0, size);
+ 	return ret;
+ }
+ 
+ /*
   * pfree
   *		Release an allocated chunk.
   */
Index: src/include/nodes/nodes.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/include/nodes/nodes.h,v
retrieving revision 1.118
diff -c -c -r1.118 nodes.h
*** src/include/nodes/nodes.h	31 Aug 2002 22:10:47 -0000	1.118
--- src/include/nodes/nodes.h	9 Oct 2002 05:17:20 -0000
***************
*** 261,266 ****
--- 261,284 ----
  
  #define nodeTag(nodeptr)		(((Node*)(nodeptr))->type)
  
+ /*
+  *	There is no way to dereference the palloc'ed pointer to assign the
+  *	tag, and return the pointer itself, so we need a holder variable.
+  *	Fortunately, this function isn't recursive so we just define
+  *	a global variable for this purpose.
+  */
+ extern Node *newNodeMacroHolder;
+ 
+ #define newNode(size, tag) \
+ ( \
+ 	AssertMacro((size) >= sizeof(Node)),		/* need the tag, at least */ \
+ \
+ 	newNodeMacroHolder = (Node *) pallocC(size), \
+ 	newNodeMacroHolder->type = (tag), \
+ 	newNodeMacroHolder \
+ )
+ 
+ 
  #define makeNode(_type_)		((_type_ *) newNode(sizeof(_type_),T_##_type_))
  #define NodeSetTag(nodeptr,t)	(((Node*)(nodeptr))->type = (t))
  
***************
*** 281,291 ****
   *					  extern declarations follow
   * ----------------------------------------------------------------
   */
- 
- /*
-  * nodes/nodes.c
-  */
- extern Node *newNode(Size size, NodeTag tag);
  
  /*
   * nodes/{outfuncs.c,print.c}
--- 299,304 ----
Index: src/include/utils/palloc.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/include/utils/palloc.h,v
retrieving revision 1.19
diff -c -c -r1.19 palloc.h
*** src/include/utils/palloc.h	20 Jun 2002 20:29:53 -0000	1.19
--- src/include/utils/palloc.h	9 Oct 2002 05:17:21 -0000
***************
*** 46,53 ****
--- 46,56 ----
   * Fundamental memory-allocation operations (more are in utils/memutils.h)
   */
  extern void *MemoryContextAlloc(MemoryContext context, Size size);
+ extern void *MemoryContextAllocC(MemoryContext context, Size size);
  
  #define palloc(sz)	MemoryContextAlloc(CurrentMemoryContext, (sz))
+ 
+ #define pallocC(sz)	MemoryContextAllocC(CurrentMemoryContext, (sz))
  
  extern void pfree(void *pointer);