summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Lamarche <benoitlamarche@google.com>2017-10-23 11:21:01 +0200
committerBenoit Lamarche <benoitlamarche@google.com>2017-10-23 11:39:03 +0200
commita7eb610b15c7a2eea8b5bb2015d749ede33a1857 (patch)
tree51fb816199988d4579255116a9ac47aa9092da22
parentd5d697b023a02a81de8add89556596d4b3587034 (diff)
Use ASM6 Opcodes everywhere in locked_region_code_injection
And use the same constant everywhere. Test: treehugger Bug: 67676752 Change-Id: I5735aba76266118471677f962fab50dbb0be187b
-rw-r--r--tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java2
-rw-r--r--tools/locked_region_code_injection/src/lockedregioncodeinjection/Utils.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java b/tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java
index a60f2a2019d2..ee0e36c9f76e 100644
--- a/tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java
+++ b/tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java
@@ -76,7 +76,7 @@ class LockFindingClassVisitor extends ClassVisitor {
private MethodVisitor chain;
public LockFindingMethodVisitor(String owner, MethodNode mn, MethodVisitor chain) {
- super(Opcodes.ASM6, mn);
+ super(Utils.ASM_VERSION, mn);
assert owner != null;
this.owner = owner;
this.chain = chain;
diff --git a/tools/locked_region_code_injection/src/lockedregioncodeinjection/Utils.java b/tools/locked_region_code_injection/src/lockedregioncodeinjection/Utils.java
index d2a2e7b90f2b..219c2b3a2fec 100644
--- a/tools/locked_region_code_injection/src/lockedregioncodeinjection/Utils.java
+++ b/tools/locked_region_code_injection/src/lockedregioncodeinjection/Utils.java
@@ -19,7 +19,7 @@ import org.objectweb.asm.Opcodes;
public class Utils {
- public static final int ASM_VERSION = Opcodes.ASM5;
+ public static final int ASM_VERSION = Opcodes.ASM6;
/**
* Reads a comma separated configuration similar to the Jack definition.