From da7d88bfc2d587bd1c5f670faf7832238a42ddba Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 12 Feb 2010 17:27:14 -0500 Subject: [PATCH] re PR c++/43024 (ICE on template code with -O2 or -O3, regression from 4.4.2) PR c++/43024 * name-lookup.h (current_binding_level): Check for null cp_function_chain. From-SVN: r156741 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/name-lookup.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 036b25fdb41..7e37b69545b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-02-12 Jason Merrill + + PR c++/43024 + * name-lookup.h (current_binding_level): Check for null + cp_function_chain. + 2010-02-12 Jason Merrill PR c++/43054 diff --git a/gcc/cp/name-lookup.h b/gcc/cp/name-lookup.h index 7a3625a2926..08514810ab0 100644 --- a/gcc/cp/name-lookup.h +++ b/gcc/cp/name-lookup.h @@ -259,7 +259,7 @@ struct GTY(()) cp_binding_level { /* The binding level currently in effect. */ #define current_binding_level \ - (*(cfun && cp_function_chain->bindings \ + (*(cfun && cp_function_chain && cp_function_chain->bindings \ ? &cp_function_chain->bindings \ : &scope_chain->bindings)) -- 2.30.2