Merge pull request diffblue#269 from diffblue/owen-jones-diffblue/lvsa-test-escape-analysis

Owen jones diffblue/lvsa test escape analysis

Author: owen-jones-diffblue

regression/LVSA/TestArray/test_array.py

@@ -9,44 +9,44 @@ def test_lvsa_null_initialized_array(tmpdir):
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('null_initialized_array')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_output()
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation.check_number_of_values(1)
-    output_value_expectation.check_contains_null_object()
+    value_set_expectation.check_number_of_values(1)
+    value_set_expectation.check_contains_null_object()
 
 
 def test_lvsa_manually_filled_array_1(tmpdir):
     """We cannot tell that the whole array has been given a non-null value"""
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('manually_filled_array_1')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_output()
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation.check_number_of_values(2)
-    output_value_expectation.check_contains_null_object()
-    output_value_expectation.check_contains_dynamic_object(is_most_recent_allocation=True)
+    value_set_expectation.check_number_of_values(2)
+    value_set_expectation.check_contains_null_object()
+    value_set_expectation.check_contains_dynamic_object(is_most_recent_allocation=True)
 
 
 def test_lvsa_manually_filled_array_2(tmpdir):
     """We cannot tell that the whole array has been given a non-null value"""
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('manually_filled_array_2')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_output()
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation.check_number_of_values(3)
-    output_value_expectation.check_contains_null_object()
-    output_value_expectation.check_contains_dynamic_object(is_most_recent_allocation=True)
-    output_value_expectation.check_contains_dynamic_object(is_most_recent_allocation=False)
+    value_set_expectation.check_number_of_values(3)
+    value_set_expectation.check_contains_null_object()
+    value_set_expectation.check_contains_dynamic_object(is_most_recent_allocation=True)
+    value_set_expectation.check_contains_dynamic_object(is_most_recent_allocation=False)
 
 
 def test_lvsa_initialize_array(tmpdir):
     """We use one value set for all indices"""
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('initialize_array')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_output()
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation.check_number_of_values(4)
-    output_value_expectation.check_contains_null_object()
-    output_value_expectation.check_contains_dynamic_object(3, is_most_recent_allocation=True)
+    value_set_expectation.check_number_of_values(4)
+    value_set_expectation.check_contains_null_object()
+    value_set_expectation.check_contains_dynamic_object(3, is_most_recent_allocation=True)

regression/LVSA/TestBasic/Test.class

@@ -12,10 +12,6 @@ public void outputs_null() {
     output = null;
   }
 
