[llvm] [MSAN] Handle PtrToAddrInst in MemorySanitizer (PR #219307)

[via llvm-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Michael Jones (michaelrj-google)

<details>
<summary>Changes</summary>

PR #<!-- -->210729 changed how pointer diffs are handled, specifically when
pointer overflow isn't defined it sometimes emits CreatePtrToAddr, which
MSAN currently doesn't handle. This PR adds a visitor for PtrToAddrInst
which fixes the issue as well as a regression test.

https://github.com/llvm/llvm-project/pull/210729#issuecomment-5445402022
has my minimal reproducer.

Assisted-By: Automated tooling, human reviewed


---
Full diff: https://github.com/llvm/llvm-project/pull/219307.diff


2 Files Affected:

- (modified) llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp (+7) 
- (added) llvm/test/Instrumentation/MemorySanitizer/ptrtoaddr.ll (+14) 


``````````diff
diff --git a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
index 00c4cd89a73b2..49b9b75a2f9b7 100644
--- a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
@@ -2609,6 +2609,13 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
     setOrigin(&I, getOrigin(&I, 0));
   }
 
+  void visitPtrToAddrInst(PtrToAddrInst &I) {
+    IRBuilder<> IRB(&I);
+    setShadow(&I, IRB.CreateIntCast(getShadow(&I, 0), getShadowTy(&I), false,
+                                    "_msprop_ptrtoaddr"));
+    setOrigin(&I, getOrigin(&I, 0));
+  }
+
   void visitIntToPtrInst(IntToPtrInst &I) {
     IRBuilder<> IRB(&I);
     setShadow(&I, IRB.CreateIntCast(getShadow(&I, 0), getShadowTy(&I), false,
diff --git a/llvm/test/Instrumentation/MemorySanitizer/ptrtoaddr.ll b/llvm/test/Instrumentation/MemorySanitizer/ptrtoaddr.ll
new file mode 100644
index 0000000000000..6cc6ba735eb3e
--- /dev/null
+++ b/llvm/test/Instrumentation/MemorySanitizer/ptrtoaddr.ll
@@ -0,0 +1,14 @@
+; RUN: opt < %s -msan-check-access-address=0 -S -passes=msan 2>&1 | FileCheck %s
+
+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+; CHECK-LABEL: @ptrtoaddr_propagate(
+; CHECK:       %[[SHADOW:.*]] = load i64, ptr @__msan_param_tls
+; CHECK-NOT:   __msan_warning
+; CHECK:       store i64 %[[SHADOW]], ptr @__msan_retval_tls
+; CHECK:       ret i64
+define i64 @ptrtoaddr_propagate(ptr %p) sanitize_memory {
+  %addr = ptrtoaddr ptr %p to i64
+  ret i64 %addr
+}

``````````

</details>


https://github.com/llvm/llvm-project/pull/219307