diff options
| author | Ben Cheng <bccheng@google.com> | 2013-08-05 15:18:29 -0700 |
|---|---|---|
| committer | Ben Cheng <bccheng@google.com> | 2013-08-05 16:03:48 -0700 |
| commit | 32fce3edda831e36ee484406c39dffbe0230f257 (patch) | |
| tree | 733b1b5398304b260a4ee3d5d9b17da5038c5486 /gcc-4.8/gcc/cp/search.c | |
| parent | e85b9ca2afe8edbb9fa99c6ce2cc4e52dce18c21 (diff) | |
| download | toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.tar.gz toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.tar.bz2 toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.zip | |
[4.8] Merge GCC 4.8.1
Change-Id: Ic8a60b7563f5172440fd40788605163a0cca6e30
Diffstat (limited to 'gcc-4.8/gcc/cp/search.c')
| -rw-r--r-- | gcc-4.8/gcc/cp/search.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gcc-4.8/gcc/cp/search.c b/gcc-4.8/gcc/cp/search.c index 4cc02ba7d..54a5e4ae7 100644 --- a/gcc-4.8/gcc/cp/search.c +++ b/gcc-4.8/gcc/cp/search.c @@ -188,6 +188,14 @@ lookup_base (tree t, tree base, base_access access, tree t_binfo; base_kind bk; + /* "Nothing" is definitely not derived from Base. */ + if (t == NULL_TREE) + { + if (kind_ptr) + *kind_ptr = bk_not_base; + return NULL_TREE; + } + if (t == error_mark_node || base == error_mark_node) { if (kind_ptr) |