Author: dsanders Date: Sat May 28 10:56:22 2016 New Revision: 271119 URL: http://llvm.org/viewvc/llvm-project?rev=271119&view=rev Log: Merging r266833: ------------------------------------------------------------------------ r266833 | koriakin | 2016-04-20 00:46:59 +0100 (Wed, 20 Apr 2016) | 5 lines
[Mips] [MSan] VarArgMIPS64Helper: Use target's endian, not host's. Ugh. Differential Revision: http://reviews.llvm.org/D19292 ------------------------------------------------------------------------ Modified: llvm/branches/release_38/lib/Transforms/Instrumentation/MemorySanitizer.cpp Modified: llvm/branches/release_38/lib/Transforms/Instrumentation/MemorySanitizer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Transforms/Instrumentation/MemorySanitizer.cpp?rev=271119&r1=271118&r2=271119&view=diff ============================================================================== --- llvm/branches/release_38/lib/Transforms/Instrumentation/MemorySanitizer.cpp (original) +++ llvm/branches/release_38/lib/Transforms/Instrumentation/MemorySanitizer.cpp Sat May 28 10:56:22 2016 @@ -2954,15 +2954,16 @@ struct VarArgMIPS64Helper : public VarAr const DataLayout &DL = F.getParent()->getDataLayout(); for (CallSite::arg_iterator ArgIt = CS.arg_begin() + 1, End = CS.arg_end(); ArgIt != End; ++ArgIt) { + llvm::Triple TargetTriple(F.getParent()->getTargetTriple()); Value *A = *ArgIt; Value *Base; uint64_t ArgSize = DL.getTypeAllocSize(A->getType()); -#if defined(__MIPSEB__) || defined(MIPSEB) - // Adjusting the shadow for argument with size < 8 to match the placement - // of bits in big endian system - if (ArgSize < 8) - VAArgOffset += (8 - ArgSize); -#endif + if (TargetTriple.getArch() == llvm::Triple::mips64) { + // Adjusting the shadow for argument with size < 8 to match the placement + // of bits in big endian system + if (ArgSize < 8) + VAArgOffset += (8 - ArgSize); + } Base = getShadowPtrForVAArgument(A->getType(), IRB, VAArgOffset); VAArgOffset += ArgSize; VAArgOffset = RoundUpToAlignment(VAArgOffset, 8); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
