Use new bucket

Author: thisisnic

r/src/arrow_cpp11.h

@@ -208,14 +208,20 @@ Pointer r6_to_pointer(SEXP self) {
     cpp11::stop("Invalid R object for %s, must be an ArrowObject", type_name.c_str());
   }
 
-#if R_VERSION >= R_Version(4, 5, 0)
-  SEXP xp = R_getVarEx(arrow::r::symbols::xp, self, FALSE, R_UnboundValue);
+#if R_VERSION >= R_Version(4, 6, 0)
+  if (!R_existsVarInFrame(self, arrow::r::symbols::xp)) {
+    cpp11::stop("Invalid: self$`.:xp:.` is NULL");
+  }
+  SEXP xp = R_getVar(arrow::r::symbols::xp, self, FALSE);
+  if (xp == R_NilValue) {
+    cpp11::stop("Invalid: self$`.:xp:.` is NULL");
+  }
 #else
   SEXP xp = Rf_findVarInFrame(self, arrow::r::symbols::xp);
-#endif
   if (xp == R_UnboundValue || xp == R_NilValue) {
     cpp11::stop("Invalid: self$`.:xp:.` is NULL");
   }
+#endif
 
   void* p = R_ExternalPtrAddr(xp);
   if (p == nullptr) {
@@ -227,10 +233,16 @@ Pointer r6_to_pointer(SEXP self) {
 
 template <typename T>
 void r6_reset_pointer(SEXP r6) {
-#if R_VERSION >= R_Version(4, 5, 0)
-  SEXP xp = R_getVarEx(arrow::r::symbols::xp, r6, FALSE, R_UnboundValue);
+#if R_VERSION >= R_Version(4, 6, 0)
+  if (!R_existsVarInFrame(r6, arrow::r::symbols::xp)) {
+    return;
+  }
+  SEXP xp = R_getVar(arrow::r::symbols::xp, r6, FALSE);
 #else
   SEXP xp = Rf_findVarInFrame(r6, arrow::r::symbols::xp);
+  if (xp == R_UnboundValue) {
+    return;
+  }
 #endif
   void* p = R_ExternalPtrAddr(xp);
   if (p != nullptr) {
@@ -388,13 +400,12 @@ SEXP to_r6(const std::shared_ptr<T>& ptr, const char* r6_class_name) {
   cpp11::external_pointer<std::shared_ptr<T>> xp(new std::shared_ptr<T>(ptr));
   SEXP r6_class = Rf_install(r6_class_name);
 
-// R_existsVarInFrame doesn't exist before R 4.2, so we need to fall back to
-// Rf_findVarInFrame3 if it is not defined.
-#if R_VERSION >= R_Version(4, 2, 0)
+#if R_VERSION >= R_Version(4, 6, 0)
   if (!R_existsVarInFrame(arrow::r::ns::arrow, r6_class)) {
     cpp11::stop("No arrow R6 class named '%s'", r6_class_name);
   }
 #else
+  // Rf_findVarInFrame3 and R_UnboundValue are non-API as of R 4.6
   if (Rf_findVarInFrame3(arrow::r::ns::arrow, r6_class, FALSE) == R_UnboundValue) {
     cpp11::stop("No arrow R6 class named '%s'", r6_class_name);
   }

r/src/symbols.cpp

@@ -46,9 +46,11 @@ SEXP precious(SEXP x) {
 // returns the namespace environment for package `name`
 SEXP precious_namespace(std::string name) {
   SEXP s_name = PROTECT(cpp11::writable::strings({name}));
-  SEXP ns = R_FindNamespace(s_name);
+  // Use getNamespace() instead of non-API R_FindNamespace
+  SEXP call = PROTECT(Rf_lang2(Rf_install("getNamespace"), s_name));
+  SEXP ns = Rf_eval(call, R_BaseEnv);
   R_PreserveObject(ns);
-  UNPROTECT(1);
+  UNPROTECT(2);
 
   return ns;
 }