diff options
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/expr.c | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e9f24df..ac8ee1c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2001-04-02 Zack Weinberg <zackw@stanford.edu> + + * expr.c (pop_type_0): Save the result of the first + lang_printable_name call in a scratch buffer, so it + won't be clobbered by the second call. + 2001-03-28 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * expr.c (pop_type_0): Call `concat' rather than building the diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 2ea6a81..cb9ae16 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -356,9 +356,15 @@ pop_type_0 (type, messagep) return object_ptr_type_node; } - *messagep = concat ("expected type '", lang_printable_name (type, 0), - "' but stack contains '", lang_printable_name (t, 0), - "'", NULL); + /* lang_printable_name uses a static buffer, so we must save the result + from calling it the first time. */ + { + char *temp = xstrdup (lang_printable_name (type, 0)); + *messagep = concat ("expected type '", temp, + "' but stack contains '", lang_printable_name (t, 0), + "'", NULL); + free (temp); + } return type; } |