diff options
| author | Rong Xu <xur@google.com> | 2014-07-21 16:47:22 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-07-29 15:31:03 -0700 |
| commit | 38a8aecfb882072900434499696b5c32a2274515 (patch) | |
| tree | 2aac97f0ae24b03cd98c1a06e989c031c173f889 /gcc-4.9/gcc/cp/class.c | |
| parent | c231900e5dcc14d8296bd9f62b45997a49d4d5e7 (diff) | |
| download | toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.gz toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.bz2 toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.zip | |
[4.9] Switch gcc-4.9 to use google/gcc-4_9 branch.
This source drop uses svn version r212828 of google/gcc-4.9 branch.
We also cherry-picked r213062, r213063 and r213064 to fix windows
build issues.
All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9.
The following prior commits has not been merged to google branch yet.
(They are included in this commit).
e7af147f979e657fe2df00808e5b4319b0e088c6,
baf87df3cb2683649ba7e9872362a7e721117c23, and
c231900e5dcc14d8296bd9f62b45997a49d4d5e7.
Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b
Diffstat (limited to 'gcc-4.9/gcc/cp/class.c')
| -rw-r--r-- | gcc-4.9/gcc/cp/class.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gcc-4.9/gcc/cp/class.c b/gcc-4.9/gcc/cp/class.c index 334bfd5ee..265afc486 100644 --- a/gcc-4.9/gcc/cp/class.c +++ b/gcc-4.9/gcc/cp/class.c @@ -1300,7 +1300,7 @@ handle_using_decl (tree using_decl, tree t) old_value = NULL_TREE; } - cp_emit_debug_info_for_using (decl, USING_DECL_SCOPE (using_decl)); + cp_emit_debug_info_for_using (decl, t); if (is_overloaded_fn (decl)) flist = decl; @@ -8223,12 +8223,11 @@ static void dump_class_hierarchy (tree t) { int flags; - FILE *stream = dump_begin (TDI_class, &flags); + FILE *stream = get_dump_info (TDI_class, &flags); if (stream) { dump_class_hierarchy_1 (stream, flags, t); - dump_end (TDI_class, stream); } } @@ -8258,7 +8257,7 @@ static void dump_vtable (tree t, tree binfo, tree vtable) { int flags; - FILE *stream = dump_begin (TDI_class, &flags); + FILE *stream = get_dump_info (TDI_class, &flags); if (!stream) return; @@ -8281,15 +8280,13 @@ dump_vtable (tree t, tree binfo, tree vtable) dump_array (stream, vtable); fprintf (stream, "\n"); } - - dump_end (TDI_class, stream); } static void dump_vtt (tree t, tree vtt) { int flags; - FILE *stream = dump_begin (TDI_class, &flags); + FILE *stream = get_dump_info (TDI_class, &flags); if (!stream) return; @@ -8301,8 +8298,6 @@ dump_vtt (tree t, tree vtt) dump_array (stream, vtt); fprintf (stream, "\n"); } - - dump_end (TDI_class, stream); } /* Dump a function or thunk and its thunkees. */ |