Fix gcc-mirror#2.

Author: marxin

gcc/c/c-parser.c

@@ -1862,10 +1862,15 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
 		  /* A parameter is initialized, which is invalid.  Don't
 		     attempt to instrument the initializer.  */
 		  int flag_sanitize_save = flag_sanitize;
+		  int flag_sanitize_local_save = flag_sanitize_local;
 		  if (nested && !empty_ok)
-		    flag_sanitize = 0;
+		    {
+		      flag_sanitize = 0;
+		      flag_sanitize_local = 0;
+		    }
 		  init = c_parser_expr_no_commas (parser, NULL);
 		  flag_sanitize = flag_sanitize_save;
+		  flag_sanitize_local = flag_sanitize_local_save;
 		  if (TREE_CODE (init.value) == COMPONENT_REF
 		      && DECL_C_BIT_FIELD (TREE_OPERAND (init.value, 1)))
 		    error_at (here,

gcc/cp/typeck.c

@@ -3409,7 +3409,7 @@ get_member_function_from_ptrfunc (tree *instance_ptrptr, tree function,
       idx = build1 (NOP_EXPR, vtable_index_type, e3);
       switch (TARGET_PTRMEMFUNC_VBIT_LOCATION)
 	{
-	  int flag_sanitize_save;
+	  int flag_sanitize_save, flag_sanitize_local_save;
 	case ptrmemfunc_vbit_in_pfn:
 	  e1 = cp_build_binary_op (input_location,
 				   BIT_AND_EXPR, idx, integer_one_node,
@@ -3429,11 +3429,14 @@ get_member_function_from_ptrfunc (tree *instance_ptrptr, tree function,
 	     we're going to use DELTA number of times, and that wouldn't play
 	     well with SAVE_EXPRs therein.  */
 	  flag_sanitize_save = flag_sanitize;
+	  flag_sanitize_local_save = flag_sanitize_local;
 	  flag_sanitize = 0;
+	  flag_sanitize_local = 0;
 	  delta = cp_build_binary_op (input_location,
 				      RSHIFT_EXPR, delta, integer_one_node,
 				      complain);
 	  flag_sanitize = flag_sanitize_save;
+	  flag_sanitize_local = flag_sanitize_local_save;
 	  if (delta == error_mark_node)
 	    return error_mark_node;
 	  break;