Merge remote-tracking branch 'thk123/bugfix/partial-expression-simplification' into release/release-16

Author: thk123

regression/goto-analyzer-simplify/Makefile

@@ -0,0 +1,31 @@
+
+default: tests.log
+
+test:
+	@if ! ../test.pl -c ../chain.sh ; then \
+		../failed-tests-printer.pl ; \
+		exit 1; \
+	fi
+
+tests.log:
+	@if ! ../test.pl -c ../chain.sh ; then \
+		../failed-tests-printer.pl ; \
+		exit 1; \
+	fi
+
+show:
+	@for dir in *; do \
+		if [ -d "$$dir" ]; then \
+			vim -o "$$dir/*.c" "$$dir/*.out"; \
+		fi; \
+	done;
+
+clean:
+	@for dir in *; do \
+		rm -f tests.log; \
+		if [ -d "$$dir" ]; then \
+			cd "$$dir"; \
+			rm -f *.out *.gb; \
+			cd ..; \
+		fi \
+	done

regression/goto-analyzer-simplify/chain.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+src_dir=../../../src
+
+goto_analyzer=$src_dir/goto-analyzer/goto-analyzer
+
+options=$1
+file_name=${2%.c}
+
+echo options: $options
+echo file name : $file_name
+
+$goto_analyzer $file_name.c $options --simplify $file_name_simp.out
+$goto_analyzer $file_name_simp.out --show-goto-functions

regression/goto-analyzer-simplify/partial-simplify-array/main.c

@@ -0,0 +1,7 @@
+extern int arr[];
+
+void main()
+{
+  int index=0;
+  int j=arr[index];
+}

regression/goto-analyzer-simplify/partial-simplify-array/test.desc

@@ -0,0 +1,5 @@
+CORE
+main.c
+"--variable --arrays"
+
+arr\[0l\]

src/analyses/variable-sensitivity/variable_sensitivity_domain.cpp

@@ -295,8 +295,18 @@ bool variable_sensitivity_domaint::ai_simplify(
   sharing_ptrt<abstract_objectt> res=abstract_state.eval(condition, ns);
   exprt c=res->to_constant();
 
-  if(c.id()==ID_nil)  // TODO : simplification within an expression
-    return true;
+  if(c.id()==ID_nil)
+  {
+    bool no_simplification=true;
+
+    // Try to simplify recursively any child operations
+    for(exprt &op : condition.operands())
+    {
+      no_simplification&=ai_simplify(op, ns);
+    }
+
+    return no_simplification;
+  }
   else
   {
     bool condition_changed=(condition!=c);