diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2cff379df60..d955bc0eae6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-07  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	* function.c (free_after_compilation): Clear PROP_cfg in f->curr_properties.
+
 2015-07-07  Richard Biener  <rguenther@suse.de>
 
 	* tree-ssa-propagate.c (add_ssa_edge): Dump what edge list we
diff --git a/gcc/function.c b/gcc/function.c
index 8ee79d30a14..ea0d6e87b62 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -216,6 +216,7 @@ free_after_compilation (struct function *f)
   f->eh = NULL;
   f->machine = NULL;
   f->cfg = NULL;
+  f->curr_properties &= ~PROP_cfg;
 
   regno_reg_rtx = NULL;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 631872176ff..a14fbd1a291 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-07  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	* gcc.dg/dx-test.c: New test-case.
+
 2015-07-07  Andre Vehreschild  <vehre@gmx.de>
 
 	PR fortran/66578
diff --git a/gcc/testsuite/gcc.dg/dx-test.c b/gcc/testsuite/gcc.dg/dx-test.c
new file mode 100644
index 00000000000..579ccfb9798
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dx-test.c
@@ -0,0 +1,5 @@
+/* { dg-do compile } */
+/* { dg-options "-dx" } */
+
+void f(void)
+{}