[OMPIRBuilder] Avoid invalid debug location. #153190
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes llvm#153043. This is another case of debug location not getting updated when the insert point is changed by the restoreIP. Fixed by using the wrapper function that updates the debug location.
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-flang-openmp Author: Abid Qadeer (abidh) ChangesFixes #153043. This is another case of debug location not getting updated when the insert point is changed by the Full diff: https://github.com/llvm/llvm-project/pull/153190.diff 2 Files Affected:
diff --git a/clang/test/OpenMP/amdgcn_debug_nowait.c b/clang/test/OpenMP/amdgcn_debug_nowait.c
new file mode 100644
index 0000000000000..d691327512ff7
--- /dev/null
+++ b/clang/test/OpenMP/amdgcn_debug_nowait.c
@@ -0,0 +1,16 @@
+// REQUIRES: amdgpu-registered-target
+
+// RUN: %clang_cc1 -debug-info-kind=line-tables-only -fopenmp -triple x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-host.bc
+
+int test() {
+ int c;
+
+#pragma omp target data map(tofrom: c)
+{
+ #pragma omp target nowait
+ {
+ c = 2;
+ }
+}
+ return c;
+}
diff --git a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
index 2ac9a0d3fbd66..c16b0dde1a3da 100644
--- a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
+++ b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
@@ -7247,7 +7247,7 @@ OpenMPIRBuilder::InsertPointOrErrorTy OpenMPIRBuilder::createTargetData(
BodyGenCB(Builder.saveIP(), BodyGenTy::NoPriv);
if (!AfterIP)
return AfterIP.takeError();
- Builder.restoreIP(*AfterIP);
+ restoreIPandDebugLoc(Builder, *AfterIP);
if (IfCond)
return emitIfClause(IfCond, EndThenGen, EndElseGen, AllocaIP);
|
Member
|
@llvm/pr-subscribers-clang Author: Abid Qadeer (abidh) ChangesFixes #153043. This is another case of debug location not getting updated when the insert point is changed by the Full diff: https://github.com/llvm/llvm-project/pull/153190.diff 2 Files Affected:
diff --git a/clang/test/OpenMP/amdgcn_debug_nowait.c b/clang/test/OpenMP/amdgcn_debug_nowait.c
new file mode 100644
index 0000000000000..d691327512ff7
--- /dev/null
+++ b/clang/test/OpenMP/amdgcn_debug_nowait.c
@@ -0,0 +1,16 @@
+// REQUIRES: amdgpu-registered-target
+
+// RUN: %clang_cc1 -debug-info-kind=line-tables-only -fopenmp -triple x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-host.bc
+
+int test() {
+ int c;
+
+#pragma omp target data map(tofrom: c)
+{
+ #pragma omp target nowait
+ {
+ c = 2;
+ }
+}
+ return c;
+}
diff --git a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
index 2ac9a0d3fbd66..c16b0dde1a3da 100644
--- a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
+++ b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
@@ -7247,7 +7247,7 @@ OpenMPIRBuilder::InsertPointOrErrorTy OpenMPIRBuilder::createTargetData(
BodyGenCB(Builder.saveIP(), BodyGenTy::NoPriv);
if (!AfterIP)
return AfterIP.takeError();
- Builder.restoreIP(*AfterIP);
+ restoreIPandDebugLoc(Builder, *AfterIP);
if (IfCond)
return emitIfClause(IfCond, EndThenGen, EndElseGen, AllocaIP);
|
TIFitis
approved these changes
Aug 12, 2025
Member
TIFitis
left a comment
TIFitis
left a comment
There was a problem hiding this comment.
LGTM.
Nit: Is there any existing test file we can add this to instead of creating a new one? Otherwise I'm okay.
Member
|
Should we replace all |
Contributor
Author
Currently I have been doing it in selective cases. But I think we should do the change en-masse to better future proof us. I will work on it after this PR. Please note that there are 2 different code patterns we need to handle (More details in the description of the #151306). All the occurrences of the 2nd pattern need this change. |
Contributor
Author
Thanks for the prompt review. I looked at the existing testcases and did not see any that fits this exact pattern. |
skatrak
approved these changes
Aug 12, 2025
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/22483 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #153043.
This is another case of debug location not getting updated when the insert point is changed by the
restoreIP. Fixed by using the wrapper function that updates the debug location.