projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dfsan] Move combineShadows to DFSanFunction in preparation for it to use a domtree.
[oota-llvm.git]
/
lib
/
Transforms
/
Instrumentation
/
MemorySanitizer.cpp
diff --git
a/lib/Transforms/Instrumentation/MemorySanitizer.cpp
b/lib/Transforms/Instrumentation/MemorySanitizer.cpp
index 9b595d83f17622cf0e2b106dd1acb5f77edd34d6..496ab4877e0304a42aad3b1c591b44a7cddf8fd0 100644
(file)
--- a/
lib/Transforms/Instrumentation/MemorySanitizer.cpp
+++ b/
lib/Transforms/Instrumentation/MemorySanitizer.cpp
@@
-716,8
+716,6
@@
struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
// Finalize PHI nodes.
for (PHINode *PN : ShadowPHINodes) {
// Finalize PHI nodes.
for (PHINode *PN : ShadowPHINodes) {
- Value *S = getShadow(PN);
- if (isa<Constant>(S)) continue;
PHINode *PNS = cast<PHINode>(getShadow(PN));
PHINode *PNO = MS.TrackOrigins ? cast<PHINode>(getOrigin(PN)) : nullptr;
size_t NumValues = PN->getNumIncomingValues();
PHINode *PNS = cast<PHINode>(getShadow(PN));
PHINode *PNO = MS.TrackOrigins ? cast<PHINode>(getOrigin(PN)) : nullptr;
size_t NumValues = PN->getNumIncomingValues();
@@
-2396,6
+2394,11
@@
struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
void visitPHINode(PHINode &I) {
IRBuilder<> IRB(&I);
void visitPHINode(PHINode &I) {
IRBuilder<> IRB(&I);
+ if (!PropagateShadow) {
+ setShadow(&I, getCleanShadow(&I));
+ return;
+ }
+
ShadowPHINodes.push_back(&I);
setShadow(&I, IRB.CreatePHI(getShadowTy(&I), I.getNumIncomingValues(),
"_msphi_s"));
ShadowPHINodes.push_back(&I);
setShadow(&I, IRB.CreatePHI(getShadowTy(&I), I.getNumIncomingValues(),
"_msphi_s"));