commit ade2aced102735630ae2b5a53880fce9fc591c14
author Benoit Lamarche <benoitlamarche@google.com> Mon Feb 06 09:37:31 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 06 09:37:32 2017 +0000
tree e0f394bd844856b2ea1b0f5820f0105313297ed3
parent 914bfd0858f7935a8b1efb38b5fafcedf277a28d
parent 6340d8ab6bfd3f45f4266c0c98cf8d68a0ceb5e5

Merge "Fix Findbugs warnings" into ub-jack

jack/src/com/android/jack/analysis/tracer/Tracer.java

diff --git a/jack/src/com/android/jack/analysis/tracer/Tracer.java b/jack/src/com/android/jack/analysis/tracer/Tracer.java
index 220a535..1f2edab 100644
--- a/jack/src/com/android/jack/analysis/tracer/Tracer.java
+++ b/jack/src/com/android/jack/analysis/tracer/Tracer.java
@@ -566,8 +566,11 @@
   @Override
   public void endVisit(@Nonnull JVariableRef x) {
     DebugVariableInfoMarker debugInfo = x.getMarker(DebugVariableInfoMarker.class);
-    if (debugInfo != null && debugInfo.getType() != null) {
-      trace(debugInfo.getType());
+    if (debugInfo != null) {
+      JType debugInfoType = debugInfo.getType();
+      if (debugInfoType != null) {
+        trace(debugInfoType);
+      }
     }
   }
 

jack/src/com/android/jack/ir/impl/BaseGenerationVisitor.java

diff --git a/jack/src/com/android/jack/ir/impl/BaseGenerationVisitor.java b/jack/src/com/android/jack/ir/impl/BaseGenerationVisitor.java
index baa91a6..52090e9 100644
--- a/jack/src/com/android/jack/ir/impl/BaseGenerationVisitor.java
+++ b/jack/src/com/android/jack/ir/impl/BaseGenerationVisitor.java
@@ -677,7 +677,8 @@
     accept(x.getThenStmt());
     nestedStatementPop(x.getThenStmt());
 
-    if (x.getElseStmt() != null) {
+    JStatement elseStmt = x.getElseStmt();
+    if (elseStmt != null) {
       if (needSemi) {
         semi();
         newline();
@@ -686,15 +687,15 @@
         needSemi = true;
       }
       print(CHARS_ELSE);
-      boolean elseIf = x.getElseStmt() instanceof JIfStatement;
+      boolean elseIf = elseStmt instanceof JIfStatement;
       if (!elseIf) {
-        nestedStatementPush(x.getElseStmt());
+        nestedStatementPush(elseStmt);
       } else {
         space();
       }
-      accept(x.getElseStmt());
+      accept(elseStmt);
       if (!elseIf) {
-        nestedStatementPop(x.getElseStmt());
+        nestedStatementPop(elseStmt);
       }
     }