fix #1029: byval fn args missing attributes

AliveToolkit · Apr 25, 2024 · 61fe61b · 61fe61b
1 parent 94d8e31
commit 61fe61b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/ir/pointer.cpp b/ir/pointer.cpp
@@ -636,6 +636,17 @@ expr Pointer::isBasedOnArg() const {
                         (unsigned)has_nowrite);
 }
 
+Pointer Pointer::setAttrs(const ParamAttrs &attr) const {
+  return { m, getBid(), getOffset(), getAttrs() | attr_to_bitvec(attr) };
+}
+
+Pointer Pointer::setIsBasedOnArg() const {
+  unsigned idx = (unsigned)has_nocapture + (unsigned)has_noread +
+                 (unsigned)has_nowrite;
+  auto attrs = getAttrs();
+  return { m, getBid(), getOffset(), attrs | expr::mkUInt(1 << idx, attrs) };
+}
+
 Pointer Pointer::mkNullPointer(const Memory &m) {
   assert(has_null_block);
   // A null pointer points to block 0 without any attribute.

diff --git a/ir/pointer.h b/ir/pointer.h
@@ -127,6 +127,9 @@ class Pointer {
   smt::expr isNoWrite() const;
   smt::expr isBasedOnArg() const;
 
+  Pointer setAttrs(const ParamAttrs &attr) const;
+  Pointer setIsBasedOnArg() const;
+
   smt::expr refined(const Pointer &other) const;
   smt::expr fninputRefined(const Pointer &other, std::set<smt::expr> &undef,
                            const smt::expr &byval_bytes) const;

diff --git a/ir/value.cpp b/ir/value.cpp
@@ -222,7 +222,11 @@ StateValue Input::mkInput(State &s, const Type &ty, unsigned child) const {
   if (hasAttribute(ParamAttrs::ByVal)) {
     unsigned bid;
     expr size = expr::mkUInt(attrs.blockSize, bits_size_t);
-    val = get_global(s, smt_name, &size, attrs.align, false, bid);
+    val = Pointer(s.getMemory(),
+                  get_global(s, smt_name, &size, attrs.align, false, bid))
+          .setAttrs(attrs)
+          .setIsBasedOnArg()
+          .release();
     bool is_const = hasAttribute(ParamAttrs::NoWrite) ||
                     !s.getFn().getFnAttrs().mem.canWrite(MemoryAccess::Args);
     s.getMemory().markByVal(bid, is_const);

diff --git a/tests/alive-tv/attrs/argmemonly-byval.srctgt.ll b/tests/alive-tv/attrs/argmemonly-byval.srctgt.ll
@@ -0,0 +1,9 @@
+define void @src(ptr byval(i32) %0) {
+  %3 = load i32, ptr %0
+  ret void
+}
+
+define void @tgt(ptr byval(i32) nocapture %0) memory(argmem:readwrite) {
+  %3 = load i32, ptr %0
+  ret void
+}