The R Project SVN – R – Diff – /branches/ALTREP/src/main/dotcode.c

     else {
 	SEXP *cargscp = (SEXP *) R_alloc(nargs, sizeof(SEXP));
 	int i;
 	for(i = 0; i < nargs; i++)
 	    cargscp[i] = PROTECT(duplicate(cargs[i]));
-	retval = R_doDotCall(ofun, nargs, cargs, call);
+	retval = PROTECT(R_doDotCall(ofun, nargs, cargs, call));
 	Rboolean constsOK = TRUE;
 	for(i = 0; constsOK && i < nargs; i++)
-            /* 7: not numerical comparison, not single NA, not attributes as
+	    /* 39: not numerical comparison, not single NA, not attributes as
-	       set, do ignore byte-code, do ignore environments of closures */
+               set, do ignore byte-code, do ignore environments of closures,
+               not ignore srcref
+               srcref is not ignored because ignoring it is expensive
+               (it triggers duplication)
+	    */
-            if (!R_compute_identical(cargs[i], cargscp[i], 7)
+            if (!R_compute_identical(cargs[i], cargscp[i], 39)
 		    && !R_checkConstants(FALSE))
 		constsOK = FALSE;
 	if (!constsOK) {
 	    REprintf("ERROR: detected compiler constant(s) modification after"
 		" .Call invocation of function %s.\n", buf);
 	    for(i = 0; i < nargs; i++)
-		if (!R_compute_identical(cargs[i], cargscp[i], 7))
+		if (!R_compute_identical(cargs[i], cargscp[i], 39))
 		    REprintf("NOTE: .Call function %s modified its argument"
 			" (number %d, type %s, length %d)\n",
 			buf,
 			i + 1,
 			CHAR(type2str(TYPEOF(cargscp[i]))),
 			length(cargscp[i])
 		    );
 	    R_Suicide("compiler constants were modified (in .Call?)!\n");
+	}
-	UNPROTECT(nargs);
+	UNPROTECT(nargs + 1);
+    }
     vmaxset(vmax);
     return retval;
+}

The R Project SVN R

(root)/branches/ALTREP/src/main/dotcode.c @ 77458 – Rev 70827 → 70845