[GR-2798] A few smaller fixes.

PullRequest: fastr/1511

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_Context.java

@@ -65,6 +65,7 @@ import com.oracle.truffle.r.runtime.ffi.RFFIVariables;
 import com.oracle.truffle.r.runtime.ffi.StatsRFFI;
 import com.oracle.truffle.r.runtime.ffi.ToolsRFFI;
 import com.oracle.truffle.r.runtime.ffi.ZipRFFI;
+import java.util.ArrayDeque;
 
 import sun.misc.Unsafe;
 
@@ -109,7 +110,7 @@ final class TruffleNFI_Context extends RFFIContext {
      * this is less efficient than GNUR's version, we may need to implement it properly should the
      * performance be a problem.
      */
-    public final ArrayList<Long> transientAllocations = new ArrayList<>();
+    public final ArrayDeque<ArrayList<Long>> transientAllocations = new ArrayDeque<>();
 
     public void setLastUpCallException(RuntimeException ex) {
         assert ex == null || lastException == null : "last up-call exception is already set";
@@ -352,8 +353,8 @@ final class TruffleNFI_Context extends RFFIContext {
 
     @Override
     public long beforeDowncall() {
-        assert transientAllocations.size() == 0 : "transientAllocations should have been cleared in afterDowncall";
         super.beforeDowncall();
+        transientAllocations.push(new ArrayList<>());
         if (hasAccessLock) {
             acquireLock();
         }
@@ -364,10 +365,9 @@ final class TruffleNFI_Context extends RFFIContext {
     public void afterDowncall(long beforeValue) {
         super.afterDowncall(beforeValue);
         popCallbacks(beforeValue);
-        for (Long ptr : transientAllocations) {
+        for (Long ptr : transientAllocations.pop()) {
             UnsafeAdapter.UNSAFE.freeMemory(ptr);
         }
-        transientAllocations.clear();
         RuntimeException lastUpCallEx = getLastUpCallException();
         setLastUpCallException(null);
         if (hasAccessLock) {

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_UpCallsRFFIImpl.java

@@ -63,7 +63,7 @@ public class TruffleNFI_UpCallsRFFIImpl extends JavaUpCallsRFFIImpl {
     @Override
     public Object R_alloc(int n, int size) {
         long result = UnsafeAdapter.UNSAFE.allocateMemory(n * size);
-        getContext().transientAllocations.add(result);
+        getContext().transientAllocations.peek().add(result);
         return result;
     }
 

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

@@ -231,6 +231,12 @@ public final class AttributesAccessNodes {
             return RNull.instance;
         }
 
+        @Specialization
+        protected Object doIt(RSharingAttributeStorage target, RNull attributes) {
+            clearAttrs(target);
+            return RNull.instance;
+        }
+
         @Fallback
         protected Object doOthers(Object target, Object attrs) {
             throw unsupportedTypes("SET_ATTRIB", target, attrs);

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

@@ -22,23 +22,37 @@
  */
 package com.oracle.truffle.r.ffi.impl.nodes;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
+import com.oracle.truffle.r.nodes.builtin.MatchInternalNode;
+import com.oracle.truffle.r.nodes.builtin.MatchInternalNodeGen;
+import com.oracle.truffle.r.runtime.RError;
+import static com.oracle.truffle.r.runtime.RError.Message.MATCH_VECTOR_ARGS;
 import com.oracle.truffle.r.runtime.RInternalError;
 import com.oracle.truffle.r.runtime.RRuntime;
 import com.oracle.truffle.r.runtime.data.RTypes;
 import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
+import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
 
 public final class MatchNodes {
 
     @TypeSystemReference(RTypes.class)
     public abstract static class MatchNode extends FFIUpCallNode.Arg3 {
 
-        @SuppressWarnings("unused")
+        @Child MatchInternalNode match = MatchInternalNodeGen.create();
+
         @Specialization
-        Object match(Object itables, Object ix, int nmatch) {
-            throw RInternalError.unimplemented("Rf_match");
+        Object match(RAbstractVector x, RAbstractVector table, int noMatch) {
+            return match.execute(x, table, noMatch);
+        }
+
+        @SuppressWarnings("unused")
+        @Fallback
+        Object match(Object itables, Object ix, Object nmatch) {
+            CompilerDirectives.transferToInterpreter();
+            throw RError.error(this, MATCH_VECTOR_ARGS);
         }
 
         public static MatchNode create() {

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSuicide.java

@@ -51,7 +51,7 @@ public abstract class RSuicide {
     }
 
     public static RuntimeException rSuicide(RContext ctx, @SuppressWarnings("unused") Throwable cause, String msg) {
-        // TODO: output "cause"
+        RInternalError.reportError(cause);
         invokeUserDefinedSuicide(ctx, msg);
         throw rSuicideDefault(msg);
     }