diff options
Diffstat (limited to 'llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp')
-rw-r--r-- | llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp index c51acdf52f14..05960db899bc 100644 --- a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp @@ -4083,8 +4083,9 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> { // Nothing to do here. } - void instrumentAsmArgument(Value *Operand, Instruction &I, IRBuilder<> &IRB, - const DataLayout &DL, bool isOutput) { + void instrumentAsmArgument(Value *Operand, Type *ElemTy, Instruction &I, + IRBuilder<> &IRB, const DataLayout &DL, + bool isOutput) { // For each assembly argument, we check its value for being initialized. // If the argument is a pointer, we assume it points to a single element // of the corresponding type (or to a 8-byte word, if the type is unsized). @@ -4096,10 +4097,9 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> { assert(!isOutput); return; } - Type *ElType = OpType->getPointerElementType(); - if (!ElType->isSized()) + if (!ElemTy->isSized()) return; - int Size = DL.getTypeStoreSize(ElType); + int Size = DL.getTypeStoreSize(ElemTy); Value *Ptr = IRB.CreatePointerCast(Operand, IRB.getInt8PtrTy()); Value *SizeVal = ConstantInt::get(MS.IntptrTy, Size); IRB.CreateCall(MS.MsanInstrumentAsmStoreFn, {Ptr, SizeVal}); @@ -4159,14 +4159,16 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> { // that we won't overwrite uninit values before checking them. for (int i = OutputArgs; i < NumOperands; i++) { Value *Operand = CB->getOperand(i); - instrumentAsmArgument(Operand, I, IRB, DL, /*isOutput*/ false); + instrumentAsmArgument(Operand, CB->getParamElementType(i), I, IRB, DL, + /*isOutput*/ false); } // Unpoison output arguments. This must happen before the actual InlineAsm // call, so that the shadow for memory published in the asm() statement // remains valid. for (int i = 0; i < OutputArgs; i++) { Value *Operand = CB->getOperand(i); - instrumentAsmArgument(Operand, I, IRB, DL, /*isOutput*/ true); + instrumentAsmArgument(Operand, CB->getParamElementType(i), I, IRB, DL, + /*isOutput*/ true); } setShadow(&I, getCleanShadow(&I)); |