commit 9df919f40ce6022b8a8d354d1d4273d9d91d876e
author Kyle Stiemann <stiemannkj1@gmail.com> Fri Apr 07 16:32:24 2023 -0400
committer Kyle Stiemann <stiemannkj1@gmail.com> Fri Apr 07 16:33:02 2023 -0400
tree 092bb24fd494cc482b15f7a41aec0133c520d252
parent a816658ea780d07f7a413f7536062a78da795ebe

Fix ARIES-1219 Weaving of Aries SPI Fly bundle produces RuntimeException: JSR/RET are not supported with computeFrames option

spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java

diff --git a/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java b/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java
index 76da363..eb33531 100644
--- a/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java
+++ b/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java
@@ -25,12 +25,14 @@
 

 import org.apache.aries.spifly.Util;

 import org.apache.aries.spifly.WeavingData;

+import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;

 import org.objectweb.asm.Label;

 import org.objectweb.asm.MethodVisitor;

 import org.objectweb.asm.Opcodes;

 import org.objectweb.asm.Type;

 import org.objectweb.asm.commons.GeneratorAdapter;

+import org.objectweb.asm.commons.JSRInlinerAdapter;
 import org.objectweb.asm.commons.Method;

 

 import aQute.bnd.annotation.baseline.BaselineIgnore;

@@ -77,7 +79,10 @@
     public MethodVisitor visitMethod(int access, String name, String desc,

             String signature, String[] exceptions) {

         MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);

-        return new TCCLSetterMethodVisitor(mv, access, name, desc);

+        mv = new TCCLSetterMethodVisitor(mv, access, name, desc);
+        mv = new JSRInlinerAdapter(mv, access, name, desc, signature, exceptions);
+
+        return mv;
     }

 

     @Override