*** old/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java	Fri May 31 08:53:46 2019
--- new/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java	Fri May 31 08:53:46 2019

*** 138,148 ****
--- 138,149 ----
          throw new InternalError("missing substitution: " + className + " " + methodName);
      }
  
      @Override
      Annotation[] getAnnotations(HotSpotResolvedObjectTypeImpl holder) {
!         return getClassAnnotations(holder.getName());
!         Annotation[] annotations = getClassAnnotations(holder.getName());
+         return annotations == null ? new Annotation[0] : annotations;
      }
  
      @Override
      Annotation[] getDeclaredAnnotations(HotSpotResolvedObjectTypeImpl holder) {
          throw new HotSpotJVMCIUnsupportedOperationError("unimplemented");

*** 153,163 ****
--- 154,168 ----
          throw new HotSpotJVMCIUnsupportedOperationError("unimplemented");
      }
  
      @Override
      Annotation[][] getParameterAnnotations(HotSpotResolvedJavaMethodImpl javaMethod) {
!         return getParameterAnnotations(javaMethod.getDeclaringClass().getName(), javaMethod.getName());
!         Annotation[][] annotations = getParameterAnnotations(javaMethod.getDeclaringClass().getName(), javaMethod.getName());
+         if (annotations == null) {
+             return new Annotation[javaMethod.signature.getParameterCount(false)][0];
+         }
+         return annotations;
      }
  
      @Override
      Type[] getGenericParameterTypes(HotSpotResolvedJavaMethodImpl javaMethod) {
          throw new HotSpotJVMCIUnsupportedOperationError("unimplemented");

*** 168,178 ****
--- 173,184 ----
          throw new HotSpotJVMCIUnsupportedOperationError("unimplemented");
      }
  
      @Override
      Annotation[] getMethodAnnotations(HotSpotResolvedJavaMethodImpl javaMethod) {
!         return getMethodAnnotationsInternal(javaMethod);
!         Annotation[] annotations = getMethodAnnotationsInternal(javaMethod);
+         return annotations == null ? new Annotation[0] : annotations;
      }
  
      @Override
      <T extends Annotation> T getMethodAnnotation(HotSpotResolvedJavaMethodImpl javaMethod, Class<T> annotationClass) {
          Annotation[] methodAnnotations = getMethodAnnotations(javaMethod);