The R Project SVN – R – Diff – /trunk/src/main/debug.c

 #endif /* R_MEMORY_PROFILING */
 SEXP attribute_hidden do_retracemem(SEXP call, SEXP op, SEXP args, SEXP rho)
+{
 #ifdef R_MEMORY_PROFILING
-    SEXP object, previous, ans, ap, argList;
+    SEXP object, previous, ans, argList;
     char buffer[21];
+    static SEXP do_retracemem_formals = NULL;
-    PROTECT(ap = list2(R_NilValue, R_NilValue));
+    if (do_retracemem_formals == NULL)
-    SET_TAG(ap,  install("x"));
+        do_retracemem_formals = allocFormalsList2(install("x"),
-    SET_TAG(CDR(ap), install("previous"));
+						  install("previous"));
-    PROTECT(argList =  matchArgs(ap, args, call));
+    PROTECT(argList =  matchArgs(do_retracemem_formals, args, call));
     if(CAR(argList) == R_MissingArg) SETCAR(argList, R_NilValue);
     if(CADR(argList) == R_MissingArg) SETCAR(CDR(argList), R_NilValue);
     object = CAR(ap);
     if (TYPEOF(object) == CLOSXP ||
 	    Rprintf("tracemem[%s -> %p]: ",
 		    translateChar(STRING_ELT(previous, 0)), (void *) object);
 	    memtrace_stack_dump();
+	}
+    }
-    UNPROTECT(2);
+    UNPROTECT(1);
     return ans;
 #else
     R_Visible = 0; /* for consistency with other case */
     return R_NilValue;
 #endif

The R Project SVN R