diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-09 13:11:53 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-09 13:12:47 +0800 |
| commit | a22b5261da70bebfad7c6f4e948501e293db172d (patch) | |
| tree | c7b5b65090d4982b494b95478d217efe71a73799 /gcc-4.7 | |
| parent | 3800bda255b20023e993ed786674f70c909d60b5 (diff) | |
| download | toolchain_gcc-a22b5261da70bebfad7c6f4e948501e293db172d.tar.gz toolchain_gcc-a22b5261da70bebfad7c6f4e948501e293db172d.tar.bz2 toolchain_gcc-a22b5261da70bebfad7c6f4e948501e293db172d.zip | |
[4.7] Fix crash on null context in GCC 4.6 cp/mangle.c::write_unscoped_name
See related CL: 737fc2a978ff2364d91e634a6b990979df60058f for
GCC 4.6
Change-Id: Ie630c2ef24555fd138f9499913619efb993f141b
Diffstat (limited to 'gcc-4.7')
| -rw-r--r-- | gcc-4.7/gcc/cp/mangle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc-4.7/gcc/cp/mangle.c b/gcc-4.7/gcc/cp/mangle.c index 2d1cd9583..9101db2e1 100644 --- a/gcc-4.7/gcc/cp/mangle.c +++ b/gcc-4.7/gcc/cp/mangle.c @@ -878,7 +878,7 @@ write_unscoped_name (const tree decl) /* If not, it should be either in the global namespace, or directly in a local function scope. */ gcc_assert (context == global_namespace - || context != NULL + || context == NULL || TREE_CODE (context) == FUNCTION_DECL); write_unqualified_name (decl); |