Fix: do not eagerly box int/double values in HPyAsHandleNode

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyHandle.java

@@ -81,7 +81,6 @@ private GraalHPyHandle() {
 
     GraalHPyHandle(Object delegate) {
         assert delegate != null : "HPy handles to Java null are not allowed";
-        assert !GraalHPyBoxing.isBoxablePrimitive(delegate) : "should be NaN boxed instead";
         this.delegate = delegate;
         this.id = -1;
     }
@@ -93,6 +92,7 @@ private GraalHPyHandle() {
     public int getId(GraalHPyContext context, ConditionProfile hasIdProfile) {
         int result = id;
         if (!isPointer(hasIdProfile)) {
+            assert !GraalHPyBoxing.isBoxablePrimitive(delegate) : "allocating handle for value that could be boxed";
             result = context.getHPyHandleForObject(this);
             id = result;
         }
@@ -102,7 +102,7 @@ public int getId(GraalHPyContext context, ConditionProfile hasIdProfile) {
     @ExportMessage
     boolean isPointer(
                     @Exclusive @Cached ConditionProfile isNativeProfile) {
-        return isNativeProfile.profile(id != -1);
+        return isNativeProfile.profile(id != -1 || delegate instanceof Integer || delegate instanceof Double);
     }
 
     @ExportMessage
@@ -113,7 +113,14 @@ long asPointer() throws UnsupportedMessageException {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             throw UnsupportedMessageException.create();
         }
-        return GraalHPyBoxing.boxHandle(id);
+        if (id != -1) {
+            return GraalHPyBoxing.boxHandle(id);
+        } else if (delegate instanceof Integer) {
+            return GraalHPyBoxing.boxInt((Integer) delegate);
+        } else if (delegate instanceof Double) {
+            return GraalHPyBoxing.boxDouble((Double) delegate);
+        }
+        throw CompilerDirectives.shouldNotReachHere();
     }
 
     /**
@@ -124,6 +131,7 @@ long asPointer() throws UnsupportedMessageException {
     void toNative(@Exclusive @Cached ConditionProfile isNativeProfile,
                     @CachedLibrary("this") InteropLibrary lib) {
         if (!isPointer(isNativeProfile)) {
+            assert !GraalHPyBoxing.isBoxablePrimitive(delegate) : "allocating handle for value that could be boxed";
             id = PythonContext.get(lib).getHPyContext().getHPyHandleForObject(this);
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java

@@ -1256,7 +1256,7 @@ protected final GraalHPyContext ensureContext(GraalHPyContext hpyContext) {
                 return hpyContext;
             }
         }
-        
+
         public abstract Object execute(GraalHPyContext hpyContext, long bits);
 
         @Specialization
@@ -1330,28 +1330,24 @@ static int doOtherInt(@SuppressWarnings("unused") GraalHPyContext hpyContext, @S
     @ImportStatic(PGuards.class)
     public abstract static class HPyAsHandleNode extends CExtToNativeNode {
 
-        @Specialization
-        static long doDouble(@SuppressWarnings("unused") GraalHPyContext hpyContext, double value) {
-            return GraalHPyBoxing.boxDouble(value);
-        }
-
-        @Specialization
-        static long doDouble(@SuppressWarnings("unused") GraalHPyContext hpyContext, int value) {
-            return GraalHPyBoxing.boxInt(value);
-        }
+        /*
+         * NOTE: We *MUST NOT* box values here because we don't know where the handle will be given
+         * to. In case we give it to LLVM code, we must still have an object that emulates the HPy
+         * struct.
+         */
 
         @Specialization(guards = "isNoValue(object)")
         @SuppressWarnings("unused")
         static GraalHPyHandle doNoValue(GraalHPyContext hpyContext, PNone object) {
             return GraalHPyHandle.NULL_HANDLE;
         }
 
-        @Specialization(guards = {"!isNoValue(object)", "!isDouble(object)", "!isInt(object)"}, assumptions = "noDebugModeAssumption()")
+        @Specialization(guards = {"!isNoValue(object)"}, assumptions = "noDebugModeAssumption()")
         static GraalHPyHandle doObject(CExtContext hpyContext, Object object) {
             return CompilerDirectives.castExact(hpyContext, GraalHPyContext.class).createHandle(object);
         }
 
-        @Specialization(guards = {"!isNoValue(object)", "!isDouble(object)", "!isInt(object)"})
+        @Specialization(guards = {"!isNoValue(object)"})
         static GraalHPyHandle doDebugObject(GraalHPyContext hpyContext, Object object,
                         @Cached("createClassProfile()") ValueProfile contextProfile) {
             return contextProfile.profile(hpyContext).createHandle(object);