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..389760bd5ce162a141305b5aeed5ffe9ad4b95ea 100644
--- a/src/IceASanInstrumentation.cpp
+++ b/src/IceASanInstrumentation.cpp
@@ -389,6 +389,24 @@ void ASanInstrumentation::instrumentLoad(LoweringContext &Context,
 
 void ASanInstrumentation::instrumentStore(LoweringContext &Context,
                                           InstStore *Instr) {
+  Operand *Data = Instr->getData();
+  if (auto *Reloc = llvm::dyn_cast<ConstantRelocatable>(Data)) {
+    std::string DataName = Reloc->getName().toStringOrEmpty();
+    assert(!DataName.empty());

[Jim Stichnoth, 2016/08/18 13:17:19]

I just realized that if you use this pattern:
  S = N.toStringOrEmpty();
  assert(!S.empty());
You can probably simplify it to:
  S = N.toString();

The main difference is that the former does an assertion failure while the
latter does a report_fatal_error.  There's another minor difference between
these two, in that this will give an assertion failure:
  N = StringID::createWithString(Ctx, "");
  S = N.toStringOrEmpty();
  assert(!S.empty());
while this will succeed:
  N = StringID::createWithString(Ctx, "");
  S = N.toString();
but I doubt this is really an issue for your case.

[tlively, 2016/08/18 15:17:48]

Done.

+    StringMap::const_iterator DataSub = FuncSubstitutions.find(DataName);
+    if (DataSub != FuncSubstitutions.end()) {
+      auto *NewData = ConstantRelocatable::create(
+          Ctx, Reloc->getType(),
+          RelocatableTuple(Reloc->getOffset(), RelocOffsetArray(0),
+                           Ctx->getGlobalString(DataSub->second),
+                           Reloc->getEmitString()));
+      auto *NewStore = InstStore::create(Context.getNode()->getCfg(), NewData,
+                                         Instr->getAddr());
+      Instr->setDeleted();
+      Context.insert(NewStore);
+      Instr = NewStore;
+    }
+  }

[Karl, 2016/08/18 14:17:01]

Minor nit. It appears that instrument load/store look nearly identical. Should
they use a common method?

[tlively, 2016/08/18 15:17:48]

Done.

   Constant *Func =
       Ctx->getConstantExternSym(Ctx->getGlobalString("__asan_check_store"));
   instrumentAccess(Context, Instr->getAddr(),