diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-02 18:38:35 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-02 18:45:20 +0800 |
| commit | 5e96f54d8c7a2cf95f1902a4d5a79e7962232c3a (patch) | |
| tree | 1958962234b2785a69ceb97354ef6f27eb356825 /gcc-4.8 | |
| parent | 8d5620f27dec9aa104a0f8b09038adacf4540a72 (diff) | |
| download | toolchain_gcc-5e96f54d8c7a2cf95f1902a4d5a79e7962232c3a.tar.gz toolchain_gcc-5e96f54d8c7a2cf95f1902a4d5a79e7962232c3a.tar.bz2 toolchain_gcc-5e96f54d8c7a2cf95f1902a4d5a79e7962232c3a.zip | |
[4.8] Fix crash on null context in cp/mangle.c::write_unscoped_name
See related CL:
a22b5261da70bebfad7c6f4e948501e293db172d for GCC 4.7
737fc2a978ff2364d91e634a6b990979df60058f for GCC 4.6
Change-Id: Ic5c924fa61bd839270d0218bf5f6f25d1ace8422
Diffstat (limited to 'gcc-4.8')
| -rw-r--r-- | gcc-4.8/gcc/cp/mangle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc-4.8/gcc/cp/mangle.c b/gcc-4.8/gcc/cp/mangle.c index a48d47685..7210571d2 100644 --- a/gcc-4.8/gcc/cp/mangle.c +++ b/gcc-4.8/gcc/cp/mangle.c @@ -881,7 +881,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); |