-  public void outputs_dynamic_object() {
-    output = new A();
-  }
-
   public void outputs_null_or_dynamic_object(Boolean someBoolean) {
     if (someBoolean) {
       output = new A();

regression/LVSA/TestBasic/Test.java

@@ -8,44 +8,34 @@ def test_outputs_null(tmpdir):
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_null')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_output()
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation.check_number_of_values(1)
-    output_value_expectation.check_contains_null_object()
-
-
-def test_outputs_dynamic_object(tmpdir):
-    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_dynamic_object')
-    lvsa_expectation = lvsa_driver.run()
-
-    output_value_expectation = lvsa_expectation.check_output()
-
-    output_value_expectation.check_number_of_values(1)
-    output_value_expectation.check_contains_dynamic_object()
+    value_set_expectation.check_number_of_values(1)
+    value_set_expectation.check_contains_null_object()
 
 
 def test_outputs_null_or_dynamic_object(tmpdir):
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_null_or_dynamic_object')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_output()
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation.check_number_of_values(2)
-    output_value_expectation.check_contains_null_object()
-    output_value_expectation.check_contains_dynamic_object()
+    value_set_expectation.check_number_of_values(2)
+    value_set_expectation.check_contains_null_object()
+    value_set_expectation.check_contains_dynamic_object()
 
 
 def test_outputs_dynamic_object_with_allocated_field(tmpdir):
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_dynamic_object_with_allocated_field')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_output()
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation.check_number_of_values(1)
-    output_value_expectation.check_contains_dynamic_object()
-    dynamic_object_id = output_value_expectation.get_dynamic_object_ids()[0]
+    value_set_expectation.check_number_of_values(1)
+    value_set_expectation.check_contains_dynamic_object()
+    dynamic_object_id = value_set_expectation.get_dynamic_object_ids()[0]
 
-    output_value_expectation = lvsa_expectation.check_value_set(dynamic_object_id, '.instanceObj', most_recent=True)
+    value_set_expectation = lvsa_expectation.get_value_set_for_dynamic_object_value_set(dynamic_object_id, '.instanceObj', most_recent=True)
 
-    output_value_expectation.check_number_of_values(1)
-    output_value_expectation.check_contains_dynamic_object()
+    value_set_expectation.check_number_of_values(1)
+    value_set_expectation.check_contains_dynamic_object()

regression/LVSA/TestBasic/test_basic.py

@@ -7,52 +7,52 @@ def test_write_static_field_to_parameter_field(tmpdir):
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('write_static_field_to_parameter_field')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_external_value_set('Node', '.left')
+    value_set_expectation = lvsa_expectation.get_value_set_for_external_value_set('Node', '.left')
 
-    output_value_expectation.check_number_of_values(2)
-    output_value_expectation.check_contains_external_value_set(expected_number=2)
+    value_set_expectation.check_number_of_values(2)
+    value_set_expectation.check_contains_external_value_set(expected_number=2)
 
 
 def test_write_parameter_field_to_static_field(tmpdir):
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('write_parameter_field_to_static_field')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_external_value_set('Node', '.left')
+    value_set_expectation = lvsa_expectation.get_value_set_for_external_value_set('Node', '.left')
 
-    output_value_expectation.check_number_of_values(2)
-    output_value_expectation.check_contains_external_value_set(expected_number=2)
+    value_set_expectation.check_number_of_values(2)
+    value_set_expectation.check_contains_external_value_set(expected_number=2)
 
 
 def test_write_new_class_to_parameter_field(tmpdir):
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('write_new_class_to_parameter_field')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_external_value_set('Node', '.left')
+    value_set_expectation = lvsa_expectation.get_value_set_for_external_value_set('Node', '.left')
 
-    output_value_expectation.check_contains_dynamic_object()
+    value_set_expectation.check_contains_dynamic_object()
 
 
 def test_write_new_class_to_static_field(tmpdir):
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('write_new_class_to_static_field')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_external_value_set('Node', '.left')
+    value_set_expectation = lvsa_expectation.get_value_set_for_external_value_set('Node', '.left')
 
-    output_value_expectation.check_contains_dynamic_object()
+    value_set_expectation.check_contains_dynamic_object()
 
 
 def test_is_initializer_flag(tmpdir):
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('is_initializer_flag')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation_1 = lvsa_expectation.check_external_value_set('Node', '.left')
+    value_set_expectation_1 = lvsa_expectation.get_value_set_for_external_value_set('Node', '.left')
 
-    output_value_expectation_1.check_number_of_values(2)
-    output_value_expectation_1.check_contains_dynamic_object(is_most_recent_allocation=True)
-    output_value_expectation_1.check_contains_external_value_set(is_initializer=True)
+    value_set_expectation_1.check_number_of_values(2)
+    value_set_expectation_1.check_contains_dynamic_object(is_most_recent_allocation=True)
+    value_set_expectation_1.check_contains_external_value_set(is_initializer=True)
 
-    output_value_expectation_2 = lvsa_expectation.check_public_static('static_object')
+    value_set_expectation_2 = lvsa_expectation.get_value_set_for_public_static('static_object')
 
-    output_value_expectation_2.check_number_of_values(2)
-    output_value_expectation_2.check_contains_dynamic_object(is_most_recent_allocation=True)
-    output_value_expectation_2.check_contains_external_value_set(is_initializer=False)
+    value_set_expectation_2.check_number_of_values(2)
+    value_set_expectation_2.check_contains_dynamic_object(is_most_recent_allocation=True)
+    value_set_expectation_2.check_contains_external_value_set(is_initializer=False)

regression/LVSA/TestEVS/test_evs.py

@@ -0,0 +1,50 @@
+package LVSA.TestEscapeAnalysis;
+
+public class Test {
+  static Object output;
+
+  public class A {
+    Object object;
+  }
+
+  public class B {
+    A a;
+  }
+
+  public void dynamic_object_assigned_to_local() {
+    Object local = new Object();
+  }
+
+  public void apply_dynamic_object_assigned_to_local() {
+    dynamic_object_assigned_to_local();
+  }
+
+  public Object dynamic_object_returned() {
+    Object local = new Object();
+    return local;
+  }
+
+  public void apply_dynamic_object_returned() {
+    output = dynamic_object_returned();
+  }
+
+  public void dynamic_object_assigned_to_static() {
+    output = new Object();
+  }
+
+  public void apply_dynamic_object_assigned_to_static() {
+    dynamic_object_assigned_to_static();
+  }
+
+  public void dynamic_object_assigned_to_field_of_parameter(A param) {
+    param.object = new Object();
+  }
+
+  public void apply_dynamic_object_assigned_to_field_of_parameter(A param) {
+    dynamic_object_assigned_to_field_of_parameter(param);
+  }
+
+  public void dynamic_object_assigned_to_field_of_field_of_parameter(B param) {
+    param.a.object = new Object();
+  }
+}

regression/LVSA/TestEscapeAnalysis/Test$A.class

@@ -0,0 +1,41 @@
+from regression.LVSA.lvsa_driver import LvsaDriver
+
+
+folder_name = 'TestEscapeAnalysis'
+
+
+def test_dynamic_object_assigned_to_local(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('apply_dynamic_object_assigned_to_local')
+    lvsa_expectation = lvsa_driver.run()
+
+    for value_set_expectation in lvsa_expectation.get_all_value_sets():
+        value_set_expectation.check_contains_dynamic_object(0)
+
+
+def test_dynamic_object_returned(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('apply_dynamic_object_returned')
+    lvsa_expectation = lvsa_driver.run()
+
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
+
+    value_set_expectation.check_number_of_values(1)
+    value_set_expectation.check_contains_dynamic_object()
+
+
+def test_outputs_dynamic_object(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('apply_dynamic_object_assigned_to_static')
+    lvsa_expectation = lvsa_driver.run()
+
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
+
+    value_set_expectation.check_number_of_values(1)
+    value_set_expectation.check_contains_dynamic_object()
+
+
+def test_dynamic_object_assigned_to_parameter(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('apply_dynamic_object_assigned_to_field_of_parameter')
+    lvsa_expectation = lvsa_driver.run()
+
+    value_set_expectation = lvsa_expectation.get_value_set_for_external_value_set(inner_class='A', suffix='.object')
+
+    value_set_expectation.check_contains_dynamic_object()

regression/LVSA/TestEscapeAnalysis/Test$B.class

@@ -9,76 +9,76 @@ def test_field_setter(tmpdir):
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('field_setter')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_output()
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation.check_number_of_values(1)
-    output_value_expectation.check_contains_external_value_set()
+    value_set_expectation.check_number_of_values(1)
+    value_set_expectation.check_contains_external_value_set()
 
 
 def test_field_getter(tmpdir):
     # This test should change when precise access paths have been implemented
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('field_getter')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_return_value()
+    value_set_expectation = lvsa_expectation.get_value_set_for_return_value()
 
-    output_value_expectation.check_number_of_values(1)
-    output_value_expectation.check_contains_external_value_set()
+    value_set_expectation.check_number_of_values(1)
+    value_set_expectation.check_contains_external_value_set()
 
 
 def test_read_field_before_writing_to_aliasable_field(tmpdir):
     # This test should change when precise access paths have been implemented
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('read_field_before_writing_to_aliasable_field')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation_1 = lvsa_expectation.check_external_value_set('A', '.left_object')
+    value_set_expectation_1 = lvsa_expectation.get_value_set_for_external_value_set('A', '.left_object')
 
-    output_value_expectation_1.check_number_of_values(2)
-    output_value_expectation_1.check_contains_external_value_set()
-    output_value_expectation_1.check_contains_dynamic_object()
+    value_set_expectation_1.check_number_of_values(2)
+    value_set_expectation_1.check_contains_external_value_set()
+    value_set_expectation_1.check_contains_dynamic_object()
 
-    output_value_expectation_2 = lvsa_expectation.check_output()
+    value_set_expectation_2 = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation_2.check_number_of_values(1)
-    output_value_expectation_2.check_contains_external_value_set()
+    value_set_expectation_2.check_number_of_values(1)
+    value_set_expectation_2.check_contains_external_value_set()
 
 
 def test_read_field_after_writing_to_aliasable_field(tmpdir):
     # This test should not change significantly when precise access paths have been implemented
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('read_field_after_writing_to_aliasable_field')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation_1 = lvsa_expectation.check_external_value_set('A', '.left_object')
+    value_set_expectation_1 = lvsa_expectation.get_value_set_for_external_value_set('A', '.left_object')
 
-    output_value_expectation_1.check_number_of_values(2)
-    output_value_expectation_1.check_contains_external_value_set()
-    output_value_expectation_1.check_contains_dynamic_object()
+    value_set_expectation_1.check_number_of_values(2)
+    value_set_expectation_1.check_contains_external_value_set()
+    value_set_expectation_1.check_contains_dynamic_object()
 
-    output_value_expectation_2 = lvsa_expectation.check_output()
+    value_set_expectation_2 = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation_2.check_number_of_values(2)
-    output_value_expectation_2.check_contains_external_value_set()
-    output_value_expectation_2.check_contains_dynamic_object()
+    value_set_expectation_2.check_number_of_values(2)
+    value_set_expectation_2.check_contains_external_value_set()
+    value_set_expectation_2.check_contains_dynamic_object()
 
 
 def test_call_function_to_allocate_new_object(tmpdir):
     # This test should change when precise access paths have been implemented
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('call_function_to_allocate_new_object')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_output()
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation.check_number_of_values(2)
-    output_value_expectation.check_contains_external_value_set()
-    output_value_expectation.check_contains_dynamic_object()
+    value_set_expectation.check_number_of_values(2)
+    value_set_expectation.check_contains_external_value_set()
+    value_set_expectation.check_contains_dynamic_object()
 
 
 def test_get_list_node(tmpdir):
     # This test should not change when precise access paths have been implemented
     lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('get_list_node')
     lvsa_expectation = lvsa_driver.run()
 
-    output_value_expectation = lvsa_expectation.check_output()
+    value_set_expectation = lvsa_expectation.get_value_set_for_output()
 
-    output_value_expectation.check_number_of_values(1)
-    output_value_expectation.check_contains_external_value_set()
+    value_set_expectation.check_number_of_values(1)
+    value_set_expectation.check_contains_external_value_set()