test/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java

@@ -77,14 +77,23 @@
     public static boolean methodIsIgnoredBySecurityStackWalk(HotSpotResolvedJavaMethod method) {
         return CTVM.methodIsIgnoredBySecurityStackWalk((HotSpotResolvedJavaMethodImpl)method);
     }
 
     public static HotSpotResolvedObjectType lookupType(String name,
-            Class<?> accessingClass, boolean resolve) {
+            Class<?> accessingClass, boolean resolve) throws ClassNotFoundException {
         return CTVM.lookupType(name, accessingClass, resolve);
     }
 
+    public static HotSpotResolvedObjectType lookupTypeHelper(String name,
+            Class<?> accessingClass, boolean resolve) {
+        try {
+            return lookupType(name, accessingClass, resolve);
+        } catch (ClassNotFoundException e) {
+            throw (NoClassDefFoundError) new NoClassDefFoundError().initCause(e);
+        }
+    }
+
     public static Object resolveConstantInPool(ConstantPool constantPool, int cpi) {
         return CTVM.resolveConstantInPool((HotSpotConstantPool) constantPool, cpi);
     }
 
     public static Object resolvePossiblyCachedConstantInPool(ConstantPool constantPool, int cpi) {