Subzero: Replace pointers to allocation functions in stores

src/IceASanInstrumentation.cpp

Index: src/IceASanInstrumentation.cpp
diff --git a/src/IceASanInstrumentation.cpp b/src/IceASanInstrumentation.cpp
index 3978706a1ab5a13c123de5d1677838b09c81aa9b..0531558e1d4ed17b1490fca75a17ba65a2f9f7a3 100644
--- a/src/IceASanInstrumentation.cpp
+++ b/src/IceASanInstrumentation.cpp
@@ -365,21 +365,11 @@ void ASanInstrumentation::instrumentLoad(LoweringContext &Context,
                                          InstLoad *Instr) {
   Operand *Src = Instr->getSourceAddress();
   if (auto *Reloc = llvm::dyn_cast<ConstantRelocatable>(Src)) {
-    std::string SrcName = Reloc->getName().toStringOrEmpty();
-    assert(!SrcName.empty());
-    StringMap::const_iterator SrcSub = FuncSubstitutions.find(SrcName);
-    if (SrcSub != FuncSubstitutions.end()) {
-      auto *NewSrc = ConstantRelocatable::create(
-          Ctx, Reloc->getType(),
-          RelocatableTuple(Reloc->getOffset(), RelocOffsetArray(0),
-                           Ctx->getGlobalString(SrcSub->second),
-                           Reloc->getEmitString()));
-      auto *NewLoad = InstLoad::create(Context.getNode()->getCfg(),
-                                       Instr->getDest(), NewSrc);
-      Instr->setDeleted();
-      Context.insert(NewLoad);
-      Instr = NewLoad;
-    }
+    auto *NewLoad = InstLoad::create(Context.getNode()->getCfg(),
+                                     Instr->getDest(), instrumentReloc(Reloc));
+    Instr->setDeleted();
+    Context.insert(NewLoad);
+    Instr = NewLoad;
   }
   Constant *Func =
       Ctx->getConstantExternSym(Ctx->getGlobalString("__asan_check_load"));
@@ -389,12 +379,34 @@ void ASanInstrumentation::instrumentLoad(LoweringContext &Context,
 
 void ASanInstrumentation::instrumentStore(LoweringContext &Context,
                                           InstStore *Instr) {
+  Operand *Data = Instr->getData();
+  if (auto *Reloc = llvm::dyn_cast<ConstantRelocatable>(Data)) {
+    auto *NewStore = InstStore::create(
+        Context.getNode()->getCfg(), instrumentReloc(Reloc), Instr->getAddr());
+    Instr->setDeleted();
+    Context.insert(NewStore);
+    Instr = NewStore;
+  }
   Constant *Func =
       Ctx->getConstantExternSym(Ctx->getGlobalString("__asan_check_store"));
   instrumentAccess(Context, Instr->getAddr(),
                    typeWidthInBytes(Instr->getData()->getType()), Func);
 }
 
+ConstantRelocatable *
+ASanInstrumentation::instrumentReloc(ConstantRelocatable *Reloc) {
+  std::string DataName = Reloc->getName().toString();
+  StringMap::const_iterator DataSub = FuncSubstitutions.find(DataName);
+  if (DataSub != FuncSubstitutions.end()) {
+    return ConstantRelocatable::create(
+        Ctx, Reloc->getType(),
+        RelocatableTuple(Reloc->getOffset(), RelocOffsetArray(0),
+                         Ctx->getGlobalString(DataSub->second),
+                         Reloc->getEmitString()));
+  }
+  return Reloc;
+}
+
 void ASanInstrumentation::instrumentAccess(LoweringContext &Context,
                                            Operand *Op, SizeT Size,
                                            Constant *CheckFunc) {