RFR: 8244852 GraalVM native-image fails after JDK-8238048 change

[David Holmes]

Hi Bob,

On 13/05/2020 4:37 am, Bob Vandette wrote:
> Please review this fix for a regression in JDK 15 causing native-image to fail.
> 
> https://bugs.openjdk.java.net/browse/JDK-8244852
> 
> 
> diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
> --- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
> +++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
> @@ -818,7 +818,7 @@
>       @Override
>       public String getSourceFileName() {
>           if (isArray()) {
> -            throw new JVMCIError("Cannot call getSourceFileName() on an array klass type: %s", this);
> +            return (String)null;

Fix seems reasonable. While JavaType.getSourceFileName() seems a little 
underspecified, JavaType includes array types so the call should be valid.

Nit: No cast needed on the null.

Thanks,
David

>           }
>           return getConstantPool().getSourceFileName();
>       }
> 
> 
> Bob.
>