diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2010-06-25 16:16:44 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2010-06-25 16:16:44 +0000 |
| commit | 19c0c0f82272cdff5e1f8306382ba6ceb95ff1a0 (patch) | |
| tree | 55b2c257a6bc438d9e19aed7caf49388ddcfe29a | |
| parent | 4ba2ab9fc3a751c1f379670009efb1df8c082336 (diff) | |
| download | gdb-19c0c0f82272cdff5e1f8306382ba6ceb95ff1a0.zip gdb-19c0c0f82272cdff5e1f8306382ba6ceb95ff1a0.tar.gz gdb-19c0c0f82272cdff5e1f8306382ba6ceb95ff1a0.tar.bz2 | |
* cp-support.c (reset_directive_searched): New function.
(make_symbol_overload_list_using): Prevent recursive calls.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/cp-support.c | 28 |
2 files changed, 31 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d99913c..399e529 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2010-06-25 Ulrich Weigand <uweigand@de.ibm.com> + + * cp-support.c (reset_directive_searched): New function. + (make_symbol_overload_list_using): Prevent recursive calls. + 2010-06-25 Phil Muldoon <pmuldoon@redhat.com> * printcmd.c (print_variable_and_value): Print error message on diff --git a/gdb/cp-support.c b/gdb/cp-support.c index 41af7ae..ad1fb06 100644 --- a/gdb/cp-support.c +++ b/gdb/cp-support.c @@ -838,6 +838,15 @@ make_symbol_overload_list_adl (struct type **arg_types, int nargs, return sym_return_val; } +/* Used for cleanups to reset the "searched" flag in case of an error. */ + +static void +reset_directive_searched (void *data) +{ + struct using_direct *direct = data; + direct->searched = 0; +} + /* This applies the using directives to add namespaces to search in, and then searches for overloads in all of those namespaces. It adds the symbols found to sym_return_val. Arguments are as in @@ -847,7 +856,7 @@ static void make_symbol_overload_list_using (const char *func_name, const char *namespace) { - const struct using_direct *current; + struct using_direct *current; const struct block *block; /* First, go through the using directives. If any of them apply, @@ -861,12 +870,27 @@ make_symbol_overload_list_using (const char *func_name, current != NULL; current = current->next) { + /* Prevent recursive calls. */ + if (current->searched) + continue; + /* If this is a namespace alias or imported declaration ignore it. */ if (current->alias != NULL || current->declaration != NULL) continue; if (strcmp (namespace, current->import_dest) == 0) - make_symbol_overload_list_using (func_name, current->import_src); + { + /* Mark this import as searched so that the recursive call does + not search it again. */ + struct cleanup *old_chain; + current->searched = 1; + old_chain = make_cleanup (reset_directive_searched, current); + + make_symbol_overload_list_using (func_name, current->import_src); + + current->searched = 0; + discard_cleanups (old_chain); + } } /* Now, add names for this namespace. */ |