From e8514fc1f78dc917ed81c8a8112c9d110a1b7c9e Mon Sep 17 00:00:00 2001 From: Juergen Ributzka Date: Thu, 31 Jul 2014 00:11:16 +0000 Subject: [PATCH] [FastISel] Fix the patchpoint intrinsic lowering in FastISel for large target addresses. This fixes a mistake where I accidentially dropped the upper 32bit of a 64bit pointer during FastISel lowering of the patchpoint intrinsic. llvm-svn: 214367 --- llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 2 +- llvm/test/CodeGen/X86/patchpoint.ll | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp index ee23e70..5492dcc 100644 --- a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp @@ -769,7 +769,7 @@ bool FastISel::SelectPatchpoint(const CallInst *I) { // Assume that the callee is a constant address or null pointer. // FIXME: handle function symbols in the future. - unsigned CalleeAddr; + uint64_t CalleeAddr; if (const auto *C = dyn_cast(Callee)) CalleeAddr = cast(C->getOperand(0))->getZExtValue(); else if (const auto *C = dyn_cast(Callee)) { diff --git a/llvm/test/CodeGen/X86/patchpoint.ll b/llvm/test/CodeGen/X86/patchpoint.ll index d988195..53d05ef 100644 --- a/llvm/test/CodeGen/X86/patchpoint.ll +++ b/llvm/test/CodeGen/X86/patchpoint.ll @@ -39,7 +39,6 @@ entry: ret void } - ; Test patchpoints reusing the same TargetConstant. ; Assertion failed: (CI.getNumArgOperands() >= NumArgs + 4) ; There is no way to verify this, since it depends on memory allocation. @@ -72,6 +71,17 @@ entry: ret void } +; Test large target address. +define i64 @large_target_address_patchpoint_codegen() { +entry: +; CHECK-LABEL: large_target_address_patchpoint_codegen: +; CHECK: movabsq $6153737369414576827, %r11 +; CHECK-NEXT: callq *%r11 + %resolveCall2 = inttoptr i64 6153737369414576827 to i8* + %result = tail call i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 2, i32 15, i8* %resolveCall2, i32 0) + ret i64 %result +} + declare void @llvm.experimental.stackmap(i64, i32, ...) declare void @llvm.experimental.patchpoint.void(i64, i32, i8*, i32, ...) declare i64 @llvm.experimental.patchpoint.i64(i64, i32, i8*, i32, ...) -- 2.7.4