Merge pull request #1769 from smowton/smowton/fix/nondet-initialize-after-initialize

Java frontend: only run cproverNondetInitialize after all fields are initialized

Author: smowton

regression/cbmc-java/NondetInitValidate/Test.class renamed to regression/cbmc-java/NondetInit/Test.class

@@ -0,0 +1,16 @@
+import org.cprover.CProver;
+
+class Test {
+
+    int[] arr;
+
+    void cproverNondetInitialize() {
+        CProver.assume(arr != null && arr.length == 1);
+        // The following access should now be legal:
+        arr[0] = 100;
+    }
+
+    public static void main(Test nondetInput) {
+    }
+
+}

regression/cbmc-java/NondetInitValidate/Test.java renamed to regression/cbmc-java/NondetInit/Test.java

@@ -0,0 +1,5 @@
+CORE
+Test.class
+
+^VERIFICATION SUCCESSFUL$
+

regression/cbmc-java/NondetInitValidate/test.desc renamed to regression/cbmc-java/NondetInit/test.desc

@@ -0,0 +1,22 @@
+import org.cprover.CProver;
+
+class Test {
+
+    int[] arr;
+
+    void cproverNondetInitialize() {
+        CProver.assume(arr != null && arr.length == 1);
+        // The following access should now be legal:
+        arr[0] = 100;
+    }
+
+    public static void main(Subclass nondetInput) {
+        // The condition enforced by cproverNondetInitialize should hold
+        // even though the parameter is a subtype of Test, not directly an
+        // instance of Test itself.
+        assert nondetInput.arr.length == 1;
+    }
+
+}
+
+class Subclass extends Test { }