Cleanup Indy bootstrap

btraceio · Nov 9, 2024 · 88f3ed5 · 88f3ed5
1 parent 769fc0b
commit 88f3ed5
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/btrace-runtime/src/main/java15/org/openjdk/btrace/runtime/Indy.java b/btrace-runtime/src/main/java15/org/openjdk/btrace/runtime/Indy.java
@@ -18,27 +18,23 @@ public static CallSite bootstrap(
       MethodHandles.Lookup caller, String name, MethodType type, String probeClassName)
       throws Exception {
     assert repository != null;
+    MethodHandle mh;
     try {
-      MethodHandle mh;
-      try {
-        byte[] classData =
-                repository.getProbeHandler(
-                        caller.lookupClass().getName(), probeClassName, name, type.toMethodDescriptorString());
+      byte[] classData =
+              repository.getProbeHandler(
+                      caller.lookupClass().getName(), probeClassName, name, type.toMethodDescriptorString());
 
-        caller =
-                caller.defineHiddenClass(classData, false, MethodHandles.Lookup.ClassOption.NESTMATE);
-        mh = caller.findStatic(caller.lookupClass(), name.substring(name.lastIndexOf("$") + 1), type);
-      } catch (Throwable t) {
-        // if unable to properly link just ignore the instrumentation
-        MethodHandle noopHandle =
-                MethodHandles.lookup().findStatic(Indy.class, "noop", MethodType.methodType(void.class));
-        mh = MethodHandles.dropArguments(noopHandle, 0, type.parameterArray());
-      }
-
-      return new ConstantCallSite(mh);
-    } finally {
-//      LinkingFlag.reset();
+      caller =
+              caller.defineHiddenClass(classData, false, MethodHandles.Lookup.ClassOption.NESTMATE);
+      mh = caller.findStatic(caller.lookupClass(), name.substring(name.lastIndexOf("$") + 1), type);
+    } catch (Throwable t) {
+      // if unable to properly link just ignore the instrumentation
+      MethodHandle noopHandle =
+              MethodHandles.lookup().findStatic(Indy.class, "noop", MethodType.methodType(void.class));
+      mh = MethodHandles.dropArguments(noopHandle, 0, type.parameterArray());
     }
+
+    return new ConstantCallSite(mh);
   }
 
   public static void noop() {}