diff --git a/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h b/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h --- a/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h +++ b/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h @@ -99,6 +99,12 @@ using StatepointSpillMapTy = DenseMap>; DenseMap StatepointSpillMaps; + /// For each statepoint keep virtual registers its result values has + /// been exported to. This is similar to ValueMap, but for statepoint + /// results which has no existing IR Value. + using StatepointRegMap = DenseMap; + DenseMap StatepointRegs; + /// StaticAllocaMap - Keep track of frame indices for fixed sized allocas in /// the entry block. This allows the allocas to be efficiently referenced /// anywhere in the function. diff --git a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp --- a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp @@ -408,7 +408,7 @@ SmallVectorImpl &Ops, SmallVectorImpl &MemRefs, SelectionDAGBuilder &Builder) { - + if (willLowerDirectly(Incoming)) { if (FrameIndexSDNode *FI = dyn_cast(Incoming)) { // This handles allocas as arguments to the statepoint (this is only @@ -426,7 +426,7 @@ } assert(Incoming.getValueType().getSizeInBits() <= 64); - + if (Incoming.isUndef()) { // Put an easily recognized constant that's unlikely to be a valid // value so that uses of undef by the consumer of the stackmap is @@ -453,7 +453,6 @@ } - if (!RequireSpillSlot) { // If this value is live in (not live-on-return, or live-through), we can // treat it the same way patchpoint treats it's "live in" values. We'll @@ -541,16 +540,6 @@ const unsigned MaxTiedRegs = 15; // Max number of tied regs MI can have. unsigned MaxVRegPtrs = std::min(MaxTiedRegs, MaxRegistersForGCPointers.getValue()); - // Use old spill scheme for cross-block relocates. - if (SI.StatepointInstr) { - const BasicBlock *BB = SI.StatepointInstr->getParent(); - bool NonLocalReloc = - llvm::any_of(SI.GCRelocates, [BB](const GCRelocateInst *R) { - return R->getParent() != BB; - }); - if (NonLocalReloc) - MaxVRegPtrs = 0; - } LLVM_DEBUG(dbgs() << "Desiding how to lower GC Pointers:\n"); unsigned CurNumVRegs = 0; @@ -989,6 +978,38 @@ SDValue ReturnValue = LowerAsSTATEPOINT(SI); + // If relocated value will be used in different basic + // block, we need to export them manually. Default exporting mechanism + // will not work here because it is based on IR Value types, and + // IR statepoint has different type than the actual call or relocates. + // It means that by default llvm will create export register of the wrong + // type (always i32 - TokenTy - in our case). So instead we need to create + // export registers manually. + const BasicBlock *BB = I.getParent(); + auto &DPtrMap = StatepointLowering.DerivedPtrMap; + auto &StatepointRegMap = FuncInfo.StatepointRegs[SI.StatepointInstr]; + for (const auto *Reloc : SI.GCRelocates) { + if (Reloc->getParent() == BB) + continue; + + const Value *DerivedPtr = Reloc->getDerivedPtr(); + if (!DPtrMap.count(DerivedPtr)) + continue; // not lowered through VReg + if (StatepointRegMap.count(DerivedPtr)) + continue; + + SDValue Res = DPtrMap[DerivedPtr]; + Type *Ty = DerivedPtr->getType(); + Register Reg = FuncInfo.CreateRegs(Ty); + RegsForValue RFV(*DAG.getContext(), DAG.getTargetLoweringInfo(), + DAG.getDataLayout(), Reg, Ty, None); + SDValue Chain = DAG.getEntryNode(); + + RFV.getCopyToRegs(Res, DAG, getCurSDLoc(), Chain, nullptr, DerivedPtr); + PendingExports.push_back(Chain); + StatepointRegMap[DerivedPtr] = Reg; + } + // Export the result value if needed const GCResultInst *GCResult = I.getGCResult(); Type *RetTy = I.getActualReturnType(); @@ -1020,7 +1041,7 @@ DAG.getDataLayout(), Reg, RetTy, I.getCallingConv()); SDValue Chain = DAG.getEntryNode(); - + RFV.getCopyToRegs(ReturnValue, DAG, getCurSDLoc(), Chain, nullptr); PendingExports.push_back(Chain); FuncInfo.ValueMap[&I] = Reg; @@ -1083,7 +1104,7 @@ // which is always i32 in our case. Type *RetTy = SI->getActualReturnType(); SDValue CopyFromReg = getCopyFromRegs(SI, RetTy); - + assert(CopyFromReg.getNode()); setValue(&CI, CopyFromReg); } @@ -1123,6 +1144,24 @@ return; } + auto &StatepointRegs = FuncInfo.StatepointRegs[Relocate.getStatepoint()]; + if (StatepointRegs.count(DerivedPtr)) { + // Statepoint is in different basic block. Default getValue() mechanism + // does not work here, so we need create CopyFromRegs manually. + // See comment in LowerStatepoint for details. + assert(StatepointBB != Relocate.getParent() && "local gc.relocate"); + Register Reg = StatepointRegs[DerivedPtr]; + assert(Reg > 0 && "invalid register"); + RegsForValue RFV(*DAG.getContext(), DAG.getTargetLoweringInfo(), + DAG.getDataLayout(), Reg, DerivedPtr->getType(), + None); // This is not an ABI copy. + SDValue Chain = DAG.getEntryNode(); + SDValue Result = RFV.getCopyFromRegs(DAG, FuncInfo, getCurSDLoc(), Chain, + nullptr, DerivedPtr); + setValue(&Relocate, Result); + return; + } + auto &SpillMap = FuncInfo.StatepointSpillMaps[Relocate.getStatepoint()]; auto SlotIt = SpillMap.find(DerivedPtr); assert(SlotIt != SpillMap.end() && "Relocating not lowered gc value"); diff --git a/llvm/test/CodeGen/X86/statepoint-vreg.ll b/llvm/test/CodeGen/X86/statepoint-vreg.ll --- a/llvm/test/CodeGen/X86/statepoint-vreg.ll +++ b/llvm/test/CodeGen/X86/statepoint-vreg.ll @@ -11,10 +11,12 @@ declare i1 @return_i1() declare void @func() +declare void @"some_call"(i64 addrspace(1)*) declare void @consume(i32 addrspace(1)*) declare void @consume2(i32 addrspace(1)*, i32 addrspace(1)*) declare void @consume5(i32 addrspace(1)*, i32 addrspace(1)*, i32 addrspace(1)*, i32 addrspace(1)*, i32 addrspace(1)*) declare void @use1(i32 addrspace(1)*, i8 addrspace(1)*) +declare i32 @"personality_function"() ; test most simple relocate define i1 @test_relocate(i32 addrspace(1)* %a) gc "statepoint-example" { @@ -63,6 +65,7 @@ call void @consume(i32 addrspace(1)* %rel1) ret i1 %res1 } + ; test pointer variables intermixed with pointer constants define void @test_mixed(i32 addrspace(1)* %a, i32 addrspace(1)* %b, i32 addrspace(1)* %c) gc "statepoint-example" { ; CHECK-VREG-LABEL: name: test_mixed @@ -348,35 +351,28 @@ } ; -; Cross-basicblock relocates are handled with spilling for now. -; No need to check post-RA output +; test non-local relocates define i1 @test_cross_bb(i32 addrspace(1)* %a, i1 %external_cond) gc "statepoint-example" { ; CHECK-VREG-LABEL: name: test_cross_bb ; CHECK-VREG: bb.0.entry: -; CHECK-VREG: %1:gr32 = COPY $esi -; CHECK-VREG-NEXT: %0:gr64 = COPY $rdi -; CHECK-VREG-NEXT: %3:gr8 = COPY %1.sub_8bit -; CHECK-VREG-NEXT: MOV64mr %stack.0, 1, $noreg, 0, $noreg, %0 :: (store 8 into %stack.0) -; CHECK-VREG-NEXT: ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp -; CHECK-VREG-NEXT: STATEPOINT 0, 0, 0, @return_i1, 2, 0, 2, 0, 2, 0, 1, 8, %stack.0, 0, 1, 8, %stack.0, 0, csr_64, implicit-def $rsp, implicit-def $ssp, implicit-def $al :: (volatile load store 8 on %stack.0) -; CHECK-VREG-NEXT: ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp -; CHECK-VREG-NEXT: %4:gr8 = COPY $al -; CHECK-VREG-NEXT: %2:gr8 = COPY %4 -; CHECK-VREG-NEXT: TEST8ri killed %3, 1, implicit-def $eflags -; CHECK-VREG-NEXT: JCC_1 %bb.2, 4, implicit $eflags -; CHECK-VREG-NEXT: JMP_1 %bb.1 -; CHECK-VREG: bb.1.left: -; CHECK-VREG-NEXT: %6:gr64 = MOV64rm %stack.0, 1, $noreg, 0, $noreg :: (load 8 from %stack.0) -; CHECK-VREG-NEXT: ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp -; CHECK-VREG-NEXT: $rdi = COPY %6 -; CHECK-VREG-NEXT: CALL64pcrel32 @consume, csr_64, implicit $rsp, implicit $ssp, implicit $rdi, implicit-def $rsp, implicit-def $ssp -; CHECK-VREG-NEXT: ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp -; CHECK-VREG-NEXT: $al = COPY %2 -; CHECK-VREG-NEXT: RET 0, $al -; CHECK-VREG: bb.2.right: -; CHECK-VREG-NEXT: %5:gr8 = MOV8ri 1 -; CHECK-VREG-NEXT: $al = COPY %5 -; CHECK-VREG-NEXT: RET 0, $al +; CHECK-VREG: %1:gr32 = COPY $esi +; CHECK-VREG: %0:gr64 = COPY $rdi +; CHECK-VREG: %4:gr8 = COPY %1.sub_8bit +; CHECK-VREG: %2:gr64 = STATEPOINT 0, 0, 0, @return_i1, 2, 0, 2, 0, 2, 0, %0, %0(tied-def 0), csr_64, implicit-def $rsp, implicit-def $ssp, implicit-def $al +; CHECK-VREG: %5:gr8 = COPY $al +; CHECK-VREG: %3:gr8 = COPY %5 +; CHECK-VREG: TEST8ri killed %4, 1, implicit-def $eflags +; CHECK-VREG: JCC_1 %bb.2, 4, implicit $eflags +; CHECK-VREG: JMP_1 %bb.1 +; CHECK-VREG: bb.1.left: +; CHECK-VREG: $rdi = COPY %2 +; CHECK-VREG: CALL64pcrel32 @consume, csr_64, implicit $rsp, implicit $ssp, implicit $rdi, implicit-def $rsp, implicit-def $ssp +; CHECK-VREG: $al = COPY %3 +; CHECK-VREG: RET 0, $al +; CHECK-VREG: bb.2.right: +; CHECK-VREG: %6:gr8 = MOV8ri 1 +; CHECK-VREG: $al = COPY %6 +; CHECK-VREG: RET 0, $al entry: %safepoint_token = tail call token (i64, i32, i1 ()*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_i1f(i64 0, i32 0, i1 ()* @return_i1, i32 0, i32 0, i32 0, i32 0) ["gc-live" (i32 addrspace(1)* %a)] @@ -485,9 +481,203 @@ ret void } +define i64 addrspace(1)* @test_basic_invoke(i64 addrspace(1)* %obj, + i64 addrspace(1)* %obj1) +; CHECK-VREG-LABEL: name: test_basic_invoke +; CHECK-VREG: bb.0.entry: +; CHECK-VREG: %2:gr64 = COPY $rsi +; CHECK-VREG: %1:gr64 = COPY $rdi +; CHECK-VREG: EH_LABEL +; CHECK-VREG: $rdi = COPY %1 +; CHECK-VREG: %3:gr64, %4:gr64 = STATEPOINT 0, 0, 1, @some_call, $rdi, 2, 0, 2, 0, 2, 5, 2, 0, 2, -1, 2, 0, 2, 0, 2, 0, %2, %2(tied-def 0), %1, %1(tied-def 1), csr_64, implicit-def $rsp, implicit-def $ssp +; CHECK-VREG: EH_LABEL +; CHECK-VREG: JMP_1 %bb.1 +; CHECK-VREG: bb.1.invoke_safepoint_normal_dest: +; CHECK-VREG: %0:gr64 = COPY %4 +; CHECK-VREG: bb.2.normal_return: +; CHECK-VREG: $rax = COPY %0 +; CHECK-VREG: RET 0, $rax +; CHECK-VREG: bb.3.exceptional_return (landing-pad): +; CHECK-VREG: liveins: $rax, $rdx +; CHECK-VREG: EH_LABEL +; CHECK-VREG: %6:gr64 = COPY killed $rdx +; CHECK-VREG: %5:gr64 = COPY killed $rax +; CHECK-VREG: $rax = COPY %3 +; CHECK-VREG: RET 0, $rax + +; CHECK-PREG-LABEL: name: test_basic_invoke +; CHECK-PREG: bb.0.entry: +; CHECK-PREG: renamable $r14 = COPY $rsi +; CHECK-PREG: renamable $rbx = COPY $rdi +; CHECK-PREG: EH_LABEL +; CHECK-PREG: $rdi = COPY renamable $rbx +; CHECK-PREG: renamable $r14, renamable $rbx = STATEPOINT 0, 0, 1, @some_call, $rdi, 2, 0, 2, 0, 2, 5, 2, 0, 2, -1, 2, 0, 2, 0, 2, 0, killed renamable $r14, renamable $r14(tied-def 0), killed renamable $rbx, renamable $rbx(tied-def 1), csr_64, implicit-def $rsp, implicit-def $ssp +; CHECK-PREG: EH_LABEL +; CHECK-PREG: JMP_1 %bb.1 +; CHECK-PREG: bb.1.invoke_safepoint_normal_dest: +; CHECK-PREG: successors: %bb.2(0x80000000) +; CHECK-PREG: bb.2.normal_return: +; CHECK-PREG: $rax = COPY killed renamable $rbx +; CHECK-PREG: RET 0, $rax +; CHECK-PREG: bb.3.exceptional_return (landing-pad): +; CHECK-PREG: EH_LABEL +; CHECK-PREG: $rax = COPY killed renamable $r14 +; CHECK-PREG: RET 0, $rax +gc "statepoint-example" personality i32 ()* @"personality_function" { +entry: + %0 = invoke token (i64, i32, void (i64 addrspace(1)*)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidp1i64f(i64 0, i32 0, void (i64 addrspace(1)*)* @some_call, i32 1, i32 0, i64 addrspace(1)* %obj, i32 0, i32 0) ["gc-live" (i64 addrspace(1)* %obj, i64 addrspace(1)* %obj1), "deopt" (i32 0, i32 -1, i32 0, i32 0, i32 0)] + to label %invoke_safepoint_normal_dest unwind label %exceptional_return + +invoke_safepoint_normal_dest: + %obj.relocated = call coldcc i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token %0, i32 0, i32 0) + %obj1.relocated = call coldcc i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token %0, i32 1, i32 1) + br label %normal_return + +normal_return: + ret i64 addrspace(1)* %obj.relocated + +exceptional_return: + %landing_pad = landingpad token + cleanup + %obj.relocated1 = call coldcc i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token %landing_pad, i32 0, i32 0) + %obj1.relocated1 = call coldcc i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token %landing_pad, i32 1, i32 1) + ret i64 addrspace(1)* %obj1.relocated1 +} + +define i64 addrspace(1)* @test_invoke_same_val(i1 %cond, i64 addrspace(1)* %val1, i64 addrspace(1)* %val2, i64 addrspace(1)* %val3) +; CHECK-VREG-LABEL: name: test_invoke_same_val +; CHECK-VREG: bb.0.entry: +; CHECK-VREG: %9:gr64 = COPY $rcx +; CHECK-VREG: %8:gr64 = COPY $rdx +; CHECK-VREG: %7:gr64 = COPY $rsi +; CHECK-VREG: %6:gr32 = COPY $edi +; CHECK-VREG: %10:gr8 = COPY %6.sub_8bit +; CHECK-VREG: TEST8ri %10, 1, implicit-def $eflags +; CHECK-VREG: JCC_1 %bb.3, 4, implicit $eflags +; CHECK-VREG: JMP_1 %bb.1 +; CHECK-VREG: bb.1.left: +; CHECK-VREG: EH_LABEL +; CHECK-VREG: $rdi = COPY %7 +; CHECK-VREG: %15:gr64, %16:gr64 = STATEPOINT 0, 0, 1, @some_call, $rdi, 2, 0, 2, 0, 2, 0, %8, %8(tied-def 0), %7, %7(tied-def 1), csr_64, implicit-def $rsp, implicit-def $ssp +; CHECK-VREG: EH_LABEL +; CHECK-VREG: JMP_1 %bb.2 +; CHECK-VREG: bb.2.left.relocs: +; CHECK-VREG: %0:gr64 = COPY %16 +; CHECK-VREG: %1:gr64 = COPY %15 +; CHECK-VREG: JMP_1 %bb.5 +; CHECK-VREG: bb.3.right: +; CHECK-VREG: EH_LABEL +; CHECK-VREG: $rdi = COPY %7 +; CHECK-VREG: %11:gr64, %12:gr64 = STATEPOINT 0, 0, 1, @some_call, $rdi, 2, 0, 2, 0, 2, 0, %9, %9(tied-def 0), %8, %8(tied-def 1), csr_64, implicit-def $rsp, implicit-def $ssp +; CHECK-VREG: EH_LABEL +; CHECK-VREG: JMP_1 %bb.4 +; CHECK-VREG: bb.4.right.relocs: +; CHECK-VREG: %2:gr64 = COPY %12 +; CHECK-VREG: %3:gr64 = COPY %11 +; CHECK-VREG: bb.5.normal_return: +; CHECK-VREG: %4:gr64 = PHI %3, %bb.4, %0, %bb.2 +; CHECK-VREG: %5:gr64 = PHI %2, %bb.4, %1, %bb.2 +; CHECK-VREG: TEST8ri %10, 1, implicit-def $eflags +; CHECK-VREG: %19:gr64 = CMOV64rr %5, %4, 5, implicit $eflags +; CHECK-VREG: $rax = COPY %19 +; CHECK-VREG: RET 0, $rax +; CHECK-VREG: bb.6.exceptional_return.left (landing-pad): +; CHECK-VREG: EH_LABEL +; CHECK-VREG: %18:gr64 = COPY killed $rdx +; CHECK-VREG: %17:gr64 = COPY killed $rax +; CHECK-VREG: $rax = COPY %16 +; CHECK-VREG: RET 0, $rax +; CHECK-VREG: bb.7.exceptional_return.right (landing-pad): +; CHECK-VREG: EH_LABEL +; CHECK-VREG: %14:gr64 = COPY killed $rdx +; CHECK-VREG: %13:gr64 = COPY killed $rax +; CHECK-VREG: $rax = COPY %12 +; CHECK-VREG: RET 0, $rax + +; CHECK-PREG-LABEL: name: test_invoke_same_val +; CHECK-PREG: bb.0.entry: +; CHECK-PREG: renamable $r15 = COPY $rcx +; CHECK-PREG: renamable $rbx = COPY $rdx +; CHECK-PREG: renamable $rbp = COPY $rsi +; CHECK-PREG: renamable $r14d = COPY $edi +; CHECK-PREG: TEST8ri renamable $r14b, 1, implicit-def $eflags +; CHECK-PREG: JCC_1 %bb.3, 4, implicit killed $eflags +; CHECK-PREG: JMP_1 %bb.1 +; CHECK-PREG: bb.1.left: +; CHECK-PREG: EH_LABEL +; CHECK-PREG: $rdi = COPY renamable $rbp +; CHECK-PREG: renamable $rbx, renamable $rbp = STATEPOINT 0, 0, 1, @some_call, $rdi, 2, 0, 2, 0, 2, 0, killed renamable $rbx, renamable $rbx(tied-def 0), killed renamable $rbp, renamable $rbp(tied-def 1), csr_64, implicit-def $rsp, implicit-def $ssp +; CHECK-PREG: EH_LABEL +; CHECK-PREG: JMP_1 %bb.2 +; CHECK-PREG: bb.2.left.relocs: +; CHECK-PREG: JMP_1 %bb.5 +; CHECK-PREG: bb.3.right: +; CHECK-PREG: EH_LABEL +; CHECK-PREG: $rdi = COPY killed renamable $rbp +; CHECK-PREG: renamable $r15, renamable $rbx = STATEPOINT 0, 0, 1, @some_call, $rdi, 2, 0, 2, 0, 2, 0, killed renamable $r15, renamable $r15(tied-def 0), killed renamable $rbx, renamable $rbx(tied-def 1), csr_64, implicit-def $rsp, implicit-def $ssp +; CHECK-PREG: EH_LABEL +; CHECK-PREG: JMP_1 %bb.4 +; CHECK-PREG: bb.4.right.relocs: +; CHECK-PREG: renamable $rbp = COPY killed renamable $r15 +; CHECK-PREG: bb.5.normal_return: +; CHECK-PREG: TEST8ri renamable $r14b, 1, implicit-def $eflags, implicit killed $r14d +; CHECK-PREG: renamable $rbp = CMOV64rr killed renamable $rbp, killed renamable $rbx, 4, implicit killed $eflags +; CHECK-PREG: $rax = COPY killed renamable $rbp +; CHECK-PREG: RET 0, $rax +; CHECK-PREG: bb.6.exceptional_return.left (landing-pad): +; CHECK-PREG: EH_LABEL +; CHECK-PREG: $rax = COPY killed renamable $rbp +; CHECK-PREG: RET 0, $rax +; CHECK-PREG: bb.7.exceptional_return.right (landing-pad): +; CHECK-PREG: EH_LABEL +; CHECK-PREG: $rax = COPY killed renamable $rbx +; CHECK-PREG: RET 0, $rax + gc "statepoint-example" personality i32 ()* @"personality_function" { +entry: + br i1 %cond, label %left, label %right + +left: + %sp1 = invoke token (i64, i32, void (i64 addrspace(1)*)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidp1i64f(i64 0, i32 0, void (i64 addrspace(1)*)* @some_call, i32 1, i32 0, i64 addrspace(1)* %val1, i32 0, i32 0) ["gc-live"(i64 addrspace(1)* %val1, i64 addrspace(1)* %val2)] + to label %left.relocs unwind label %exceptional_return.left + +left.relocs: + %val1.relocated = call coldcc i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token %sp1, i32 0, i32 0) + %val2.relocated_left = call coldcc i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token %sp1, i32 1, i32 1) + br label %normal_return + +right: + %sp2 = invoke token (i64, i32, void (i64 addrspace(1)*)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidp1i64f(i64 0, i32 0, void (i64 addrspace(1)*)* @some_call, i32 1, i32 0, i64 addrspace(1)* %val1, i32 0, i32 0) ["gc-live"(i64 addrspace(1)* %val2, i64 addrspace(1)* %val3)] + to label %right.relocs unwind label %exceptional_return.right + +right.relocs: + %val2.relocated_right = call coldcc i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token %sp2, i32 0, i32 0) + %val3.relocated = call coldcc i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token %sp2, i32 1, i32 1) + br label %normal_return + +normal_return: + %a1 = phi i64 addrspace(1)* [%val1.relocated, %left.relocs], [%val3.relocated, %right.relocs] + %a2 = phi i64 addrspace(1)* [%val2.relocated_left, %left.relocs], [%val2.relocated_right, %right.relocs] + %ret = select i1 %cond, i64 addrspace(1)* %a1, i64 addrspace(1)* %a2 + ret i64 addrspace(1)* %ret + +exceptional_return.left: + %landing_pad = landingpad token + cleanup + %val.relocated2 = call coldcc i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token %landing_pad, i32 0, i32 0) + ret i64 addrspace(1)* %val.relocated2 + +exceptional_return.right: + %landing_pad1 = landingpad token + cleanup + %val.relocated3 = call coldcc i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token %landing_pad1, i32 0, i32 0) + ret i64 addrspace(1)* %val.relocated3 +} + declare token @llvm.experimental.gc.statepoint.p0f_i1f(i64, i32, i1 ()*, i32, i32, ...) declare token @llvm.experimental.gc.statepoint.p0f_isVoidf(i64, i32, void ()*, i32, i32, ...) +declare token @llvm.experimental.gc.statepoint.p0f_isVoidp1i64f(i64, i32, void (i64 addrspace(1)*)*, i32, i32, ...) declare i32 addrspace(1)* @llvm.experimental.gc.relocate.p1i32(token, i32, i32) +declare i64 addrspace(1)* @llvm.experimental.gc.relocate.p1i64(token, i32, i32) declare i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token, i32, i32) declare <2 x i8 addrspace(1)*> @llvm.experimental.gc.relocate.v2p1i8(token, i32, i32) declare i1 @llvm.experimental.gc.result.i1(token) @@ -891,17 +1081,17 @@ ; CHECK-ASM-NEXT: .short 0 ; CHECK-ASM-NEXT: .short 0 ; CHECK-ASM-NEXT: .long 0 -; Location 4 Indirect $rsp + 0 -; CHECK-ASM-NEXT: .byte 3 +; Location 4 Register $rbx +; CHECK-ASM-NEXT: .byte 1 ; CHECK-ASM-NEXT: .byte 0 ; CHECK-ASM-NEXT: .short 8 -; CHECK-ASM-NEXT: .short 7 +; CHECK-ASM-NEXT: .short 3 ; CHECK-ASM-NEXT: .short 0 ; CHECK-ASM-NEXT: .long 0 -; Location 5 Indirect $rsp + 0 -; CHECK-ASM-NEXT: .byte 3 +; Location 5 Register $rbx +; CHECK-ASM-NEXT: .byte 1 ; CHECK-ASM-NEXT: .byte 0 ; CHECK-ASM-NEXT: .short 8 -; CHECK-ASM-NEXT: .short 7 +; CHECK-ASM-NEXT: .short 3 ; CHECK-ASM-NEXT: .short 0 ; CHECK-ASM-NEXT: .long 0