https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87039
--- Comment #7 from Jakub Jelinek <jakub at gcc dot gnu.org> --- Author: jakub Date: Tue Jan 8 09:51:19 2019 New Revision: 267679 URL: https://gcc.gnu.org/viewcvs?rev=267679&root=gcc&view=rev Log: Backported from mainline 2018-11-19 Jakub Jelinek <ja...@redhat.com> PR debug/87039 * omp-expand.c: Don't include debug.h. (adjust_context_and_scope): Add REGION argument. Find DECL_CONTEXT from innermost outer parallel, task, or target that has a child_fn set, or, if there is no such outer region, use current_function_decl. Do the DECL_CONTEXT adjustment regardless of whether a suitable BLOCK is found or not. (expand_parallel_call): Don't call adjust_context_and_scope here. (grid_expand_target_grid_body): Revert 2017-01-25 changes. (expand_omp_taskreg, expand_omp_target): Likewise. Call adjust_context_and_scope. * dwarf2out.c (dwarf2out_early_global_decl): For decl_function_context recurse instead of calling dwarf2out_decl. * g++.dg/gomp/pr78363-4.C: New test. * g++.dg/gomp/pr78363-5.C: New test. * g++.dg/gomp/pr78363-6.C: New test. * g++.dg/gomp/pr78363-7.C: New test. Added: branches/gcc-8-branch/gcc/testsuite/g++.dg/gomp/pr78363-4.C branches/gcc-8-branch/gcc/testsuite/g++.dg/gomp/pr78363-5.C branches/gcc-8-branch/gcc/testsuite/g++.dg/gomp/pr78363-6.C branches/gcc-8-branch/gcc/testsuite/g++.dg/gomp/pr78363-7.C Modified: branches/gcc-8-branch/gcc/ChangeLog branches/gcc-8-branch/gcc/dwarf2out.c branches/gcc-8-branch/gcc/omp-expand.c branches/gcc-8-branch/gcc/testsuite/ChangeLog
