Author: dsanders Date: Sat May 28 10:58:03 2016 New Revision: 271121 URL: http://llvm.org/viewvc/llvm-project?rev=271121&view=rev Log: Merging r268673: ------------------------------------------------------------------------ r268673 | koriakin | 2016-05-05 21:13:17 +0100 (Thu, 05 May 2016) | 5 lines
[MSan] [MIPS64] Fix vararg helper for >1 fixed argument. This fixes http://llvm.org/PR27646 on Mips64. Differential Revision: http://reviews.llvm.org/D19989 ------------------------------------------------------------------------ Modified: llvm/branches/release_38/lib/Transforms/Instrumentation/MemorySanitizer.cpp llvm/branches/release_38/test/Instrumentation/MemorySanitizer/Mips/vararg-mips64.ll llvm/branches/release_38/test/Instrumentation/MemorySanitizer/Mips/vararg-mips64el.ll 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=271121&r1=271120&r2=271121&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:58:03 2016 @@ -2952,7 +2952,8 @@ struct VarArgMIPS64Helper : public VarAr void visitCallSite(CallSite &CS, IRBuilder<> &IRB) override { unsigned VAArgOffset = 0; const DataLayout &DL = F.getParent()->getDataLayout(); - for (CallSite::arg_iterator ArgIt = CS.arg_begin() + 1, End = CS.arg_end(); + for (CallSite::arg_iterator ArgIt = CS.arg_begin() + + CS.getFunctionType()->getNumParams(), End = CS.arg_end(); ArgIt != End; ++ArgIt) { llvm::Triple TargetTriple(F.getParent()->getTargetTriple()); Value *A = *ArgIt; Modified: llvm/branches/release_38/test/Instrumentation/MemorySanitizer/Mips/vararg-mips64.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/test/Instrumentation/MemorySanitizer/Mips/vararg-mips64.ll?rev=271121&r1=271120&r2=271121&view=diff ============================================================================== --- llvm/branches/release_38/test/Instrumentation/MemorySanitizer/Mips/vararg-mips64.ll (original) +++ llvm/branches/release_38/test/Instrumentation/MemorySanitizer/Mips/vararg-mips64.ll Sat May 28 10:58:03 2016 @@ -41,3 +41,15 @@ define i32 @bar() { ; CHECK: store i64 0, i64* inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_va_arg_tls to i64), i64 8) to i64*), align 8 ; CHECK: store i64 0, i64* inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_va_arg_tls to i64), i64 16) to i64*), align 8 ; CHECK: store {{.*}} 24, {{.*}} @__msan_va_arg_overflow_size_tls + +; Check multiple fixed arguments. +declare i32 @foo2(i32 %g1, i32 %g2, ...) +define i32 @bar2() { + %1 = call i32 (i32, i32, ...) @foo2(i32 0, i32 1, i64 2, double 3.000000e+00) + ret i32 %1 +} + +; CHECK-LABEL: @bar2 +; CHECK: store i64 0, i64* getelementptr inbounds ([100 x i64], [100 x i64]* @__msan_va_arg_tls, i32 0, i32 0), align 8 +; CHECK: store i64 0, i64* inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_va_arg_tls to i64), i64 8) to i64*), align 8 +; CHECK: store {{.*}} 16, {{.*}} @__msan_va_arg_overflow_size_tls Modified: llvm/branches/release_38/test/Instrumentation/MemorySanitizer/Mips/vararg-mips64el.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/test/Instrumentation/MemorySanitizer/Mips/vararg-mips64el.ll?rev=271121&r1=271120&r2=271121&view=diff ============================================================================== --- llvm/branches/release_38/test/Instrumentation/MemorySanitizer/Mips/vararg-mips64el.ll (original) +++ llvm/branches/release_38/test/Instrumentation/MemorySanitizer/Mips/vararg-mips64el.ll Sat May 28 10:58:03 2016 @@ -40,3 +40,15 @@ define i32 @bar() { ; CHECK: store i64 0, i64* inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_va_arg_tls to i64), i64 8) to i64*), align 8 ; CHECK: store i64 0, i64* inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_va_arg_tls to i64), i64 16) to i64*), align 8 ; CHECK: store {{.*}} 24, {{.*}} @__msan_va_arg_overflow_size_tls + +; Check multiple fixed arguments. +declare i32 @foo2(i32 %g1, i32 %g2, ...) +define i32 @bar2() { + %1 = call i32 (i32, i32, ...) @foo2(i32 0, i32 1, i64 2, double 3.000000e+00) + ret i32 %1 +} + +; CHECK-LABEL: @bar2 +; CHECK: store i64 0, i64* getelementptr inbounds ([100 x i64], [100 x i64]* @__msan_va_arg_tls, i32 0, i32 0), align 8 +; CHECK: store i64 0, i64* inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_va_arg_tls to i64), i64 8) to i64*), align 8 +; CHECK: store {{.*}} 16, {{.*}} @__msan_va_arg_overflow_size_tls _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
