Remove unnecessary specializations.

Author: Akirathan

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/altrep/AltrepDownCallNodeImpl.java

@@ -62,19 +62,19 @@ public static AltrepDownCallNodeImpl getUncached() {
         return AltrepDownCallNodeImplNodeGen.getUncached();
     }
 
-    @Specialization(guards = "cachedLength == args.length", limit = "3")
+    @Specialization(limit = "3")
     public Object doIt(AltrepMethodDescriptor altrepDowncallIn, boolean unwrapResult, boolean[] wrapArguments, Object[] args,
-                    @Cached("args.length") int cachedLength,
                     @CachedLibrary("altrepDowncallIn.method") InteropLibrary methodInterop,
                     @Cached(value = "createUnwrapNode(unwrapResult)", uncached = "createUncachedUnwrapNode()") FFIUnwrapNode unwrapNode,
                     @CachedContext(TruffleRLanguage.class) ContextReference<RContext> ctxRef,
-                    @Cached("createMaterialized(wrapArguments)") FFIMaterializeNode[] materializeNodes,
-                    @Cached("createToNatives(wrapArguments)") FFIToNativeMirrorNode[] toNativeNodes,
+                    @Cached(value = "createMaterialized(wrapArguments)", allowUncached = true) FFIMaterializeNode[] materializeNodes,
+                    @Cached(value = "createToNatives(wrapArguments)", allowUncached = true) FFIToNativeMirrorNode[] toNativeNodes,
                     @Cached("createBinaryProfile()") ConditionProfile isLLVMProfile,
                     @Cached BranchProfile unwrapResultProfile,
                     @Cached("createIdentityProfile()") ValueProfile identityProfile,
                     @Cached AfterDownCallProfiles afterDownCallProfiles) {
         CompilerAsserts.partialEvaluationConstant(unwrapResult);
+        CompilerAsserts.partialEvaluationConstant(args.length);
         AltrepMethodDescriptor altrepMethodDescriptor = identityProfile.profile(altrepDowncallIn);
 
         assert methodInterop.isExecutable(altrepMethodDescriptor.method);
@@ -88,7 +88,7 @@ public Object doIt(AltrepMethodDescriptor altrepDowncallIn, boolean unwrapResult
         }
 
         Object ret;
-        try (FFIDownCallWrap ffiWrap = new FFIDownCallWrap(cachedLength)) {
+        try (FFIDownCallWrap ffiWrap = new FFIDownCallWrap(args.length)) {
             Object[] wrappedArgs = ffiWrap.wrapSome(args, materializeNodes, toNativeNodes, wrapArguments);
             ret = methodInterop.execute(altrepMethodDescriptor.method, wrappedArgs);
             if (unwrapResult) {
@@ -108,26 +108,6 @@ public Object doIt(AltrepMethodDescriptor altrepDowncallIn, boolean unwrapResult
         return ret;
     }
 
-    @Specialization(guards = "cachedLength == args.length", replaces = "doIt")
-    public Object doItWithDispatchedMethodInterop(
-                    AltrepMethodDescriptor altrepDowncall, boolean unwrapResult, boolean[] wrapArguments, Object[] args,
-                    @Cached("args.length") int cachedLength,
-                    @CachedLibrary(limit = "3") InteropLibrary methodInterop,
-                    @Cached(value = "createUnwrapNode(unwrapResult)", uncached = "createUncachedUnwrapNode()") FFIUnwrapNode unwrapNode,
-                    @CachedContext(TruffleRLanguage.class) ContextReference<RContext> ctxRef,
-                    @Cached(value = "createMaterialized(wrapArguments)", allowUncached = true) FFIMaterializeNode[] materializeNodes,
-                    @Cached(value = "createToNatives(wrapArguments)", allowUncached = true) FFIToNativeMirrorNode[] toNativeNodes,
-                    @Cached("createBinaryProfile()") ConditionProfile isLLVMProfile,
-                    @Cached BranchProfile unwrapResultProfile,
-                    @Cached("createIdentityProfile()") ValueProfile identityProfile,
-                    @Cached AfterDownCallProfiles afterDownCallProfiles) {
-        return doIt(altrepDowncall, unwrapResult, wrapArguments, args, cachedLength, methodInterop, unwrapNode,
-                        ctxRef, materializeNodes, toNativeNodes, isLLVMProfile, unwrapResultProfile, identityProfile,
-                        afterDownCallProfiles);
-    }
-
-    // TODO: Implement some uncached specialization?
-
     protected static FFIUnwrapNode createUnwrapNode(boolean unwrapFlag) {
         if (unwrapFlag) {
             return FFIUnwrapNode.create();

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

@@ -55,44 +55,24 @@ public int isIntSorted(RIntVector intVec,
         return isVectorSorted(intVec, dataLibrary);
     }
 
-    @Specialization(replaces = "isIntSorted")
-    public int isIntSortedUncached(RIntVector intVec) {
-        return isVectorSorted(intVec, VectorDataLibrary.getFactory().getUncached(intVec.getData()));
-    }
-
     @Specialization(limit = "getTypedVectorDataLibraryCacheSize()")
     public int isDoubleSorted(RDoubleVector doubleVector,
                     @CachedLibrary("doubleVector.getData()") VectorDataLibrary dataLibrary) {
         return isVectorSorted(doubleVector, dataLibrary);
     }
 
-    @Specialization(replaces = "isDoubleSorted")
-    public int isDoubleSortedUncached(RDoubleVector doubleVector) {
-        return isVectorSorted(doubleVector, VectorDataLibrary.getFactory().getUncached(doubleVector.getData()));
-    }
-
     @Specialization(limit = "getTypedVectorDataLibraryCacheSize()")
     public int isLogicalSorted(RLogicalVector logicalVector,
                     @CachedLibrary("logicalVector.getData()") VectorDataLibrary dataLibrary) {
         return isVectorSorted(logicalVector, dataLibrary);
     }
 
-    @Specialization(replaces = "isLogicalSorted")
-    public int isLogicalSortedUncached(RLogicalVector logicalVector) {
-        return isVectorSorted(logicalVector, VectorDataLibrary.getFactory().getUncached(logicalVector.getData()));
-    }
-
     @Specialization(limit = "getTypedVectorDataLibraryCacheSize()")
     public int isStringSorted(RStringVector stringVector,
                     @CachedLibrary("stringVector.getData()") VectorDataLibrary dataLibrary) {
         return isVectorSorted(stringVector, dataLibrary);
     }
 
-    @Specialization(replaces = "isStringSorted")
-    public int isStringSortedUncached(RStringVector stringVector) {
-        return isVectorSorted(stringVector, VectorDataLibrary.getFactory().getUncached(stringVector.getData()));
-    }
-
     @Fallback
     public int isSortedFallback(@SuppressWarnings("unused") Object x) {
         return AltrepSortedness.UNKNOWN_SORTEDNESS.getValue();

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

@@ -22,11 +22,11 @@
  */
 package com.oracle.truffle.r.ffi.impl.nodes;
 
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.r.runtime.RRuntime;
-import com.oracle.truffle.r.runtime.data.RBaseObject;
 import com.oracle.truffle.r.runtime.data.VectorDataLibrary;
 import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
 
@@ -39,15 +39,11 @@ public static NoNANode create() {
     @Specialization(limit = "getGenericDataLibraryCacheSize()")
     protected Object doContainer(RAbstractContainer container,
                     @CachedLibrary("container.getData()") VectorDataLibrary dataLibrary) {
-        if (dataLibrary.isComplete(container.getData())) {
-            return RRuntime.LOGICAL_TRUE;
-        } else {
-            return RRuntime.LOGICAL_FALSE;
-        }
+        return RRuntime.asLogical(dataLibrary.isComplete(container.getData()));
     }
 
-    @Specialization(replaces = "doContainer")
-    protected Object doOther(@SuppressWarnings("unused") RBaseObject rObject) {
+    @Fallback
+    protected Object doOther(@SuppressWarnings("unused") Object obj) {
         return RRuntime.LOGICAL_FALSE;
     }
 }