Fixed issue #1229: Issues with GCC 4.8, which in -O2 move removes som…

…e required code

Turned out to be me after all, and not the compiler

config.m4

@@ -5,28 +5,6 @@ PHP_ARG_ENABLE(xdebug, whether to enable Xdebug support,
 [  --enable-xdebug         Enable Xdebug support])
 
 if test "$PHP_XDEBUG" != "no"; then
-dnl disabling -O2 for GCC 4.8
-  AS_IF([test "x$GCC" = "xyes"],[
-    AS_IF([test x`${CC} --version | ${AWK} '/(gcc|cc)/ { print "gcc" }'` = "xgcc"],[
-      AC_CACHE_CHECK([$CC version],[ax_cv_xdebug_gcc_version],[
-        ax_cv_xdebug_gcc_version="`$CC -dumpversion`"
-        AS_IF([test "x$ax_cv_xdebug_gcc_version" = "x"],[
-          ax_cv_xdebug_gcc_version=""
-        ])
-      ])
-      XDEBUG_GCC_VERSION=$ax_cv_xdebug_gcc_version
-      XDEBUG_GCC_VERSION_MAJOR=$(echo $XDEBUG_GCC_VERSION | cut -d'.' -f1)
-      XDEBUG_GCC_VERSION_MINOR=$(echo $XDEBUG_GCC_VERSION | cut -d'.' -f2)
-
-      AS_IF([test "x$XDEBUG_GCC_VERSION_MAJOR" = "x4"],[
-        AS_IF([test "x$XDEBUG_GCC_VERSION_MINOR" = "x8"],[
-          AC_MSG_RESULT([disabling optimisation because of GCC 4.8])
-          CFLAGS=`echo $CFLAGS | sed 's/O2/O0/'`
-        ])
-      ])
-    ])
-  ])
-
   AC_MSG_CHECKING([Check for supported PHP versions])
   PHP_XDEBUG_FOUND_VERSION=`${PHP_CONFIG} --version`
   PHP_XDEBUG_FOUND_VERNUM=`echo "${PHP_XDEBUG_FOUND_VERSION}" | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 100 + [$]2) * 100 + [$]3;}'`

xdebug_var.c

@@ -986,6 +986,7 @@ void xdebug_var_export(zval **struc, xdebug_str *str, int level, int debug_zval,
 	zend_ulong num;
 	zend_string *key;
 	zval *val;
+	zval *tmpz;
 #endif
 
 	if (!struc || !(*struc)) {
@@ -1001,7 +1002,7 @@ void xdebug_var_export(zval **struc, xdebug_str *str, int level, int debug_zval,
 		}
 	}
 	if (Z_TYPE_P(*struc) == IS_REFERENCE) {
-		zval *tmpz = &((*struc)->value.ref->val);
+		tmpz = &((*struc)->value.ref->val);
 		struc = &tmpz;
 	}
 #else