[PATCH] D117274: [NFC][msan] Reorder branches in complex if

[Vitaly Buka via Phabricator via llvm-commits]

vitalybuka created this revision.
Herald added a subscriber: hiraditya.
vitalybuka requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D117274

Files:
  llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp


Index: llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
===================================================================
--- llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
+++ llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
@@ -1706,21 +1706,13 @@
           continue;
         }
 
-        bool FArgByVal = FArg.hasByValAttr();
-        unsigned Size = FArgByVal
+        unsigned Size = FArg.hasByValAttr()
                             ? DL.getTypeAllocSize(FArg.getParamByValType())
                             : DL.getTypeAllocSize(FArg.getType());
 
         if (A == &FArg) {
           bool Overflow = ArgOffset + Size > kParamTLSSize;
-          bool FArgEagerCheck = MS.EagerChecks && !FArgByVal &&
-                                FArg.hasAttribute(Attribute::NoUndef);
-
-          if (FArgEagerCheck) {
-            *ShadowPtr = getCleanShadow(V);
-            setOrigin(A, getCleanOrigin());
-            break;
-          } else if (FArgByVal) {
+          if (FArg.hasByValAttr()) {
             // ByVal pointer itself has clean shadow. We copy the actual
             // argument shadow to the underlying memory.
             // Figure out maximal valid memcpy alignment.
@@ -1745,6 +1737,10 @@
               (void)Cpy;
             }
             *ShadowPtr = getCleanShadow(V);
+          } else if (MS.EagerChecks && FArg.hasAttribute(Attribute::NoUndef)) {
+            *ShadowPtr = getCleanShadow(V);
+            setOrigin(A, getCleanOrigin());
+            break;
           } else {
             if (Overflow) {
               // ParamTLS overflow.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D117274.399888.patch
Type: text/x-patch
Size: 1603 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220114/e6e9352e/attachment.bin>