Merge pull request #669 in G/fastr from...

Merge pull request #669 in G/fastr from ~MICK.JORDAN_ORACLE.COM/fastr:feature/rffi-remove-gvars to master

* commit 'bb6d88bc':
  rffi: remove unused global variables

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: ");

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);