Merging r295474:
authorHans Wennborg <hans@hanshq.net>
Fri, 24 Feb 2017 18:44:42 +0000 (18:44 +0000)
committerHans Wennborg <hans@hanshq.net>
Fri, 24 Feb 2017 18:44:42 +0000 (18:44 +0000)
commitf300ac389346fb08353339732fdb579f900995df
tree6ec557d58289386132b17565af2f5cd1a28eadcb
parentb5cac107dc7fc13b635f1348e3f07a926d790443
Merging r295474:
------------------------------------------------------------------------
r295474 | hahnfeld | 2017-02-17 10:32:58 -0800 (Fri, 17 Feb 2017) | 6 lines

[OpenMP] Fix cancellation point in task with no cancel

With tasks, the cancel may happen in another task. This has a different
region info which means that we can't find it here.

Differential Revision: https://reviews.llvm.org/D30091
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@296151 91177308-0d34-0410-b5e6-96231b3b80d8
lib/CodeGen/CGOpenMPRuntime.cpp
test/OpenMP/cancellation_point_codegen.cpp