diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-09 11:18:32 -0700 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-09 11:18:34 -0700 |
commit | a8a0308b6672760cec63374abea2064dbb247dfd (patch) | |
tree | bcd27ec7d832e96214e761fd31f01021ecac67ef | |
parent | f2297c28b74c24293818fe6aaf8f6ac7badd4ae7 (diff) | |
parent | a22b5261da70bebfad7c6f4e948501e293db172d (diff) | |
download | toolchain_gcc-a8a0308b6672760cec63374abea2064dbb247dfd.tar.gz toolchain_gcc-a8a0308b6672760cec63374abea2064dbb247dfd.tar.bz2 toolchain_gcc-a8a0308b6672760cec63374abea2064dbb247dfd.zip |
Merge "[4.7] Fix crash on null context in GCC 4.6 cp/mangle.c::write_unscoped_name"
-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); |