diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2015-12-04 14:52:09 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@adacore.com> | 2015-12-04 14:52:09 +0000 |
| commit | 62dd1863abd65ada3d0929db1789c617ff34e1a6 (patch) | |
| tree | 94204ba776de500b6dc0fc54682d443fd0755f6d /gcc/cp/mangle.c | |
| parent | c672cad4aff4f9923eab0995cc327a0cb7fc8e2a (diff) | |
Merge from trunk @231250.scalar-storage-order
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/scalar-storage-order@231274 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/mangle.c')
| -rw-r--r-- | gcc/cp/mangle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 6f8bf68d951..3ff30663f08 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -1145,7 +1145,7 @@ write_template_prefix (const tree node) So, for the example above, `Outer<int>::Inner' is represented as a substitution candidate by a TREE_LIST whose purpose is `Outer<int>' and whose value is `Outer<T>::Inner<U>'. */ - if (TYPE_P (context)) + if (context && TYPE_P (context)) substitution = build_tree_list (context, templ); else substitution = templ; |