Tweak host inlining for slot call nodes

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotDescrGet.java

@@ -216,7 +216,6 @@ static Object callPython(VirtualFrame frame, Node inliningTarget, TpSlotPythonSi
         }
 
         @Specialization
-        @InliningCutoff
         static Object callNative(VirtualFrame frame, Node inliningTarget, TpSlotNative slot, Object self, Object obj, Object value,
                         @Cached GetThreadStateNode getThreadStateNode,
                         @Cached(inline = false) PythonToNativeNode selfToNativeNode,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotInquiry.java

@@ -60,7 +60,6 @@
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonContext.GetThreadStateNode;
 import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
-import com.oracle.truffle.api.HostCompilerDirectives.InliningCutoff;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateCached;
@@ -131,7 +130,6 @@ static boolean callPython(VirtualFrame frame, TpSlotPythonSingle slot, Object se
         }
 
         @Specialization
-        @InliningCutoff
         static boolean callNative(VirtualFrame frame, Node inliningTarget, TpSlotNative slot, Object self,
                         @Cached GetThreadStateNode getThreadStateNode,
                         @Cached(inline = false) PythonToNativeNode toNativeNode,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotLen.java

@@ -167,7 +167,6 @@ static int callPython(VirtualFrame frame, TpSlotPythonSingle slot, Object self,
         }
 
         @Specialization// (guards = "!slot.isHPySlot()")
-        @InliningCutoff
         static int callNative(VirtualFrame frame, Node inliningTarget, TpSlotNative slot, Object self,
                         @Cached GetThreadStateNode getThreadStateNode,
                         @Cached(inline = false) PythonToNativeNode toNativeNode,
@@ -178,12 +177,17 @@ static int callNative(VirtualFrame frame, Node inliningTarget, TpSlotNative slot
             PythonThreadState state = getThreadStateNode.execute(inliningTarget, ctx);
             Object result = externalInvokeNode.call(frame, inliningTarget, state, C_API_TIMING, T___LEN__, slot.callable, toNativeNode.execute(self));
             long l = checkResultNode.executeLong(state, T___LEN__, result);
-            if (l != (int) l) {
-                throw raiseNode.get(inliningTarget).raise(OverflowError, ErrorMessages.CANNOT_FIT_P_INTO_INDEXSIZED_INT, l);
+            if (!PInt.isIntRange(l)) {
+                raiseOverflow(inliningTarget, raiseNode, l);
             }
             return (int) l;
         }
 
+        @InliningCutoff
+        private static void raiseOverflow(Node inliningTarget, Lazy raiseNode, long l) {
+            throw raiseNode.get(inliningTarget).raise(OverflowError, ErrorMessages.CANNOT_FIT_P_INTO_INDEXSIZED_INT, l);
+        }
+
         @Specialization(replaces = "callCachedBuiltin")
         static int callGenericSimpleBuiltin(TpSlotLenBuiltinSimple<?> slot, Object self) {
             return slot.executeUncached(self);
@@ -213,7 +217,7 @@ static int callHPy(VirtualFrame frame, Node inliningTarget, TpSlotNative slot, O
             Object result = hpyDispatcher.execute(frame, inliningTarget, ctx, state, slot.callable, self);
             long l = checkResultNode.executeLong(state, T___LEN__, result);
             if (!PInt.isIntRange(l)) {
-                throw raiseNode.get(inliningTarget).raise(OverflowError, ErrorMessages.CANNOT_FIT_P_INTO_INDEXSIZED_INT, l);
+                raiseOverflow(inliningTarget, raiseNode, l);
             }
             return (int) l;
         }