Merge pull request #663 from soot-oss/fix/Position

Fix null<>nonnull w/Position

Author: JonasKlauke

sootup.core/src/main/java/sootup/core/jimple/basic/FullStmtPositionInfo.java

@@ -23,7 +23,6 @@
  */
 
 import javax.annotation.Nonnull;
-import sootup.core.model.FullPosition;
 import sootup.core.model.Position;
 import sootup.core.util.Copyable;
 
@@ -34,7 +33,7 @@
  * @author Linghui Luo, Markus Schmidt
  */
 public class FullStmtPositionInfo extends SimpleStmtPositionInfo implements Copyable {
-  protected final FullPosition[] operandPositions;
+  @Nonnull protected final Position[] operandPositions;
 
   /**
    * Create an instance from given statement position and operand positions.
@@ -43,7 +42,7 @@ public class FullStmtPositionInfo extends SimpleStmtPositionInfo implements Copy
    * @param operandPositions the operand positions
    */
   public FullStmtPositionInfo(
-      @Nonnull Position stmtPosition, @Nonnull FullPosition[] operandPositions) {
+      @Nonnull Position stmtPosition, @Nonnull Position[] operandPositions) {
     super(stmtPosition);
     this.operandPositions = operandPositions;
   }
@@ -65,7 +64,7 @@ public Position getStmtPosition() {
    * @return the position of the given operand
    */
   public Position getOperandPosition(int index) {
-    if (this.operandPositions != null && index >= 0 && index < this.operandPositions.length) {
+    if (index >= 0 && index < this.operandPositions.length) {
       return this.operandPositions[index];
     } else {
       return NoPositionInformation.getInstance();
@@ -75,15 +74,10 @@ public Position getOperandPosition(int index) {
   @Override
   public String toString() {
     StringBuilder s = new StringBuilder();
-    s.append("stmt at: ").append(getStmtPosition()).append("\n");
+    s.append(super.toString());
     s.append("operands at: ");
-    if (operandPositions != null) {
-      s.append("\n");
-      for (int i = 0; i < operandPositions.length; i++) {
-        s.append(i).append(": ").append(operandPositions[i]).append(" ");
-      }
-    } else {
-      s.append("No position info");
+    for (int i = 0; i < operandPositions.length; i++) {
+      s.append(i).append(": ").append(operandPositions[i]).append(" ");
     }
     return s.toString();
   }
@@ -94,7 +88,7 @@ public StmtPositionInfo withStmtPosition(@Nonnull Position stmtPosition) {
   }
 
   @Nonnull
-  public StmtPositionInfo withOperandPositions(@Nonnull FullPosition[] operandPositions) {
+  public StmtPositionInfo withOperandPositions(@Nonnull Position[] operandPositions) {
     return new FullStmtPositionInfo(stmtPosition, operandPositions);
   }
 }

sootup.core/src/main/java/sootup/core/jimple/basic/SimpleStmtPositionInfo.java

@@ -24,7 +24,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import sootup.core.model.FullPosition;
+import sootup.core.model.LinePosition;
 import sootup.core.model.Position;
 
 /**
@@ -47,7 +47,7 @@ public SimpleStmtPositionInfo(@Nonnull Position stmtPosition) {
    * @param lineNumber the line number of the statement.
    */
   public SimpleStmtPositionInfo(int lineNumber) {
-    stmtPosition = new FullPosition(lineNumber, -1, lineNumber, -1);
+    stmtPosition = new LinePosition(lineNumber);
   }
 
   @Nonnull
@@ -61,22 +61,4 @@ public Position getStmtPosition() {
   public Position getOperandPosition(int index) {
     return null;
   }
-
-  public String toString() {
-    StringBuilder s = new StringBuilder();
-    s.append("stmt at:").append(getStmtPosition()).append("\n");
-    return s.toString();
-  }
-
-  @Nonnull
-  @Override
-  public StmtPositionInfo withStmtPosition(@Nonnull Position stmtPosition) {
-    return null;
-  }
-
-  @Nonnull
-  @Override
-  public StmtPositionInfo withOperandPositions(@Nonnull FullPosition[] operandPositions) {
-    return null;
-  }
 }

sootup.core/src/main/java/sootup/core/jimple/basic/StmtPositionInfo.java

@@ -24,7 +24,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import sootup.core.model.FullPosition;
 import sootup.core.model.Position;
 
 /**
@@ -34,7 +33,7 @@
  */
 public abstract class StmtPositionInfo {
 
-  protected static final StmtPositionInfo noPosition =
+  protected static final StmtPositionInfo NOPOSITION =
       new StmtPositionInfo() {
         @Nonnull
         @Override
@@ -51,18 +50,6 @@ public Position getOperandPosition(int index) {
         public String toString() {
           return "No StmtPositionnfo";
         }
-
-        @Nonnull
-        @Override
-        public StmtPositionInfo withStmtPosition(@Nonnull Position stmtPosition) {
-          return this;
-        }
-
-        @Nonnull
-        @Override
-        public StmtPositionInfo withOperandPositions(@Nonnull FullPosition[] operandPositions) {
-          return this;
-        }
       };
 
   /**
@@ -72,7 +59,7 @@ public StmtPositionInfo withOperandPositions(@Nonnull FullPosition[] operandPosi
    */
   @Nonnull
   public static StmtPositionInfo createNoStmtPositionInfo() {
-    return noPosition;
+    return NOPOSITION;
   }
 
   /**
@@ -93,11 +80,9 @@ public static StmtPositionInfo createNoStmtPositionInfo() {
   public abstract Position getOperandPosition(int index);
 
   @Override
-  public abstract String toString();
-
-  @Nonnull
-  public abstract StmtPositionInfo withStmtPosition(@Nonnull Position stmtPosition);
-
-  @Nonnull
-  public abstract StmtPositionInfo withOperandPositions(@Nonnull FullPosition[] operandPositions);
+  public String toString() {
+    StringBuilder s = new StringBuilder();
+    s.append("stmt at:").append(getStmtPosition());
+    return s.toString();
+  }
 }

sootup.core/src/main/java/sootup/core/model/LinePosition.java

@@ -1,7 +1,11 @@
 package sootup.core.model;
 
 public class LinePosition extends Position {
-  int lineNo;
+  private final int lineNo;
+
+  public LinePosition(int lineNo) {
+    this.lineNo = lineNo;
+  }
 
   @Override
   public int getFirstLine() {

sootup.java.sourcecode/src/main/java/sootup/java/sourcecode/frontend/WalaIRToJimpleConverter.java

@@ -645,7 +645,7 @@ public static StmtPositionInfo convertPositionInfo(
       Position instructionPosition, Position[] operandPosition) {
 
     if (operandPosition == null) {
-      return new FullStmtPositionInfo(convertPosition(instructionPosition), null);
+      return new SimpleStmtPositionInfo(convertPosition(instructionPosition));
     }
     FullPosition[] operandPos =
         Arrays.stream(operandPosition)