[GR-14293] Additional native API functions.

PullRequest: fastr/1969

Author: lukasstadler

.gitignore

@@ -147,4 +147,12 @@ documentation/.pydevproject
 com.oracle.truffle.r.native/gnur/patch-build
 com.oracle.truffle.r.test.native/embedded/embedded.actual.output
 com.oracle.truffle.r.test.native/embedded/main.actual.output
-f2c
+f2c
+test.fastr
+test.gnur
+test.diffs
+install.tmp.fastr
+install.tmp.gnur
+lib.install.packages.fastr
+lib.install.packages.gnur
+/com.oracle.truffle.r.release/doc/

com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguageImpl.java

@@ -173,7 +173,7 @@ protected String toString(RContext context, Object value) {
             stateStdConnections.setBuffer(buffer);
             RContext.getEngine().evalFunction((RFunction) printObj, callingFrame, RCaller.topLevel, false, ArgumentsSignature.empty(1), asVector);
             // remove the last "\n", which is useful for REPL, but not here
-            if (buffer.charAt(buffer.length() - 1) == '\n') {
+            if (buffer.length() > 0 && buffer.charAt(buffer.length() - 1) == '\n') {
                 buffer.setLength(buffer.length() - 1);
             }
             return buffer.toString();

com.oracle.truffle.r.ffi.codegen/src/com/oracle/truffle/r/ffi/codegen/FFIUpCallsIndexCodeGen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 package com.oracle.truffle.r.ffi.codegen;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 
@@ -47,19 +48,20 @@ private void run(String[] args) {
         out.append("#ifndef RFFI_UPCALLSINDEX_H\n");
         out.append("#define RFFI_UPCALLSINDEX_H\n");
         out.append('\n');
-        Method[] methods = UpCallsRFFI.class.getMethods();
-        Arrays.sort(methods, new Comparator<Method>() {
+        ArrayList<Method> methods = new ArrayList<>(Arrays.asList(UpCallsRFFI.class.getMethods()));
+        methods.removeAll(Arrays.asList(UpCallsRFFI.class.getDeclaredMethods()));
+        methods.sort(new Comparator<Method>() {
             @Override
             public int compare(Method e1, Method e2) {
                 return e1.getName().toString().compareTo(e2.getName().toString());
             }
         });
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
+        for (int i = 0; i < methods.size(); i++) {
+            Method method = methods.get(i);
             out.append("#define ").append(method.getName()).append("_x ").append(Integer.toString(i)).append('\n');
         }
         out.append('\n');
-        out.append("#define ").append("UPCALLS_TABLE_SIZE ").append(Integer.toString(methods.length)).append('\n');
+        out.append("#define ").append("UPCALLS_TABLE_SIZE ").append(Integer.toString(methods.size())).append('\n');
         out.append('\n');
         out.append("#endif // RFFI_UPCALLSINDEX_H\n");
     }

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java

@@ -97,6 +97,7 @@
 import com.oracle.truffle.r.runtime.data.RTypedValue;
 import com.oracle.truffle.r.runtime.data.RUnboundValue;
 import com.oracle.truffle.r.runtime.data.RVector;
+import com.oracle.truffle.r.runtime.data.RWeakRef;
 import com.oracle.truffle.r.runtime.data.model.RAbstractAtomicVector;
 import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
 import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@@ -375,6 +376,9 @@ public Object Rf_installChar(Object name) {
     @Override
     @TruffleBoundary
     public Object Rf_lengthgets(Object x, int newSize) {
+        if (x == RNull.instance) {
+            return RNull.instance;
+        }
         RAbstractVector vec = (RAbstractVector) RRuntime.asAbstractVector(x);
         return vec.resize(newSize);
     }
@@ -1545,6 +1549,32 @@ public Object R_MethodsNamespace() {
         return REnvironment.getRegisteredNamespace("methods");
     }
 
+    // basic support for weak reference API - they are not actually weak and don't call finalizers
+
+    @Override
+    @TruffleBoundary
+    public Object R_MakeWeakRef(Object key, Object val, Object fin, long onexit) {
+        return new RWeakRef(key, val, fin, onexit != 0);
+    }
+
+    @Override
+    @TruffleBoundary
+    public Object R_MakeWeakRefC(Object key, Object val, long fin, long onexit) {
+        return new RWeakRef(key, val, fin, onexit != 0);
+    }
+
+    @Override
+    @TruffleBoundary
+    public Object R_WeakRefKey(Object w) {
+        return guaranteeInstanceOf(w, RWeakRef.class).getKey();
+    }
+
+    @Override
+    @TruffleBoundary
+    public Object R_WeakRefValue(Object w) {
+        return guaranteeInstanceOf(w, RWeakRef.class).getValue();
+    }
+
     @Override
     @TruffleBoundary
     public void R_PreserveObject(Object obj) {
@@ -1587,11 +1617,20 @@ public Object Rf_protect(Object x) {
     public void Rf_unprotect(int x) {
         RFFIContext context = getContext();
         ArrayList<RObject> stack = context.rffiContextState.protectStack;
-        for (int i = 0; i < x; i++) {
-            context.registerReferenceUsedInNative(stack.remove(stack.size() - 1));
+        try {
+            for (int i = 0; i < x; i++) {
+                context.registerReferenceUsedInNative(stack.remove(stack.size() - 1));
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            debugWarning("mismatched protect/unprotect (unprotect with empty protect stack)");
         }
     }
 
+    private static boolean debugWarning(String message) {
+        RError.warning(RError.SHOW_CALLER, RError.Message.GENERIC, message);
+        return true;
+    }
+
     @Override
     @TruffleBoundary
     public int R_ProtectWithIndex(Object x) {

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/interop/FFI_RForeignAccessFactoryImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
 import com.oracle.truffle.r.runtime.data.CharSXPWrapper;
 import com.oracle.truffle.r.runtime.data.CharSXPWrapperMRForeign;
 import com.oracle.truffle.r.runtime.data.RTruffleObject;
+import com.oracle.truffle.r.runtime.data.RWeakRef;
+import com.oracle.truffle.r.runtime.data.RWeakRefMRForeign;
 import com.oracle.truffle.r.runtime.ffi.DLL;
 
 public class FFI_RForeignAccessFactoryImpl {
@@ -36,6 +38,8 @@ public static ForeignAccess getForeignAccess(RTruffleObject obj) {
             return DLLDotSymbolMRForeign.ACCESS;
         } else if (obj instanceof CharSXPWrapper) {
             return CharSXPWrapperMRForeign.ACCESS;
+        } else if (obj instanceof RWeakRef) {
+            return RWeakRefMRForeign.ACCESS;
         } else {
             return null;
         }

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/AttributesAccessNodes.java

@@ -106,8 +106,9 @@ public static RfSetAttribNode create() {
 
         @Specialization(guards = "!isNull(value)")
         protected Object setValue(RAttributable target, Object name, Object value,
+                        @Cached("create()") InternStringNode intern,
                         @Cached("create()") SetAttributeNode setAttribNode) {
-            setAttribNode.execute(target, (String) getCastNameNode().doCast(name), value);
+            setAttribNode.execute(target, intern.execute((String) getCastNameNode().doCast(name)), value);
             return RNull.instance;
         }
 
@@ -118,8 +119,9 @@ protected Object setValue(@SuppressWarnings("unused") RNull target, @SuppressWar
 
         @Specialization
         protected Object unsetValue(RAttributable target, Object name, @SuppressWarnings("unused") RNull nullVal,
+                        @Cached("create()") InternStringNode intern,
                         @Cached("create()") RemoveAttributeNode removeAttributeNode) {
-            removeAttributeNode.execute(target, (String) getCastNameNode().doCast(name));
+            removeAttributeNode.execute(target, intern.execute((String) getCastNameNode().doCast(name)));
             return RNull.instance;
         }
 

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/MemoryUpCallsRFFI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,14 @@
 public interface MemoryUpCallsRFFI {
     // Checkstyle: stop method name check
 
+    Object R_MakeWeakRef(Object key, Object val, Object fin, long onexit);
+
+    Object R_MakeWeakRefC(Object key, Object val, long fin, long onexit);
+
+    Object R_WeakRefKey(Object w);
+
+    Object R_WeakRefValue(Object w);
+
     void R_PreserveObject(Object obj);
 
     void R_ReleaseObject(Object obj);

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/UpCallsRFFI.java

@@ -32,6 +32,8 @@
 @RFFIUpCallRoot
 public interface UpCallsRFFI extends StdUpCallsRFFI, IDEUpCallsRFFI, VariableUpCallsRFFI, DLLUpCallsRFFI, MemoryUpCallsRFFI, FastRUpCalls {
 
+    // methods in here are not considered by FFIUpCallsIndexCodeGen
+
     interface HandleUpCallExceptionNode extends NodeInterface {
         void execute(Throwable ex);
     }

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/CompleteCases.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1995, 1996  Robert Gentleman and Ross Ihaka
  * Copyright (c) 1997-2013,  The R Core Team
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -166,6 +166,8 @@ private void iterateAbstractVectorContents(int len, byte[] result, Object obj) {
                     result[e % len] = RRuntime.LOGICAL_FALSE;
                 }
             }
+        } else if (entry == RNull.instance) {
+            // ignore NULL values
         } else {
             throw invalidType(entry);
         }

com.oracle.truffle.r.native/fficall/src/common/Rinternals_common.c

@@ -118,7 +118,7 @@ void *DATAPTR(SEXP x) {
 	} else if (type == CPLXSXP) {
 	    return COMPLEX(x);
     } else if (type == CHARSXP) {
-        return R_CHAR(x);
+        return (void*) R_CHAR(x);
     } else {
         return FASTR_DATAPTR(x);
 	}