Fix performance impact (get0) R>=3.2

r-lib · Apr 17, 2023 · 4dba01a · 4dba01a
1 parent 6d29037
commit 4dba01a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -15,7 +15,7 @@ License: MIT + file LICENSE
 URL: https://r6.r-lib.org, https://github.com/r-lib/R6/
 BugReports: https://github.com/r-lib/R6/issues
 Depends:
-    R (>= 3.0)
+    R (>= 3.2)
 Suggests:
     lobstr,
     testthat (>= 3.0.0)

diff --git a/R/clone.R b/R/clone.R
@@ -89,11 +89,9 @@ generator_funs$clone_method <- function(deep = FALSE) {
       # fields that are R6 objects.
       deep_clone <- function(name, value) {
         # Check if it's an R6 object.
-        if (
-          is.environment(value) &&
-          ".__enclos_env__" %in% ls(value, all.names = TRUE) &&
-          !is.null(get(".__enclos_env__", value))
-        ) {
+        is_r6_object <- is.environment(value) &&
+          !is.null(get0(".__enclos_env__", value, inherits = FALSE))
+        if (is_r6_object) {
           return(value$clone(deep = TRUE))
         }
         value