diff options
author | Caroline Tice <cmtice@google.com> | 2016-02-10 14:40:41 -0800 |
---|---|---|
committer | Caroline Tice <cmtice@google.com> | 2016-02-26 08:25:55 -0800 |
commit | 817a788f9eb01eff367191401d48f2aaa8d4f428 (patch) | |
tree | 637f745404b37fbf3fcff629227d7d542725e5fe /gcc-4.9/gcc/cp/decl2.c | |
parent | a4ca82cac69c3147143d7b4b4d7cdeb5e02f20ef (diff) | |
download | toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.gz toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.bz2 toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.zip |
Unify ChromeOS and Android versions of GCC.
This CL updates Android's GCC to match ChromeOS's GCC (with
appropriate patches applied in both places to make sure no
cherry-picked changes are lost).
Change-Id: I390140c449b0e5df9ee78a06268319c8c510302f
Diffstat (limited to 'gcc-4.9/gcc/cp/decl2.c')
-rw-r--r-- | gcc-4.9/gcc/cp/decl2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc-4.9/gcc/cp/decl2.c b/gcc-4.9/gcc/cp/decl2.c index 074108eea..ff0d30446 100644 --- a/gcc-4.9/gcc/cp/decl2.c +++ b/gcc-4.9/gcc/cp/decl2.c @@ -4178,10 +4178,10 @@ no_linkage_error (tree decl) "to declare function %q#D with linkage", t, decl); } -/* Clear the list of deferred functions. */ +/* Reset the parsing state for the next module. */ void -cp_clear_deferred_fns (void) +cp_reset_parsing_state (void) { vec_free (deferred_fns); deferred_fns = NULL; @@ -4192,6 +4192,7 @@ cp_clear_deferred_fns (void) clear_pending_templates (); reset_anon_name (); reset_temp_count (); + clear_lambda_scope (); } /* Collect declarations from all namespaces relevant to SOURCE_FILE. */ |