[PATCH] D119802: [HWASan] remove replacement of DbgVariableIntrinsics.

Florian Mayer via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Mon Feb 14 18:26:55 PST 2022


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

This code was dead because we AI->replaceUsesWithIf above. I verified
this doesn't actually get run by applying
https://gist.github.com/fmayer/aea7cbb4700cfe2c9d932591ae1073c3 to the
Android toolchain and building AOSP, without any crash.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D119802

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


Index: llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
===================================================================
--- llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
+++ llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
@@ -1378,19 +1378,8 @@
           II->eraseFromParent();
       }
     }
-    if (memtag::alignAndPadAlloca(Info, Align(Mapping.getObjectAlignment()))) {
-      for (auto DVI : Info.DbgVariableIntrinsics) {
-        SmallDenseSet<Value *> LocationOps(DVI->location_ops().begin(),
-                                           DVI->location_ops().end());
-        for (Value *V : LocationOps) {
-          if (auto *AI = dyn_cast_or_null<AllocaInst>(V)) {
-            if (V == AI)
-              DVI->replaceVariableLocationOp(V, Info.AI);
-          }
-        }
-      }
+    if (memtag::alignAndPadAlloca(Info, Align(Mapping.getObjectAlignment())))
       AI->eraseFromParent();
-    }
   }
   for (auto &I : SInfo.UnrecognizedLifetimes)
     I->eraseFromParent();


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D119802.408682.patch
Type: text/x-patch
Size: 1026 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220215/d3c8d91f/attachment.bin>


More information about the llvm-commits mailing list