commit fea776d029fb8ceb9dfa1e7c354e03ac4c3597de
author Yohann Roussel <yroussel@google.com> Wed May 18 15:16:49 2016 +0200
committer Yohann Roussel <yroussel@google.com> Wed May 18 15:16:49 2016 +0200
tree f77c7f70ea0a85dfecada62990b5f6bc9ca36665
parent 45a46387b87e075b4e5793084daeb33ac79d7a8b

Fix compilation error in BoostLockedRegionPriority

- abortEventually() does not yet exists in Carnac, use
setAbortEventually(true) instead.
- fix findbugs issues.

Bug: 28832501
Change-Id: I43733a7851acb37fd99e2a5569c9013c60b4fb1c

jack/src/com/android/jack/transformations/ast/BoostLockedRegionPriority.java

diff --git a/jack/src/com/android/jack/transformations/ast/BoostLockedRegionPriority.java b/jack/src/com/android/jack/transformations/ast/BoostLockedRegionPriority.java
index 327aa05..f08e182 100644
--- a/jack/src/com/android/jack/transformations/ast/BoostLockedRegionPriority.java
+++ b/jack/src/com/android/jack/transformations/ast/BoostLockedRegionPriority.java
@@ -159,7 +159,7 @@
       Jack.getSession()
           .getReporter()
           .report(Severity.FATAL, new BadBoostLockedRegionPriorityConfigurationException(prop, e));
-      Jack.getSession().abortEventually();
+      Jack.getSession().setAbortEventually(true);
       return null;
     }
   }
@@ -172,7 +172,7 @@
       Jack.getSession()
           .getReporter()
           .report(Severity.FATAL, new BadBoostLockedRegionPriorityConfigurationException(prop, e));
-      Jack.getSession().abortEventually();
+      Jack.getSession().setAbortEventually(true);
       return null;
     }
   }
@@ -208,6 +208,7 @@
 
     @Override
     public void endVisit(@Nonnull JSynchronizedBlock jSyncBock) {
+      assert lockClass != null;
       if (!jSyncBock.getLockExpr().getType().isSameType(lockClass)) {
         return;
       }
@@ -219,7 +220,7 @@
     }
 
     private JExpressionStatement makeRequestCall(SourceInfo info) {
-      assert lockClass != null && requestMethodId != null;
+      assert requestClass != null && lockClass != null && requestMethodId != null;
       return new JExpressionStatement(
           info,
           new JMethodCall(
@@ -227,7 +228,7 @@
     }
 
     private JExpressionStatement makeResetCall(SourceInfo info) {
-      assert lockClass != null && resetMethodId != null;
+      assert resetClass != null && lockClass != null && resetMethodId != null;
       return new JExpressionStatement(
           info,
           new JMethodCall(