src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSignature.java

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 166,184 ****
              JavaType result = runtime.lookupType(parameters.get(index), (HotSpotResolvedObjectType) accessingClass, false);
              if (result instanceof ResolvedJavaType) {
                  type = (ResolvedJavaType) result;
                  parameterTypes[index] = type;
              } else {
                  return result;
              }
          }
          return type;
      }
  
      @Override
      public String toMethodDescriptor() {
!         assert originalString.equals(Signature.super.toMethodDescriptor());
          return originalString;
      }
  
      @Override
      public JavaKind getReturnKind() {
--- 166,186 ----
              JavaType result = runtime.lookupType(parameters.get(index), (HotSpotResolvedObjectType) accessingClass, false);
              if (result instanceof ResolvedJavaType) {
                  type = (ResolvedJavaType) result;
                  parameterTypes[index] = type;
              } else {
+                 assert result != null;
                  return result;
              }
          }
+         assert type != null;
          return type;
      }
  
      @Override
      public String toMethodDescriptor() {
!         assert originalString.equals(Signature.super.toMethodDescriptor()) : originalString + " != " + Signature.super.toMethodDescriptor();
          return originalString;
      }
  
      @Override
      public JavaKind getReturnKind() {