* stack.c (read_frame_arg): Set 'entryval_error' to NULL if
	'entryval' is set.

gdb/testsuite/

	* gdb.trace/collection.exp (gdb_collect_args_test): Set
	"only" and "both" to 'print entry-values' before selecting
	trace frame.
This commit is contained in:
Yao Qi
2013-08-09 00:35:40 +00:00
parent a780258f0e
commit 1ed8d8006b
4 changed files with 31 additions and 1 deletions

View File

@@ -1,3 +1,8 @@
2013-08-09 Yao Qi <yao@codesourcery.com>
* stack.c (read_frame_arg): Set 'entryval_error' to NULL if
'entryval' is set.
2013-08-08 Azat Khuzhin <a3at.mail@gmail.com> (tiny change)
* gcore.c (create_gcore_bfd): Use tilde_expand.

View File

@@ -469,7 +469,10 @@ read_frame_arg (struct symbol *sym, struct frame_info *frame,
|| print_entry_values == print_entry_values_both
|| (print_entry_values == print_entry_values_preferred
&& (!val || value_optimized_out (val))))
entryval = allocate_optimized_out_value (SYMBOL_TYPE (sym));
{
entryval = allocate_optimized_out_value (SYMBOL_TYPE (sym));
entryval_error = NULL;
}
}
if ((print_entry_values == print_entry_values_compact
|| print_entry_values == print_entry_values_if_needed

View File

@@ -1,3 +1,9 @@
2013-08-09 Yao Qi <yao@codesourcery.com>
* gdb.trace/collection.exp (gdb_collect_args_test): Set
"only" and "both" to 'print entry-values' before selecting
trace frame.
2013-08-08 Yao Qi <yao@codesourcery.com>
* gdb.trace/mi-trace-unavailable.exp: Don't set

View File

@@ -128,6 +128,22 @@ proc gdb_collect_args_test { myargs msg } {
# Begin the test.
run_trace_experiment $msg args_test_func
# Frame arguments and their entry values are displayed correctly with
# various values of "print entry-values" when a trace frame is
# selected.
gdb_test "tfind -1" ".*" ""
gdb_test_no_output "set print entry-values only" ""
gdb_test "tfind 0" \
" \\(argc@entry=\[^,\]*, argi@entry=\[^,\]*, argf@entry=\[^,\]*, argd@entry=\[^,\]*, argstruct@entry=\[^,\]*, argarray@entry=\[^,\]*\\) .*" \
"collect $msg: tfind 0 with entry-values only"
gdb_test "tfind -1" ".*" ""
gdb_test_no_output "set print entry-values both" ""
gdb_test "tfind 0" \
" \\(argc=\[^,\]*, argc@entry=\[^,\]*, argi=\[^,\]*, argi@entry=\[^,\]*, argf=\[^,\]*, argf@entry=\[^,\]*, argd=\[^,\]*, argd@entry=\[^,\]*, argstruct=\[^,\]*, argstruct@entry=\[^,\]*, argarray=\[^,\]*, argarray@entry=\[^,\]*\\) .*" \
"collect $msg: tfind 0 with entry-values both"
gdb_test "print argc" \
"\\$\[0-9\]+ = 1 '.001'$cr" \
"collect $msg: collected arg char"