aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJames A. Morrison <phython@gcc.gnu.org>2005-08-11 04:21:55 +0000
committerJames A. Morrison <phython@gcc.gnu.org>2005-08-11 04:21:55 +0000
commita4faac50ad558b6e7cfb3f90f2e510363915bdc1 (patch)
tree0bb67d99373199da0897f68eda349fdc0ffa9673 /gcc
parent907f033f983dec0caa1d17d13557ef5c61e407e3 (diff)
downloadgcc-a4faac50ad558b6e7cfb3f90f2e510363915bdc1.zip
gcc-a4faac50ad558b6e7cfb3f90f2e510363915bdc1.tar.gz
gcc-a4faac50ad558b6e7cfb3f90f2e510363915bdc1.tar.bz2
re PR c++/23225 (tree check: expected class type, have exceptional (error_mark) in build_pointer_type_for_mode, at tree.c:4246)
2005-08-10 James A. Morrison <phython@gcc.gnu.org> PR c++/23225 * tree.c (build_pointer_type_for_mode): Robustify. From-SVN: r102977
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/testsuite/ChangeLog7
-rw-r--r--gcc/testsuite/g++.dg/parse/crash27.C9
-rw-r--r--gcc/tree.c3
4 files changed, 23 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8faec78..2c09505 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-10 James A. Morrison <phython@gcc.gnu.org>
+
+ PR c++/23225
+ * tree.c (build_pointer_type_for_mode): Robustify.
+
2005-08-10 James E Wilson <wilson@specifix.com>
* defaults.h, config/alpha/alpha.h, config/ia64/ia64.h
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7d4d8f2..7af9d40 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,7 +1,12 @@
+2005-08-10 James A. Morrison <phython@gcc.gnu.org>
+
+ PR c++/23225
+ * g++.dg/testsuite/parse/crash27.C: new test.
+
2005-08-10 Thomas Koenig <Thomas.Koenig@online.de>
PR libfortran/22143
- gfortran.dg/shift-kind.f90: New testcase.
+ * gfortran.dg/shift-kind.f90: New testcase.
2005-08-10 Richard Sandiford <richard@codesourcery.com>
diff --git a/gcc/testsuite/g++.dg/parse/crash27.C b/gcc/testsuite/g++.dg/parse/crash27.C
new file mode 100644
index 0000000..4d65177
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/crash27.C
@@ -0,0 +1,9 @@
+// Bug: 23225
+
+void Dispatcher()
+ (__builtin_offsetof (ArgsType, largeMsgLen))
+ /* { dg-error "function " "function" { target *-*-* } 4 } */
+ /* { dg-error "expected type" "expected 1" { target *-*-* } 4 } */
+ /* { dg-error "expected `,' before" "expected 2" { target *-*-* } 4 } */
+ /* { dg-error "expected `\\\)" "expected 3" { target *-*-* } 4 } */
+ /* { dg-error "expected ',' or" "expected 4" { target *-*-* } 4 } */
diff --git a/gcc/tree.c b/gcc/tree.c
index 39e2f1f..849482d3 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -4684,6 +4684,9 @@ build_pointer_type_for_mode (tree to_type, enum machine_mode mode,
{
tree t;
+ if (to_type == error_mark_node)
+ return error_mark_node;
+
/* In some cases, languages will have things that aren't a POINTER_TYPE
(such as a RECORD_TYPE for fat pointers in Ada) as TYPE_POINTER_TO.
In that case, return that type without regard to the rest of our