Fix bug with externs returning nullable versions of Java primitives.

PiperOrigin-RevId: 679285563
google · Sep 26, 2024 · e1dbc7b · e1dbc7b
1 parent e5ad046
commit e1dbc7b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/java/src/com/google/template/soy/jbcsrc/ExternCompiler.java b/java/src/com/google/template/soy/jbcsrc/ExternCompiler.java
@@ -416,21 +416,22 @@ private static Expression adaptImplicitParameter(ConstantVariables vars, TypeInf
    * <p>In some cases (e.g. List) we happen to tolerate the extern returning null.
    */
   static Expression adaptReturnType(Type returnType, SoyType soyReturnType, Expression externCall) {
+    boolean nullish = SoyTypes.isNullish(soyReturnType);
     Type externType = externCall.resultType();
 
-    if (externType.equals(BytecodeUtils.BOXED_INTEGER_TYPE)) {
+    if (!nullish && externType.equals(BytecodeUtils.BOXED_INTEGER_TYPE)) {
       return JbcSrcExternRuntime.UNBOX_INTEGER.invoke(externCall);
     } else if (externType.equals(Type.INT_TYPE)) {
       return BytecodeUtils.numericConversion(externCall, Type.LONG_TYPE);
-    } else if (externType.equals(BytecodeUtils.BOXED_LONG_TYPE)) {
+    } else if (!nullish && externType.equals(BytecodeUtils.BOXED_LONG_TYPE)) {
       return JbcSrcExternRuntime.UNBOX_LONG.invoke(externCall);
-    } else if (externType.equals(BytecodeUtils.BOXED_DOUBLE_TYPE)) {
+    } else if (!nullish && externType.equals(BytecodeUtils.BOXED_DOUBLE_TYPE)) {
       return JbcSrcExternRuntime.UNBOX_DOUBLE.invoke(externCall);
     } else if (externType.equals(Type.FLOAT_TYPE)) {
       return BytecodeUtils.numericConversion(externCall, Type.DOUBLE_TYPE);
-    } else if (externType.equals(BytecodeUtils.BOXED_FLOAT_TYPE)) {
+    } else if (!nullish && externType.equals(BytecodeUtils.BOXED_FLOAT_TYPE)) {
       return JbcSrcExternRuntime.UNBOX_FLOAT.invoke(externCall);
-    } else if (externType.equals(BytecodeUtils.BOXED_BOOLEAN_TYPE)) {
+    } else if (!nullish && externType.equals(BytecodeUtils.BOXED_BOOLEAN_TYPE)) {
       return JbcSrcExternRuntime.UNBOX_BOOLEAN.invoke(externCall);
     } else if (externType.equals(BytecodeUtils.OBJECT.type())
         || externType.equals(BytecodeUtils.NUMBER_TYPE)) {