Move R_BindingIsActive() before Rf_findVarInFrame3()

Because that triggers them

Author: DavisVaughan

src/main/envir.c

@@ -779,6 +779,18 @@ static SEXP R_GetGlobalCacheLoc(SEXP symbol)
 */
 
 R_BindingType R_GetBindingType(SEXP sym, SEXP env) {
+    // We are currently getting the location in the environment twice:
+    // - In `R_BindingIsActive()`
+    // - In `Rf_findVarInFrame3()`
+    // Ideally we'd do it once, which would require manually walking
+    // over the environment frame / hashtable and get the location to
+    // inspect.
+    
+    // This check must be before `Rf_findVarInFrame3()` because that
+    // forces active bindings
+    if (R_BindingIsActive(sym, env))
+        return R_BindingTypeActive;
+    
     SEXP value = Rf_findVarInFrame3(env, sym, FALSE);
 
     if (value == R_UnboundValue) 
@@ -794,9 +806,6 @@ R_BindingType R_GetBindingType(SEXP sym, SEXP env) {
             return R_BindingTypeDelayedPromise;
     }
 
-    if (R_BindingIsActive(sym, env))
-        return R_BindingTypeActive;
-
     return R_BindingTypeValue;
 }