[llvm] 33be70a - [NewGVN] Check intrinsic ID before accessing operands (#141571)

[via llvm-commits]

Author: Mariusz Sikora
Date: 2025-05-30T07:57:01+02:00
New Revision: 33be70af9f2446e8562517ca6120d0dabc2e2f07

URL: https://github.com/llvm/llvm-project/commit/33be70af9f2446e8562517ca6120d0dabc2e2f07
DIFF: https://github.com/llvm/llvm-project/commit/33be70af9f2446e8562517ca6120d0dabc2e2f07.diff

LOG: [NewGVN] Check intrinsic ID before accessing operands (#141571)

This patch is fixing assertions in downstream tests

Added: 
    llvm/test/Transforms/NewGVN/s-barrier-compile-issue.ll

Modified: 
    llvm/lib/Transforms/Scalar/NewGVN.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/Scalar/NewGVN.cpp b/llvm/lib/Transforms/Scalar/NewGVN.cpp
index 85bd8ef1f09a8..584cb0e89ef66 100644
--- a/llvm/lib/Transforms/Scalar/NewGVN.cpp
+++ b/llvm/lib/Transforms/Scalar/NewGVN.cpp
@@ -1530,11 +1530,12 @@ NewGVN::performSymbolicLoadCoercion(Type *LoadType, Value *LoadPtr,
   }
 
   if (auto *II = dyn_cast<IntrinsicInst>(DepInst)) {
-    auto *LifetimePtr = II->getOperand(1);
-    if (II->getIntrinsicID() == Intrinsic::lifetime_start &&
-        (LoadPtr == lookupOperandLeader(LifetimePtr) ||
-         AA->isMustAlias(LoadPtr, LifetimePtr)))
-      return createConstantExpression(UndefValue::get(LoadType));
+    if (II->getIntrinsicID() == Intrinsic::lifetime_start) {
+      auto *LifetimePtr = II->getOperand(1);
+      if (LoadPtr == lookupOperandLeader(LifetimePtr) ||
+          AA->isMustAlias(LoadPtr, LifetimePtr))
+        return createConstantExpression(UndefValue::get(LoadType));
+    }
   }
 
   // All of the below are only true if the loaded pointer is produced

diff  --git a/llvm/test/Transforms/NewGVN/s-barrier-compile-issue.ll b/llvm/test/Transforms/NewGVN/s-barrier-compile-issue.ll
new file mode 100644
index 0000000000000..ec03d1b3b2d34
--- /dev/null
+++ b/llvm/test/Transforms/NewGVN/s-barrier-compile-issue.ll
@@ -0,0 +1,17 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
+; RUN: opt -S -passes=newgvn < %s | FileCheck %s
+
+; Test created to verify compilation without crashing.
+
+ at mem = addrspace(3) global i32 poison, align 4
+
+define i32 @foo() {
+; CHECK-LABEL: define i32 @foo() {
+; CHECK-NEXT:    call void @llvm.amdgcn.s.barrier()
+; CHECK-NEXT:    [[OUT:%.*]] = load i32, ptr addrspace(3) @mem, align 4
+; CHECK-NEXT:    ret i32 [[OUT]]
+;
+  call void @llvm.amdgcn.s.barrier()
+  %out = load i32, ptr addrspace(3) @mem, align 4
+  ret i32 %out
+}