From bb6d88bc61748124211226fce74a754f9a3758ec Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Wed, 1 Feb 2017 19:50:52 -0800
Subject: [PATCH] rffi: remove unused global variables
---
.../fficall/src/jni/variables.c | 11 -----------
.../oracle/truffle/r/runtime/ffi/RFFIVariables.java | 3 ---
2 files changed, 14 deletions(-)
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/variables.c b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
index 827b2d40e8..cbab66f68f 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/variables.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
@@ -83,11 +83,6 @@ static SEXP R_SrcrefSymbol_static;
static SEXP R_SrcfileSymbol_static;
static SEXP R_RestartToken_static;
-// logical constants
-static SEXP R_TrueValue_static;
-static SEXP R_FalseValue_static;
-static SEXP R_LogicalNAValue_static;
-
static const char *R_Home_static;
static const char *R_TempDir_static;
@@ -437,12 +432,6 @@ void init_variables(JNIEnv *env, jobjectArray initialValues) {
R_BlankScalarString_static = ref;
} else if (strcmp(nameChars, "R_NamespaceEnvSymbol") == 0) {
R_NamespaceEnvSymbol_static = ref;
- } else if (strcmp(nameChars, "R_TrueValue") == 0) {
- R_TrueValue_static = ref;
- } else if (strcmp(nameChars, "R_FalseValue") == 0) {
- R_FalseValue_static = ref;
- } else if (strcmp(nameChars, "R_LogicalNAValue") == 0) {
- R_LogicalNAValue_static = ref;
} else {
char msg[128];
strcpy(msg, "non-null R variable not assigned: ");
diff --git a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/RFFIVariables.java b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/RFFIVariables.java
index 4b2c7df1b2..be05015ada 100644
--- a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/RFFIVariables.java
+++ b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/RFFIVariables.java
@@ -79,9 +79,6 @@ public enum RFFIVariables {
R_NaInt(RRuntime.INT_NA),
R_BlankString(CharSXPWrapper.create("")),
R_BlankScalarString(RDataFactory.createStringVectorFromScalar("")),
- R_TrueValue(RRuntime.LOGICAL_TRUE),
- R_FalseValue(RRuntime.LOGICAL_FALSE),
- R_LogicalNAValue(RRuntime.LOGICAL_NA),
R_BaseSymbol(RDataFactory.createSymbol("base")),
R_NamespaceEnvSymbol(RDataFactory.createSymbol(".__NAMESPACE__.")),
R_RestartToken(null);
--
GitLab