(arrow) branch main updated: GH-49529: [R] CI job shows NOTE due to "non-API call" Rf_findVarInFrame (#49530)

[thisisnic]

This is an automated email from the ASF dual-hosted git repository.

thisisnic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new ee7e210535 GH-49529: [R] CI job shows NOTE due to "non-API call" 
Rf_findVarInFrame (#49530)
ee7e210535 is described below

commit ee7e2105354732f8521f41e48da1b3841c8873a4
Author: Nic Crane <thisis...@gmail.com>
AuthorDate: Tue Mar 24 12:10:32 2026 +0000

    GH-49529: [R] CI job shows NOTE due to "non-API call" Rf_findVarInFrame 
(#49530)
    
    ### Rationale for this change
    
    CI job shows NOTE due to "non-API call" Rf_findVarInFrame
    
    ### What changes are included in this PR?
    
    Remove non-API calls to doesn't come up on CRAN notes
    
    ### Are these changes tested?
    
    I'll do some CI testing
    
    ### Are there any user-facing changes?
    
    No
    
    ### AI use
    
    Basically all of this, with Claude Opus 4.5 but I did ask multiple 
questions on the reasoning behind the changes and alternatives - don't 
understand 100% but looks reasonable to me
    
    * GitHub Issue: #49529
    
    Authored-by: Nic Crane <thisis...@gmail.com>
    Signed-off-by: Nic Crane <thisis...@gmail.com>
---
 r/src/arrow_cpp11.h | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/r/src/arrow_cpp11.h b/r/src/arrow_cpp11.h
index 6ea11ea008..d28ad0fede 100644
--- a/r/src/arrow_cpp11.h
+++ b/r/src/arrow_cpp11.h
@@ -38,17 +38,6 @@
 #define ARROW_R_DCHECK(EXPR)
 #endif
 
-#if (R_VERSION < R_Version(3, 5, 0))
-#define LOGICAL_RO(x) ((const int*)LOGICAL(x))
-#define INTEGER_RO(x) ((const int*)INTEGER(x))
-#define REAL_RO(x) ((const double*)REAL(x))
-#define COMPLEX_RO(x) ((const Rcomplex*)COMPLEX(x))
-#define STRING_PTR_RO(x) ((const SEXP*)STRING_PTR(x))
-#define RAW_RO(x) ((const Rbyte*)RAW(x))
-#define DATAPTR_RO(x) ((const void*)STRING_PTR(x))
-#define DATAPTR(x) (void*)STRING_PTR(x)
-#endif
-
 // R_altrep_class_name and R_altrep_class_package don't exist before R 4.6
 #if R_VERSION < R_Version(4, 6, 0)
 inline SEXP R_altrep_class_name(SEXP x) {
@@ -219,8 +208,12 @@ 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);
+#else
   SEXP xp = Rf_findVarInFrame(self, arrow::r::symbols::xp);
-  if (xp == R_NilValue) {
+#endif
+  if (xp == R_UnboundValue || xp == R_NilValue) {
     cpp11::stop("Invalid: self$`.:xp:.` is NULL");
   }
 
@@ -234,7 +227,11 @@ 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);
+#else
   SEXP xp = Rf_findVarInFrame(r6, arrow::r::symbols::xp);
+#endif
   void* p = R_ExternalPtrAddr(xp);
   if (p != nullptr) {
     delete reinterpret_cast<const std::shared_ptr<T>*>(p);