Merge pull request #200 from r-lib/upkeep/avoid-Rf_allocSExp

Author: gaborcsardi

inst/tools/error-codes.R

@@ -7,7 +7,7 @@ code <- '
 
 SEXP ps__define_errno(void) {
 
-  SEXP env = PROTECT(Rf_allocSExp(ENVSXP));
+SEXP env = PROTECT(ps_new_env());
 
 #define PS_ADD_ERRNO(err,str,val)                                        \\
   defineVar(                                                             \\

src/common.h

@@ -5,13 +5,29 @@
 #define R_USE_C99_IN_CXX 1
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>
+#include <Rversion.h>
 
 #include "ps-internal.h"
 
 /* ---------------------------------------------------------------------*/
 /* Internals                                                            */
 /* ---------------------------------------------------------------------*/
 
+static R_INLINE SEXP ps_new_env(void) {
+  SEXP env;
+#if R_VERSION >= R_Version(4, 1, 0)
+  PROTECT(env = R_NewEnv(R_EmptyEnv, 1, 29));
+#else
+  PROTECT(env = Rf_allocSExp(ENVSXP));
+  SET_FRAME(env, R_NilValue);
+  SET_ENCLOS(env, R_EmptyEnv);
+  SET_HASHTAB(env, R_NilValue);
+  SET_ATTRIB(env, R_NilValue);
+#endif
+  UNPROTECT(1);
+  return env;
+}
+
 extern int PS__TESTING;
 extern int PS__DEBUG;
 

src/posix.c

@@ -224,7 +224,7 @@ SEXP psp__waitpid(SEXP r_pid) {
 }
 SEXP ps__define_signals(void) {
 
-  SEXP signalenv = PROTECT(Rf_allocSExp(ENVSXP));
+  SEXP signalenv = PROTECT(ps_new_env());
 
 #define PS_ADD_SIGNAL(sig)						\
   defineVar(install(#sig), PROTECT(ScalarInteger(sig)), signalenv);	\
@@ -358,7 +358,7 @@ SEXP ps__define_signals(void) {
 
 
 SEXP ps__define_socket_address_families(void) {
-  SEXP afenv = PROTECT(Rf_allocSExp(ENVSXP));
+  SEXP afenv = PROTECT(ps_new_env());
 
 #define PS_ADD_AF(af)						\
   defineVar(install(#af), PROTECT(ScalarInteger(af)), afenv);	\
@@ -508,7 +508,7 @@ SEXP ps__define_socket_address_families(void) {
 }
 
 SEXP ps__define_socket_types(void) {
-  SEXP env = PROTECT(Rf_allocSExp(ENVSXP));
+  SEXP env = PROTECT(ps_new_env());
 
 #define PS_ADD_SOCKET_TYPE(type)					\
   defineVar(install(#type), PROTECT(ScalarInteger(type)), env);		\

src/windows.c

@@ -763,7 +763,7 @@ SEXP ps__define_tcp_statuses(void) {
 }
 
 SEXP ps__define_socket_address_families() {
-  SEXP afenv = PROTECT(Rf_allocSExp(ENVSXP));
+  SEXP afenv = PROTECT(ps_new_env());
 
   defineVar(install("AF_INET"), PROTECT(ScalarInteger(AF_INET)), afenv);
   UNPROTECT(1);
@@ -776,7 +776,7 @@ SEXP ps__define_socket_address_families() {
 }
 
 SEXP ps__define_socket_types() {
-  SEXP env = PROTECT(Rf_allocSExp(ENVSXP));
+  SEXP env = PROTECT(ps_new_env());
 
   defineVar(install("SOCK_STREAM"), PROTECT(ScalarInteger(SOCK_STREAM)), env);
   UNPROTECT(1);