Remove CompoundNamedListWrapper replace by eagerly created RList instance

Author: steve-s

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/interop/TruffleObjectConverter.java

@@ -22,6 +22,8 @@
  */
 package com.oracle.truffle.r.runtime.interop;
 
+import java.util.ArrayList;
+
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.interop.InteropException;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -38,13 +40,7 @@
 import com.oracle.truffle.r.runtime.data.RForeignListWrapper;
 import com.oracle.truffle.r.runtime.data.RForeignStringWrapper;
 import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RList;
 import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
-import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
-import com.oracle.truffle.r.runtime.data.nodes.FastPathVectorAccess.FastPathFromListAccess;
-import com.oracle.truffle.r.runtime.data.nodes.SlowPathVectorAccess.SlowPathFromListAccess;
-import com.oracle.truffle.r.runtime.data.nodes.VectorAccess;
 
 public final class TruffleObjectConverter {
 
@@ -84,39 +80,18 @@ public static Object convert(TruffleObject obj) {
             }
 
             try {
-                TruffleObject classStatic = null;
-                String[] staticNames = null;
+                ArrayList<String> names = new ArrayList<>();
+                ArrayList<Object> values = new ArrayList<>();
                 if (!ConvertForeignObjectNode.isForeignArray(obj, getInterop())) {
-                    try {
-                        classStatic = ToJavaStaticNode.getUncached().execute(obj);
-                        staticNames = classStatic != null ? readMembers(classStatic) : null;
-                    } catch (UnknownIdentifierException | NoSuchFieldError | UnsupportedMessageException e) {
+                    TruffleObject classStatic = ToJavaStaticNode.getUncached().execute(obj);
+                    if (classStatic != null) {
+                        readMembers(classStatic, names, values);
                     }
                 }
 
-                String[] names;
-                try {
-                    names = readMembers(obj);
-                } catch (UnsupportedMessageException e) {
-                    names = null;
-                }
-
-                int staticNamesLen;
-                String[] compoundNames;
-                if (staticNames == null) {
-                    staticNamesLen = 0;
-                    compoundNames = (names != null) ? names : new String[0];
-                } else if (names == null) {
-                    staticNamesLen = staticNames.length;
-                    compoundNames = staticNames;
-                } else {
-                    staticNamesLen = staticNames.length;
-                    compoundNames = new String[staticNamesLen + names.length];
-                    System.arraycopy(staticNames, 0, compoundNames, 0, staticNamesLen);
-                    System.arraycopy(names, 0, compoundNames, staticNamesLen, names.length);
-                }
-                RStringVector compoundNamesVec = RDataFactory.createStringVector(compoundNames, true);
-                return new CompoundNamedListWrapper(classStatic, obj, staticNamesLen, compoundNamesVec);
+                readMembers(obj, names, values);
+                RStringVector namesVec = RDataFactory.createStringVector(names.toArray(new String[0]), true);
+                return RDataFactory.createList(values.toArray(), namesVec);
             } catch (InteropException e) {
                 throw RInternalError.shouldNotReachHere(e);
             }
@@ -127,163 +102,19 @@ public static Object convert(TruffleObject obj) {
         return obj;
     }
 
-    private static String[] readMembers(TruffleObject obj)
-                    throws InteropException, UnsupportedMessageException {
+    private static void readMembers(TruffleObject obj, ArrayList<String> names, ArrayList<Object> values)
+                    throws InteropException {
         InteropLibrary interop = getInterop();
         Object members = interop.getMembers(obj);
-        int size = RRuntime.getForeignArraySize(members, getInterop());
-        String[] names = new String[size];
+        int size = RRuntime.getForeignArraySize(members, interop);
         for (int i = 0; i < size; i++) {
-            Object value = interop.readArrayElement(members, i);
-            names[i] = (String) value;
-        }
-        return names;
-    }
-
-    private static final class CompoundNamedListWrapper extends RAbstractListVector {
-
-        private TruffleObject classDelegate;
-
-        private TruffleObject delegate;
-
-        private int staticNamesLen;
-
-        private RStringVector names;
-
-        CompoundNamedListWrapper(TruffleObject classDelegate, TruffleObject delegate, int staticNamesLen, RStringVector names) {
-            super(RDataFactory.INCOMPLETE_VECTOR);
-            this.classDelegate = classDelegate;
-            this.delegate = delegate;
-            this.staticNamesLen = staticNamesLen;
-            this.names = names;
-        }
-
-        @Override
-        public Object getInternalStore() {
-            return this;
-        }
-
-        @Override
-        public int getLength() {
-            return names.getLength();
-        }
-
-        @Override
-        public RStringVector getNames() {
-            return names;
-        }
-
-        @Override
-        public RList materialize() {
-            throw RInternalError.shouldNotReachHere();
-        }
-
-        @Override
-        @TruffleBoundary
-        public Object getDataAtAsObject(int index) {
-            return getDataAt(index);
-        }
-
-        @Override
-        @TruffleBoundary
-        public Object getDataAt(int index) {
-            try {
-                return (index < staticNamesLen) ? read(getInterop(), classDelegate, names, index) : read(getInterop(), delegate, names, index);
-            } catch (UnsupportedMessageException | UnknownIdentifierException e) {
-                throw RInternalError.shouldNotReachHere(e);
-            }
-        }
-
-        private static final class FastPathAccess extends FastPathFromListAccess {
-
-            @Child private InteropLibrary delegateInterop;
-            @Child private InteropLibrary classDelegateInterop;
-            @Child private Foreign2R foreign2r = Foreign2R.create();
-
-            FastPathAccess(RAbstractContainer value) {
-                super(value);
-                CompoundNamedListWrapper wrapper = (CompoundNamedListWrapper) value;
-                delegateInterop = InteropLibrary.getFactory().create(wrapper.delegate);
-                if (wrapper.classDelegate != null) {
-                    classDelegateInterop = InteropLibrary.getFactory().create(wrapper.classDelegate);
-                }
-            }
-
-            @Override
-            public boolean supports(Object value) {
-                if (!(value instanceof CompoundNamedListWrapper)) {
-                    return false;
-                }
-                CompoundNamedListWrapper wrapper = (CompoundNamedListWrapper) value;
-                if (wrapper.classDelegate == null) {
-                    return super.supports(value) && delegateInterop.accepts(wrapper.delegate);
-                } else {
-                    return super.supports(value) && delegateInterop.accepts(wrapper.delegate) && classDelegateInterop.accepts(wrapper.classDelegate);
-                }
-
-            }
-
-            @Override
-            public RType getType() {
-                return RType.List;
-            }
-
-            @Override
-            protected int getLength(RAbstractContainer vector) {
-                return vector.getLength();
-            }
-
-            @Override
-            protected Object getListElementImpl(AccessIterator accessIter, int index) {
-                try {
-                    CompoundNamedListWrapper wrapper = (CompoundNamedListWrapper) accessIter.getStore();
-                    return (index < wrapper.staticNamesLen)
-                                    ? foreign2r.convert(read(classDelegateInterop, wrapper.classDelegate, wrapper.names, index))
-                                    : foreign2r.convert(read(delegateInterop, wrapper.delegate, wrapper.names, index));
-                } catch (UnsupportedMessageException | UnknownIdentifierException e) {
-                    throw RInternalError.shouldNotReachHere(e);
-                }
-            }
-        }
-
-        @Override
-        public VectorAccess access() {
-            return new FastPathAccess(this);
-        }
-
-        private static final SlowPathFromListAccess SLOW_PATH_ACCESS = new SlowPathFromListAccess() {
-
-            @Override
-            public RType getType() {
-                return RType.List;
-            }
-
-            @Override
-            protected int getLength(RAbstractContainer vector) {
-                return ((CompoundNamedListWrapper) vector).getLength();
-            }
-
-            @Override
-            protected Object getListElementImpl(AccessIterator accessIter, int index) {
-                CompoundNamedListWrapper vector = (CompoundNamedListWrapper) accessIter.getStore();
-                try {
-                    return (index < vector.staticNamesLen)
-                                    ? read(getInterop(), vector.classDelegate, vector.names, index)
-                                    : read(getInterop(), vector.delegate, vector.names, index);
-                } catch (UnsupportedMessageException | UnknownIdentifierException e) {
-                    throw RInternalError.shouldNotReachHere(e);
-                }
-            }
-        };
-
-        @Override
-        public VectorAccess slowPathAccess() {
-            return SLOW_PATH_ACCESS;
+            String memberName = interop.asString(interop.readArrayElement(members, i));
+            values.add(read(interop, obj, memberName));
+            names.add(memberName);
         }
     }
 
-    private static Object read(InteropLibrary interop, TruffleObject obj, RStringVector names, int index) throws UnsupportedMessageException, UnknownIdentifierException {
-        String memberName = names.getDataAt(index);
+    private static Object read(InteropLibrary interop, TruffleObject obj, String memberName) throws UnsupportedMessageException, UnknownIdentifierException {
         if (interop.isMemberReadable(obj, memberName)) {
             return Foreign2R.getUncached().convert(interop.readMember(obj, memberName));
         } else {
@@ -294,5 +125,4 @@ private static Object read(InteropLibrary interop, TruffleObject obj, RStringVec
     private static InteropLibrary getInterop() {
         return InteropLibrary.getFactory().getUncached();
     }
-
 }