Merge complex code paths in PrimitiveNativeWrapper#toNative

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PrimitiveNativeWrapper.java

@@ -255,16 +255,17 @@ void toNative(
                     @Bind Node inliningTarget,
                     @Cached CApiTransitions.FirstToNativeNode firstToNativeNode) {
         if (!isNative()) {
+            boolean immortal;
             if (isBool()) {
                 assert (PythonContext.get(inliningTarget).getCApiContext().getCachedBooleanPrimitiveNativeWrapper(value != 0) == this);
-                setNativePointer(firstToNativeNode.execute(inliningTarget, this, true /* immortal */));
-                return;
+                immortal = true;
+            } else {
+                // small int values are cached and will be immortal
+                immortal = isIntLike() && CApiGuards.isSmallLong(value);
+                // if this wrapper wraps a small int value, this wrapper is one of the cached
+                // primitive native wrappers
+                assert !immortal || (PythonContext.get(inliningTarget).getCApiContext().getCachedPrimitiveNativeWrapper(value) == this);
             }
-            // small int values are cached and will be immortal
-            boolean immortal = isIntLike() && CApiGuards.isSmallLong(value);
-            // if this wrapper wraps a small int value, this wrapper is one of the cached primitive
-            // native wrappers
-            assert !immortal || (PythonContext.get(inliningTarget).getCApiContext().getCachedPrimitiveNativeWrapper(value) == this);
             setNativePointer(firstToNativeNode.execute(inliningTarget, this, immortal));
         }
     }