Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: src/IceASanInstrumentation.cpp

Issue 2241383006: Subzero: Replace pointers to allocation functions in loads (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Fixed comment Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests_lit/asan_tests/localreplacement.ll » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/IceASanInstrumentation.cpp
diff --git a/src/IceASanInstrumentation.cpp b/src/IceASanInstrumentation.cpp
index e7c531bdec2030f062926a6246affa827c8a5d0b..3978706a1ab5a13c123de5d1677838b09c81aa9b 100644
--- a/src/IceASanInstrumentation.cpp
+++ b/src/IceASanInstrumentation.cpp
@@ -363,6 +363,24 @@ void ASanInstrumentation::instrumentCall(LoweringContext &Context,
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;
+ }
+ }
Constant *Func =
Ctx->getConstantExternSym(Ctx->getGlobalString("__asan_check_load"));
instrumentAccess(Context, Instr->getSourceAddress(),
« no previous file with comments | « no previous file | tests_lit/asan_tests/localreplacement.ll » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698