From 32b845d223393d9f5e7317b9e754a52b79543de2 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Thu, 16 Apr 2015 23:24:18 +0000 Subject: [PATCH] [opaque pointer type] Add textual IR support for explicit type parameter to the call instruction See r230786 and r230794 for similar changes to gep and load respectively. Call is a bit different because it often doesn't have a single explicit type - usually the type is deduced from the arguments, and just the return type is explicit. In those cases there's no need to change the IR. When that's not the case, the IR usually contains the pointer type of the first operand - but since typed pointers are going away, that representation is insufficient so I'm just stripping the "pointerness" of the explicit type away. This does make the IR a bit weird - it /sort of/ reads like the type of the first operand: "call void () %x(" but %x is actually of type "void ()*" and will eventually be just of type "ptr". But this seems not too bad and I don't think it would benefit from repeating the type ("void (), void () * %x(" and then eventually "void (), ptr %x(") as has been done with gep and load. This also has a side benefit: since the explicit type is no longer a pointer, there's no ambiguity between an explicit type and a function that returns a function pointer. Previously this case needed an explicit type (eg: a function returning a void() function was written as "call void () () * @x(" rather than "call void () * @x(" because of the ambiguity between a function returning a pointer to a void() function and a function returning void). No ambiguity means even function pointer return types can just be written alone, without writing the whole function's type. This leaves /only/ the varargs case where the explicit type is required. Given the special type syntax in call instructions, the regex-fu used for migration was a bit more involved in its own unique way (as every one of these is) so here it is. Use it in conjunction with the apply.sh script and associated find/xargs commands I've provided in rr230786 to migrate your out of tree tests. Do let me know if any of this doesn't cover your cases & we can iterate on a more general script/regexes to help others with out of tree tests. About 9 test cases couldn't be automatically migrated - half of those were functions returning function pointers, where I just had to manually delete the function argument types now that we didn't need an explicit function type there. The other half were typedefs of function types used in calls - just had to manually drop the * from those. import fileinput import sys import re pat = re.compile(r'((?:=|:|^|\s)call\s(?:[^@]*?))(\s*$|\s*(?:(?:\[\[[a-zA-Z0-9_]+\]\]|[@%](?:(")?[\\\?@a-zA-Z0-9_.]*?(?(3)"|)|{{.*}}))(?:\(|$)|undef|inttoptr|bitcast|null|asm).*$)') addrspace_end = re.compile(r"addrspace\(\d+\)\s*\*$") func_end = re.compile("(?:void.*|\)\s*)\*$") def conv(match, line): if not match or re.search(addrspace_end, match.group(1)) or not re.search(func_end, match.group(1)): return line return line[:match.start()] + match.group(1)[:match.group(1).rfind('*')].rstrip() + match.group(2) + line[match.end():] for line in sys.stdin: sys.stdout.write(conv(re.search(pat, line), line)) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235145 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/IR/Instructions.h | 4 + lib/AsmParser/LLParser.cpp | 10 +- lib/IR/AsmWriter.cpp | 15 +- .../BasicAA/2006-03-03-BadArraySubscript.ll | 2 +- test/Analysis/BasicAA/2008-04-15-Byval.ll | 2 +- test/Analysis/BasicAA/byval.ll | 2 +- .../loops_with_profile_info.ll | 6 +- .../CallGraph/2008-09-09-DirectCall.ll | 2 +- .../Analysis/GlobalsModRef/volatile-instrs.ll | 2 +- test/Analysis/LazyCallGraph/basic.ll | 2 +- .../2008-11-18-LessThanOrEqual.ll | 2 +- .../2012-03-26-LoadConstant.ll | 2 +- .../ScalarEvolution/max-trip-count.ll | 2 +- .../ScalarEvolution/zext-signed-addrec.ll | 2 +- .../ValueTracking/memory-dereferenceable.ll | 2 +- .../Assembler/2002-07-25-ReturnPtrFunction.ll | 2 +- test/Assembler/2003-05-15-AssemblerProblem.ll | 4 +- test/Assembler/2008-01-11-VarargAttrs.ll | 2 +- test/Assembler/musttail-invalid-1.ll | 2 +- test/Assembler/musttail-invalid-2.ll | 2 +- test/Assembler/musttail.ll | 4 +- test/Bitcode/miscInstructions.3.2.ll | 4 +- test/CodeGen/AArch64/argument-blocks.ll | 2 +- .../AArch64/arm64-2012-06-06-FPToUI.ll | 8 +- test/CodeGen/AArch64/arm64-aapcs.ll | 2 +- test/CodeGen/AArch64/arm64-abi-varargs.ll | 6 +- test/CodeGen/AArch64/arm64-anyregcc-crash.ll | 2 +- test/CodeGen/AArch64/arm64-anyregcc.ll | 16 +-- test/CodeGen/AArch64/arm64-fcopysign.ll | 2 +- test/CodeGen/AArch64/arm64-join-reserved.ll | 2 +- .../AArch64/arm64-patchpoint-scratch-regs.ll | 2 +- .../AArch64/arm64-patchpoint-webkit_jscc.ll | 8 +- test/CodeGen/AArch64/arm64-patchpoint.ll | 16 +-- test/CodeGen/AArch64/arm64-stackmap-nops.ll | 2 +- test/CodeGen/AArch64/arm64-stackmap.ll | 22 +-- test/CodeGen/AArch64/br-to-eh-lpad.ll | 8 +- .../CodeGen/AArch64/dag-combine-invaraints.ll | 2 +- test/CodeGen/AArch64/stackmap-liveness.ll | 2 +- .../ARM/2007-03-21-JoinIntervalsCrash.ll | 2 +- test/CodeGen/ARM/2007-04-03-PEIBug.ll | 2 +- .../CodeGen/ARM/2007-04-03-UndefinedSymbol.ll | 4 +- .../ARM/2007-05-03-BadPostIndexedLd.ll | 2 +- test/CodeGen/ARM/2007-05-07-tailmerge-1.ll | 18 +-- test/CodeGen/ARM/2007-05-09-tailmerge-2.ll | 18 +-- test/CodeGen/ARM/2007-05-22-tailmerge-3.ll | 18 +-- .../ARM/2008-03-07-RegScavengerAssert.ll | 2 +- .../CodeGen/ARM/2008-04-10-ScavengerAssert.ll | 4 +- test/CodeGen/ARM/2009-02-16-SpillerBug.ll | 2 +- test/CodeGen/ARM/2009-04-08-FREM.ll | 2 +- test/CodeGen/ARM/2009-05-07-RegAllocLocal.ll | 2 +- .../ARM/2009-05-11-CodePlacementCrash.ll | 2 +- test/CodeGen/ARM/2009-06-02-ISelCrash.ll | 2 +- .../ARM/2009-06-30-RegScavengerAssert.ll | 6 +- .../ARM/2009-06-30-RegScavengerAssert2.ll | 6 +- test/CodeGen/ARM/2009-10-27-double-align.ll | 2 +- .../CodeGen/ARM/2010-05-18-LocalAllocCrash.ll | 6 +- .../CodeGen/ARM/2010-06-21-LdStMultipleBug.ll | 4 +- test/CodeGen/ARM/2010-07-26-GlobalMerge.ll | 10 +- .../ARM/2011-04-15-AndVFlagPeepholeBug.ll | 2 +- .../ARM/2011-04-15-RegisterCmpPeephole.ll | 4 +- .../2011-10-26-ExpandUnalignedLoadCrash.ll | 2 +- .../ARM/2012-10-04-AAPCS-byval-align8.ll | 6 +- .../ARM/2012-10-04-FixedFrame-vs-byval.ll | 2 +- .../CodeGen/ARM/2013-04-21-AAPCS-VA-C.1.cp.ll | 2 +- test/CodeGen/ARM/aliases.ll | 2 +- test/CodeGen/ARM/arguments.ll | 2 +- test/CodeGen/ARM/arm-asm.ll | 2 +- test/CodeGen/ARM/bx_fold.ll | 2 +- test/CodeGen/ARM/cache-intrinsic.ll | 4 +- test/CodeGen/ARM/compare-call.ll | 2 +- test/CodeGen/ARM/debug-info-branch-folding.ll | 4 +- test/CodeGen/ARM/debug-info-d16-reg.ll | 6 +- test/CodeGen/ARM/debug-info-qreg.ll | 2 +- test/CodeGen/ARM/debug-info-s16-reg.ll | 6 +- test/CodeGen/ARM/fast-isel-vararg.ll | 2 +- test/CodeGen/ARM/fcopysign.ll | 2 +- test/CodeGen/ARM/ghc-tcreturn-lowered.ll | 2 +- test/CodeGen/ARM/ifcvt6.ll | 2 +- test/CodeGen/ARM/indirectbr-2.ll | 2 +- test/CodeGen/ARM/neon-spfp.ll | 2 +- test/CodeGen/ARM/optselect-regclass.ll | 2 +- test/CodeGen/ARM/shifter_operand.ll | 2 +- .../ARM/stack-protector-bmovpcb_call.ll | 2 +- test/CodeGen/ARM/stm.ll | 4 +- test/CodeGen/ARM/uint64tof64.ll | 2 +- test/CodeGen/ARM/vargs.ll | 4 +- test/CodeGen/ARM/vector-spilling.ll | 2 +- test/CodeGen/ARM/vfp.ll | 8 +- test/CodeGen/ARM/weak2.ll | 2 +- test/CodeGen/BPF/ex1.ll | 2 +- test/CodeGen/BPF/sanity.ll | 2 +- test/CodeGen/CPP/2009-05-01-Long-Double.ll | 2 +- test/CodeGen/Generic/2003-07-06-BadIntCmp.ll | 4 +- .../Generic/2003-07-07-BadLongConst.ll | 2 +- .../Generic/2003-07-08-BadCastToBool.ll | 2 +- .../Generic/2003-07-29-BadConstSbyte.ll | 4 +- test/CodeGen/Generic/2005-12-01-Crash.ll | 2 +- .../Generic/2006-05-06-GEP-Cast-Sink-Crash.ll | 2 +- test/CodeGen/Generic/2008-02-04-Ctlz.ll | 2 +- test/CodeGen/Generic/2008-02-25-NegateZero.ll | 2 +- test/CodeGen/Generic/ConstantExprLowering.ll | 2 +- test/CodeGen/Generic/PBQP.ll | 34 ++--- test/CodeGen/Generic/add-with-overflow-128.ll | 4 +- test/CodeGen/Generic/add-with-overflow-24.ll | 8 +- test/CodeGen/Generic/add-with-overflow.ll | 8 +- test/CodeGen/Generic/badarg6.ll | 2 +- test/CodeGen/Generic/builtin-expect.ll | 12 +- test/CodeGen/Generic/cast-fp.ll | 14 +- test/CodeGen/Generic/constindices.ll | 2 +- test/CodeGen/Generic/hello.ll | 2 +- test/CodeGen/Generic/negintconst.ll | 2 +- .../Generic/overloaded-intrinsic-name.ll | 10 +- test/CodeGen/Generic/print-add.ll | 6 +- test/CodeGen/Generic/print-arith-fp.ll | 26 ++-- test/CodeGen/Generic/print-arith-int.ll | 36 ++--- test/CodeGen/Generic/print-int.ll | 2 +- test/CodeGen/Generic/print-mul-exp.ll | 42 +++--- test/CodeGen/Generic/print-mul.ll | 6 +- test/CodeGen/Generic/print-shift.ll | 6 +- test/CodeGen/Hexagon/i16_VarArg.ll | 2 +- test/CodeGen/Hexagon/i1_VarArg.ll | 12 +- test/CodeGen/Hexagon/i8_VarArg.ll | 2 +- test/CodeGen/Mips/alloca.ll | 2 +- test/CodeGen/Mips/analyzebranch.ll | 2 +- test/CodeGen/Mips/and1.ll | 2 +- test/CodeGen/Mips/atomicops.ll | 6 +- test/CodeGen/Mips/cache-intrinsic.ll | 4 +- .../arguments-varargs-small-structs-byte.ll | 18 +-- ...ents-varargs-small-structs-combinations.ll | 10 +- ...nts-varargs-small-structs-multiple-args.ll | 2 +- test/CodeGen/Mips/cfi_offset.ll | 2 +- test/CodeGen/Mips/eh-return32.ll | 2 +- test/CodeGen/Mips/eh-return64.ll | 2 +- test/CodeGen/Mips/fpbr.ll | 24 ++-- test/CodeGen/Mips/gprestore.ll | 2 +- test/CodeGen/Mips/helloworld.ll | 2 +- test/CodeGen/Mips/hf16call32.ll | 48 +++---- test/CodeGen/Mips/hfptrcall.ll | 8 +- test/CodeGen/Mips/i32k.ll | 4 +- test/CodeGen/Mips/internalfunc.ll | 6 +- test/CodeGen/Mips/lb1.ll | 2 +- test/CodeGen/Mips/lbu1.ll | 2 +- test/CodeGen/Mips/lh1.ll | 2 +- test/CodeGen/Mips/lhu1.ll | 2 +- test/CodeGen/Mips/mbrsize4a.ll | 2 +- test/CodeGen/Mips/micromips-addiu.ll | 6 +- test/CodeGen/Mips/micromips-andi.ll | 4 +- test/CodeGen/Mips/mips16_32_8.ll | 6 +- test/CodeGen/Mips/mips16ex.ll | 2 +- test/CodeGen/Mips/neg1.ll | 2 +- test/CodeGen/Mips/not1.ll | 2 +- test/CodeGen/Mips/or1.ll | 2 +- test/CodeGen/Mips/return-vector.ll | 12 +- test/CodeGen/Mips/sb1.ll | 2 +- test/CodeGen/Mips/selnek.ll | 8 +- test/CodeGen/Mips/sh1.ll | 2 +- test/CodeGen/Mips/sll1.ll | 2 +- test/CodeGen/Mips/sll2.ll | 2 +- test/CodeGen/Mips/sra1.ll | 2 +- test/CodeGen/Mips/sra2.ll | 2 +- test/CodeGen/Mips/srl1.ll | 2 +- test/CodeGen/Mips/srl2.ll | 2 +- test/CodeGen/Mips/stchar.ll | 12 +- test/CodeGen/Mips/stldst.ll | 4 +- test/CodeGen/Mips/sub1.ll | 2 +- test/CodeGen/Mips/sub2.ll | 2 +- test/CodeGen/Mips/tailcall.ll | 4 +- test/CodeGen/Mips/xor1.ll | 2 +- test/CodeGen/NVPTX/symbol-naming.ll | 2 +- test/CodeGen/PowerPC/2006-10-13-Miscompile.ll | 2 +- .../PowerPC/2006-10-17-brcc-miscompile.ll | 2 +- .../PowerPC/2007-02-23-lr-saved-twice.ll | 2 +- .../CodeGen/PowerPC/2007-05-22-tailmerge-3.ll | 18 +-- .../PowerPC/2007-09-07-LoadStoreIdxForms.ll | 2 +- test/CodeGen/PowerPC/2007-09-08-unaligned.ll | 2 +- .../PowerPC/2007-10-21-LocalRegAllocAssert.ll | 8 +- .../2007-10-21-LocalRegAllocAssert2.ll | 6 +- .../PowerPC/2008-04-23-CoalescerCrash.ll | 8 +- .../CodeGen/PowerPC/2008-07-24-PPC64-CCBug.ll | 2 +- .../PowerPC/2008-09-12-CoalescerBug.ll | 24 ++-- .../PowerPC/2010-03-09-indirect-call.ll | 2 +- .../PowerPC/2011-12-05-NoSpillDupCR.ll | 2 +- .../PowerPC/2011-12-06-SpillAndRestoreCR.ll | 2 +- test/CodeGen/PowerPC/and-branch.ll | 2 +- test/CodeGen/PowerPC/branch-opt.ll | 10 +- test/CodeGen/PowerPC/cr1eq-no-extra-moves.ll | 4 +- test/CodeGen/PowerPC/cr1eq.ll | 4 +- test/CodeGen/PowerPC/cr_spilling.ll | 2 +- test/CodeGen/PowerPC/ctrloop-sums.ll | 2 +- test/CodeGen/PowerPC/ppc32-i1-vaarg.ll | 2 +- test/CodeGen/PowerPC/ppc32-pic-large.ll | 2 +- test/CodeGen/PowerPC/ppc32-pic.ll | 2 +- test/CodeGen/PowerPC/ppc64-anyregcc-crash.ll | 2 +- test/CodeGen/PowerPC/ppc64-anyregcc.ll | 16 +-- test/CodeGen/PowerPC/ppc64-patchpoint.ll | 16 +-- test/CodeGen/PowerPC/ppc64-stackmap-nops.ll | 2 +- test/CodeGen/PowerPC/ppc64-stackmap.ll | 22 +-- test/CodeGen/PowerPC/ppcf128-3.ll | 8 +- test/CodeGen/PowerPC/remat-imm.ll | 2 +- test/CodeGen/PowerPC/resolvefi-basereg.ll | 4 +- test/CodeGen/PowerPC/s000-alias-misched.ll | 2 +- test/CodeGen/PowerPC/stack-protector.ll | 2 +- test/CodeGen/PowerPC/trampoline.ll | 4 +- test/CodeGen/PowerPC/varargs-struct-float.ll | 2 +- test/CodeGen/PowerPC/vsx-spill-norwstore.ll | 2 +- .../SPARC/2008-10-10-InlineAsmRegOperand.ll | 2 +- test/CodeGen/SPARC/2011-01-11-Call.ll | 6 +- test/CodeGen/SPARC/2011-01-19-DelaySlot.ll | 2 +- test/CodeGen/SPARC/64abi.ll | 2 +- test/CodeGen/SPARC/setjmp.ll | 2 +- test/CodeGen/SPARC/varargs.ll | 2 +- .../CodeGen/Thumb/2007-01-31-RegInfoAssert.ll | 2 +- .../Thumb/2007-05-05-InvalidPushPop.ll | 4 +- test/CodeGen/Thumb/2011-05-11-DAGLegalizer.ll | 2 +- test/CodeGen/Thumb/2011-06-16-NoGPRs.ll | 2 +- test/CodeGen/Thumb/asmprinter-bug.ll | 6 +- test/CodeGen/Thumb/vargs.ll | 2 +- test/CodeGen/Thumb2/2009-07-21-ISelBug.ll | 2 +- .../Thumb2/2009-08-04-CoalescerAssert.ll | 2 +- .../CodeGen/Thumb2/2009-08-04-CoalescerBug.ll | 8 +- .../Thumb2/2009-08-04-ScavengerAssert.ll | 24 ++-- test/CodeGen/Thumb2/2009-08-21-PostRAKill4.ll | 8 +- test/CodeGen/Thumb2/2009-12-01-LoopIVUsers.ll | 2 +- .../Thumb2/2010-06-14-NEONCoalescer.ll | 4 +- .../Thumb2/2010-08-10-VarSizedAllocaBug.ll | 4 +- test/CodeGen/Thumb2/large-call.ll | 2 +- test/CodeGen/Thumb2/thumb2-ifcvt2.ll | 2 +- test/CodeGen/Thumb2/thumb2-tbb.ll | 26 ++-- test/CodeGen/WinEH/cppeh-alloca-sink.ll | 4 +- test/CodeGen/WinEH/cppeh-catch-all.ll | 2 +- test/CodeGen/WinEH/cppeh-catch-scalar.ll | 4 +- test/CodeGen/WinEH/cppeh-catch-unwind.ll | 8 +- test/CodeGen/WinEH/cppeh-frame-vars.ll | 4 +- test/CodeGen/WinEH/cppeh-inalloca.ll | 4 +- test/CodeGen/WinEH/cppeh-min-unwind.ll | 4 +- test/CodeGen/WinEH/cppeh-multi-catch.ll | 4 +- test/CodeGen/WinEH/cppeh-nested-1.ll | 6 +- test/CodeGen/WinEH/cppeh-nested-2.ll | 8 +- test/CodeGen/WinEH/cppeh-nested-3.ll | 8 +- .../WinEH/cppeh-nonalloca-frame-values.ll | 4 +- .../WinEH/cppeh-prepared-catch-reordered.ll | 6 +- test/CodeGen/WinEH/cppeh-prepared-catch.ll | 8 +- test/CodeGen/WinEH/cppeh-prepared-cleanups.ll | 10 +- test/CodeGen/WinEH/seh-catch-all.ll | 2 +- test/CodeGen/WinEH/seh-inlined-finally.ll | 2 +- test/CodeGen/WinEH/seh-outlined-finally.ll | 8 +- test/CodeGen/WinEH/seh-simple.ll | 8 +- test/CodeGen/X86/2006-10-13-CycleInDAG.ll | 2 +- .../2006-10-19-SwitchUnnecessaryBranching.ll | 4 +- test/CodeGen/X86/2006-11-12-CSRetCC.ll | 2 +- test/CodeGen/X86/2006-12-19-IntelSyntax.ll | 26 ++-- test/CodeGen/X86/2007-02-16-BranchFold.ll | 2 +- .../X86/2007-02-19-LiveIntervalAssert.ll | 2 +- test/CodeGen/X86/2007-05-05-VecCastExpand.ll | 2 +- .../X86/2007-05-14-LiveIntervalAssert.ll | 2 +- test/CodeGen/X86/2007-07-10-StackerAssert.ll | 2 +- test/CodeGen/X86/2007-10-15-CoalescerCrash.ll | 2 +- .../X86/2007-11-04-LiveIntervalCrash.ll | 2 +- test/CodeGen/X86/2008-02-18-TailMergingBug.ll | 2 +- test/CodeGen/X86/2008-04-09-BranchFolding.ll | 2 +- .../CodeGen/X86/2008-04-15-LiveVariableBug.ll | 2 +- test/CodeGen/X86/2008-05-12-tailmerge-5.ll | 10 +- test/CodeGen/X86/2008-07-16-CoalescerCrash.ll | 2 +- test/CodeGen/X86/2008-08-06-CmpStride.ll | 2 +- test/CodeGen/X86/2008-08-31-EH_RETURN64.ll | 2 +- test/CodeGen/X86/2008-09-09-LinearScanBug.ll | 2 +- test/CodeGen/X86/2008-09-11-CoalescerBug.ll | 6 +- test/CodeGen/X86/2008-09-11-CoalescerBug2.ll | 2 +- test/CodeGen/X86/2008-10-11-CallCrash.ll | 6 +- test/CodeGen/X86/2008-10-13-CoalescerBug.ll | 4 +- test/CodeGen/X86/2008-11-06-testb.ll | 2 +- test/CodeGen/X86/2008-11-29-ULT-Sign.ll | 2 +- test/CodeGen/X86/2008-12-01-SpillerAssert.ll | 2 +- .../CodeGen/X86/2008-12-19-EarlyClobberBug.ll | 2 +- test/CodeGen/X86/2009-02-26-MachineLICMBug.ll | 4 +- test/CodeGen/X86/2009-03-25-TestBug.ll | 4 +- test/CodeGen/X86/2009-04-13-2AddrAssert.ll | 2 +- test/CodeGen/X86/2009-04-14-IllegalRegs.ll | 2 +- .../2009-05-19-SingleElementExtractElement.ll | 2 +- .../CodeGen/X86/2009-08-23-SubRegReuseUndo.ll | 2 +- .../X86/2010-02-23-RematImplicitSubreg.ll | 4 +- test/CodeGen/X86/2010-05-28-Crash.ll | 4 +- .../X86/2010-06-15-FastAllocEarlyCLobber.ll | 2 +- .../X86/2010-08-04-MaskedSignedCompare.ll | 2 +- .../X86/2011-01-24-DbgValue-Before-Use.ll | 2 +- test/CodeGen/X86/2011-02-23-UnfoldBug.ll | 2 +- test/CodeGen/X86/2011-03-02-DAGCombiner.ll | 2 +- test/CodeGen/X86/2011-09-14-valcoalesce.ll | 2 +- test/CodeGen/X86/2011-10-12-MachineCSE.ll | 2 +- test/CodeGen/X86/2012-09-28-CGPBug.ll | 2 +- test/CodeGen/X86/2012-11-30-misched-dbg.ll | 2 +- test/CodeGen/X86/2014-08-29-CompactUnwind.ll | 2 +- test/CodeGen/X86/aliases.ll | 2 +- test/CodeGen/X86/anyregcc-crash.ll | 2 +- test/CodeGen/X86/anyregcc.ll | 16 +-- test/CodeGen/X86/avoid-loop-align.ll | 2 +- test/CodeGen/X86/avx-varargs-x86_64.ll | 2 +- test/CodeGen/X86/bool-zext.ll | 4 +- test/CodeGen/X86/brcond.ll | 4 +- test/CodeGen/X86/byval-align.ll | 2 +- test/CodeGen/X86/byval6.ll | 4 +- test/CodeGen/X86/cache-intrinsic.ll | 4 +- test/CodeGen/X86/cmov.ll | 2 +- test/CodeGen/X86/cmp.ll | 2 +- test/CodeGen/X86/coalescer-remat.ll | 2 +- test/CodeGen/X86/crash.ll | 4 +- test/CodeGen/X86/dagcombine-and-setcc.ll | 2 +- test/CodeGen/X86/discontiguous-loops.ll | 4 +- test/CodeGen/X86/dllimport-x86_64.ll | 4 +- test/CodeGen/X86/dllimport.ll | 4 +- test/CodeGen/X86/early-ifcvt.ll | 2 +- test/CodeGen/X86/extern_weak.ll | 2 +- test/CodeGen/X86/fast-isel-x86-64.ll | 4 +- test/CodeGen/X86/fltused.ll | 2 +- test/CodeGen/X86/fltused_function_pointer.ll | 2 +- test/CodeGen/X86/fp-stack-O0.ll | 2 +- test/CodeGen/X86/fp-stack-ret-store.ll | 4 +- test/CodeGen/X86/frameescape.ll | 8 +- test/CodeGen/X86/h-registers-3.ll | 2 +- test/CodeGen/X86/hoist-common.ll | 2 +- test/CodeGen/X86/invalid-shift-immediate.ll | 2 +- test/CodeGen/X86/jump_sign.ll | 4 +- test/CodeGen/X86/licm-nested.ll | 2 +- test/CodeGen/X86/licm-symbol.ll | 4 +- test/CodeGen/X86/lsr-normalization.ll | 2 +- test/CodeGen/X86/machine-cse.ll | 2 +- test/CodeGen/X86/memcmp.ll | 12 +- .../X86/misched-code-difference-with-debug.ll | 8 +- test/CodeGen/X86/mmx-arg-passing-x86-64.ll | 4 +- test/CodeGen/X86/movtopush.ll | 2 +- test/CodeGen/X86/musttail-fastcall.ll | 8 +- test/CodeGen/X86/musttail-varargs.ll | 10 +- test/CodeGen/X86/or-branch.ll | 4 +- test/CodeGen/X86/patchpoint-webkit_jscc.ll | 8 +- test/CodeGen/X86/patchpoint.ll | 18 +-- test/CodeGen/X86/phys-reg-local-regalloc.ll | 2 +- test/CodeGen/X86/pic.ll | 32 ++--- test/CodeGen/X86/pr1489.ll | 2 +- test/CodeGen/X86/pr18023.ll | 2 +- test/CodeGen/X86/pr2326.ll | 2 +- test/CodeGen/X86/pr2656.ll | 2 +- test/CodeGen/X86/pr2982.ll | 2 +- test/CodeGen/X86/pr3244.ll | 2 +- test/CodeGen/X86/pr3250.ll | 2 +- test/CodeGen/X86/pr3457.ll | 4 +- test/CodeGen/X86/rd-mod-wr-eflags.ll | 4 +- test/CodeGen/X86/scalarize-bitcast.ll | 2 +- test/CodeGen/X86/seh-safe-div.ll | 6 +- test/CodeGen/X86/sibcall.ll | 4 +- test/CodeGen/X86/smul-with-overflow.ll | 8 +- test/CodeGen/X86/sse-varargs.ll | 2 +- test/CodeGen/X86/stack-protector.ll | 134 +++++++++--------- test/CodeGen/X86/stackmap-fast-isel.ll | 14 +- test/CodeGen/X86/stackmap-large-constants.ll | 4 +- test/CodeGen/X86/stackmap-liveness.ll | 10 +- test/CodeGen/X86/stackmap-nops.ll | 64 ++++----- .../X86/stackmap-shadow-optimization.ll | 2 +- test/CodeGen/X86/stackmap.ll | 42 +++--- test/CodeGen/X86/statepoint-allocas.ll | 4 +- test/CodeGen/X86/statepoint-call-lowering.ll | 12 +- test/CodeGen/X86/statepoint-forward.ll | 8 +- test/CodeGen/X86/statepoint-stack-usage.ll | 8 +- .../CodeGen/X86/statepoint-stackmap-format.ll | 2 +- test/CodeGen/X86/sub-with-overflow.ll | 8 +- test/CodeGen/X86/switch-crit-edge-constant.ll | 26 ++-- test/CodeGen/X86/switch-or.ll | 2 +- test/CodeGen/X86/tail-call-win64.ll | 4 +- test/CodeGen/X86/tailcall-64.ll | 2 +- test/CodeGen/X86/tailcall-fastisel.ll | 2 +- test/CodeGen/X86/twoaddr-coalesce.ll | 2 +- test/CodeGen/X86/umul-with-carry.ll | 4 +- test/CodeGen/X86/utf16-cfstrings.ll | 2 +- test/CodeGen/X86/vararg-callee-cleanup.ll | 12 +- test/CodeGen/X86/vararg_tailcall.ll | 10 +- test/CodeGen/X86/variadic-node-pic.ll | 2 +- test/CodeGen/X86/x86-64-asm.ll | 2 +- test/CodeGen/X86/x86-64-varargs.ll | 2 +- test/CodeGen/X86/xmulo.ll | 6 +- test/CodeGen/X86/xor-icmp.ll | 6 +- test/CodeGen/XCore/llvm-intrinsics.ll | 6 +- test/DebugInfo/2009-11-10-CurrentFn.ll | 2 +- test/DebugInfo/Mips/fn-call-line.ll | 4 +- test/DebugInfo/Sparc/gnu-window-save.ll | 2 +- test/DebugInfo/SystemZ/variable-loc.ll | 2 +- test/DebugInfo/X86/block-capture.ll | 2 +- test/DebugInfo/X86/dbg-value-const-byref.ll | 2 +- test/DebugInfo/X86/dbg-value-range.ll | 2 +- test/DebugInfo/X86/formal_parameter.ll | 4 +- test/DebugInfo/X86/rvalue-ref.ll | 2 +- test/DebugInfo/X86/subregisters.ll | 2 +- test/DebugInfo/multiline.ll | 12 +- .../MCJIT/2002-12-16-ArgTest.ll | 2 +- .../MCJIT/2008-06-05-APInt-OverAShr.ll | 2 +- test/ExecutionEngine/MCJIT/fpbitcast.ll | 2 +- test/ExecutionEngine/MCJIT/hello2.ll | 2 +- .../OrcMCJIT/2002-12-16-ArgTest.ll | 2 +- .../OrcMCJIT/2008-06-05-APInt-OverAShr.ll | 2 +- test/ExecutionEngine/OrcMCJIT/fpbitcast.ll | 2 +- test/ExecutionEngine/OrcMCJIT/hello2.ll | 2 +- test/ExecutionEngine/fma3-jit.ll | 2 +- test/ExecutionEngine/frem.ll | 2 +- .../test-interp-vec-loadstore.ll | 6 +- test/Feature/aliases.ll | 2 +- test/Feature/attributes.ll | 2 +- test/Feature/paramattrs.ll | 2 +- test/Feature/testvarargs.ll | 2 +- .../DataFlowSanitizer/abilist.ll | 8 +- .../instrumentation-with-call-threshold.ll | 2 +- .../MemorySanitizer/msan_basic.ll | 6 +- test/Integer/2007-01-19-TruncSext.ll | 2 +- .../X86/keep-used-puts-during-instcombine.ll | 2 +- .../X86/no-undefined-puts-when-implemented.ll | 2 +- test/Linker/Inputs/basiclink.b.ll | 2 +- test/MC/ARM/elf-reloc-02.ll | 8 +- test/MC/ARM/elf-reloc-03.ll | 2 +- test/MC/X86/stackmap-nops.ll | 34 ++--- test/Other/lint.ll | 8 +- test/Transforms/ArgumentPromotion/variadic.ll | 2 +- .../CodeGenPrepare/statepoint-relocate.ll | 12 +- .../ConstantHoisting/X86/stackmap.ll | 4 +- .../DeadArgElim/2007-10-18-VarargsReturn.ll | 2 +- .../DeadArgElim/2007-12-20-ParamAttrs.ll | 2 +- .../2008-01-16-VarargsParamAttrs.ll | 2 +- .../2013-05-17-VarargsAndBlockAddress.ll | 2 +- test/Transforms/DeadArgElim/dbginfo.ll | 2 +- test/Transforms/DeadArgElim/dead_vaargs.ll | 14 +- .../Transforms/DeadArgElim/variadic_safety.ll | 8 +- test/Transforms/FunctionAttrs/nocapture.ll | 2 +- test/Transforms/FunctionAttrs/readattrs.ll | 2 +- test/Transforms/GCOVProfiling/return-block.ll | 4 +- .../Transforms/GVN/2007-07-31-NoDomInherit.ll | 10 +- test/Transforms/GVN/2008-02-12-UndefLoad.ll | 2 +- .../Transforms/GVN/2009-02-17-LoadPRECrash.ll | 2 +- test/Transforms/GVN/invariant-load.ll | 2 +- test/Transforms/GVN/pre-basic-add.ll | 2 +- test/Transforms/GVN/pre-compare.ll | 2 +- test/Transforms/GVN/rle-must-alias.ll | 6 +- .../GlobalDCE/2003-07-01-SelfReference.ll | 2 +- .../GlobalOpt/2007-11-09-GEP-GEP-Crash.ll | 2 +- .../GlobalOpt/2009-02-15-ResolveAlias.ll | 4 +- .../GlobalOpt/constantexpr-dangle.ll | 2 +- .../IndVarSimplify/2012-07-17-lftr-undef.ll | 2 +- .../IndVarSimplify/eliminate-max.ll | 2 +- test/Transforms/IndVarSimplify/sink-alloca.ll | 4 +- test/Transforms/IndVarSimplify/udiv.ll | 2 +- test/Transforms/Inline/devirtualize-2.ll | 2 +- test/Transforms/Inline/frameescape.ll | 4 +- .../Inline/inline-musttail-varargs.ll | 6 +- test/Transforms/Inline/inline_ssp.ll | 8 +- .../InstCombine/2003-08-12-AllocaNonNull.ll | 2 +- .../InstCombine/2003-11-03-VarargsCallBug.ll | 2 +- .../InstCombine/2007-02-01-LoadSinkAlloca.ll | 30 ++-- .../InstCombine/2007-02-07-PointerCast.ll | 2 +- .../2007-11-25-CompatibleAttributes.ll | 2 +- .../2008-01-14-VarArgTrampoline.ll | 2 +- .../InstCombine/2008-04-22-ByValBitcast.ll | 2 +- .../InstCombine/2008-05-08-LiveStoreDelete.ll | 2 +- .../InstCombine/2008-05-08-StrLenSink.ll | 2 +- .../InstCombine/2008-06-08-ICmpPHI.ll | 16 +-- .../InstCombine/2009-01-08-AlignAlloca.ll | 2 +- ...2009-01-19-fmod-constant-float-specials.ll | 32 ++--- .../InstCombine/2010-05-30-memcpy-Struct.ll | 2 +- .../Transforms/InstCombine/2012-02-13-FCmp.ll | 4 +- test/Transforms/InstCombine/alloca.ll | 12 +- test/Transforms/InstCombine/call.ll | 2 +- test/Transforms/InstCombine/call2.ll | 2 +- test/Transforms/InstCombine/cast.ll | 4 +- test/Transforms/InstCombine/debug-line.ll | 2 +- test/Transforms/InstCombine/err-rep-cold.ll | 4 +- test/Transforms/InstCombine/fprintf-1.ll | 22 +-- test/Transforms/InstCombine/gc.relocate.ll | 2 +- test/Transforms/InstCombine/getelementptr.ll | 6 +- test/Transforms/InstCombine/osx-names.ll | 4 +- test/Transforms/InstCombine/pr2996.ll | 2 +- test/Transforms/InstCombine/pr8547.ll | 2 +- test/Transforms/InstCombine/printf-1.ll | 28 ++-- test/Transforms/InstCombine/printf-2.ll | 6 +- .../InstCombine/simplify-libcalls.ll | 2 +- test/Transforms/InstCombine/sprintf-1.ll | 22 +-- test/Transforms/InstCombine/sqrt.ll | 2 +- test/Transforms/InstCombine/srem1.ll | 2 +- test/Transforms/InstCombine/statepoint.ll | 8 +- .../InstCombine/urem-simplify-bug.ll | 2 +- test/Transforms/InstSimplify/undef.ll | 2 +- .../JumpThreading/2010-08-26-and.ll | 2 +- test/Transforms/JumpThreading/assume.ll | 8 +- test/Transforms/JumpThreading/indirectbr.ll | 6 +- test/Transforms/JumpThreading/thread-loads.ll | 8 +- test/Transforms/LICM/2011-04-09-RAUW-AST.ll | 2 +- .../Transforms/LoopInterchange/interchange.ll | 2 +- test/Transforms/LoopRotate/PhiRename-1.ll | 2 +- .../2008-08-13-CmpStride.ll | 2 +- .../LoopStrengthReduce/2008-09-09-Overflow.ll | 2 +- ...9-01-13-nonconstant-stride-outside-loop.ll | 2 +- .../2012-07-18-LimitReassociate.ll | 14 +- .../X86/2008-08-14-ShadowIV.ll | 4 +- .../LoopStrengthReduce/X86/pr17473.ll | 2 +- .../LoopStrengthReduce/different-type-ivs.ll | 2 +- test/Transforms/LoopStrengthReduce/pr18165.ll | 2 +- .../LoopUnswitch/2008-06-02-DomInfo.ll | 2 +- .../LoopUnswitch/2008-11-03-Invariant.ll | 2 +- test/Transforms/LowerExpectIntrinsic/basic.ll | 14 +- test/Transforms/MemCpyOpt/form-memset.ll | 2 +- test/Transforms/ObjCARC/basic.ll | 40 +++--- test/Transforms/ObjCARC/contract.ll | 2 +- ...e-that-exception-unwind-path-is-visited.ll | 6 +- .../ObjCARC/intrinsic-use-isolated.ll | 2 +- test/Transforms/ObjCARC/intrinsic-use.ll | 16 +-- test/Transforms/PhaseOrdering/PR6627.ll | 4 +- test/Transforms/PlaceSafepoints/basic.ll | 2 +- test/Transforms/Reassociate/looptest.ll | 2 +- .../base-pointers-1.ll | 2 +- .../base-pointers-10.ll | 2 +- .../base-pointers-11.ll | 2 +- .../base-pointers-2.ll | 2 +- .../base-pointers-3.ll | 2 +- .../base-pointers-4.ll | 8 +- .../base-pointers-5.ll | 2 +- .../base-pointers-6.ll | 2 +- .../base-pointers-7.ll | 2 +- .../base-pointers-8.ll | 2 +- .../base-pointers-9.ll | 2 +- .../RewriteStatepointsForGC/base-pointers.ll | 6 +- .../RewriteStatepointsForGC/basics.ll | 14 +- .../RewriteStatepointsForGC/live-vector.ll | 6 +- .../liveness-basics.ll | 24 ++-- .../RewriteStatepointsForGC/preprocess.ll | 10 +- .../relocate_invoke_result.ll | 2 +- .../RewriteStatepointsForGC/relocation.ll | 34 ++--- .../SCCP/2009-05-27-VectorOperandZero.ll | 2 +- test/Transforms/SCCP/retvalue-undef.ll | 2 +- .../SLPVectorizer/X86/barriercall.ll | 2 +- .../SLPVectorizer/X86/compare-reduce.ll | 2 +- .../SLPVectorizer/X86/cross_block_slp.ll | 2 +- .../SLPVectorizer/X86/in-tree-user.ll | 2 +- .../SLPVectorizer/X86/multi_block.ll | 2 +- test/Transforms/SLPVectorizer/X86/pr16628.ll | 2 +- test/Transforms/SampleProfile/branch.ll | 2 +- test/Transforms/SampleProfile/calls.ll | 2 +- test/Transforms/SampleProfile/fnptr.ll | 2 +- test/Transforms/SampleProfile/propagate.ll | 2 +- test/Transforms/ScalarRepl/inline-vector.ll | 2 +- .../Transforms/ScalarRepl/only-memcpy-uses.ll | 2 +- test/Transforms/ScalarRepl/phi-cycle.ll | 4 +- .../SimplifyCFG/2007-12-21-Crash.ll | 4 +- .../2008-07-13-InfLoopMiscompile.ll | 2 +- .../SimplifyCFG/2008-12-16-DCECond.ll | 8 +- .../SimplifyCFG/common-dest-folding.ll | 4 +- test/Transforms/SimplifyCFG/hoist-dbgvalue.ll | 6 +- .../SimplifyCFG/volatile-phioper.ll | 4 +- .../TailDup/2008-06-11-AvoidDupLoopHeader.ll | 2 +- test/Verifier/2008-01-11-VarargAttrs.ll | 2 +- test/Verifier/frameescape.ll | 10 +- test/Verifier/inalloca-vararg.ll | 2 +- test/Verifier/invalid-statepoint.ll | 2 +- test/Verifier/invalid-statepoint2.ll | 2 +- test/Verifier/musttail-invalid.ll | 2 +- test/Verifier/musttail-valid.ll | 6 +- test/Verifier/statepoint.ll | 4 +- test/Verifier/varargs-intrinsic.ll | 2 +- 560 files changed, 1498 insertions(+), 1503 deletions(-) diff --git a/include/llvm/IR/Instructions.h b/include/llvm/IR/Instructions.h index e0a368a8d4d..1f2ca301d24 100644 --- a/include/llvm/IR/Instructions.h +++ b/include/llvm/IR/Instructions.h @@ -1337,6 +1337,10 @@ public: ~CallInst() override; + Type *getFunctionType() const { + return cast(getCalledValue()->getType())->getElementType(); + } + // Note that 'musttail' implies 'tail'. enum TailCallKind { TCK_None = 0, TCK_Tail = 1, TCK_MustTail = 2 }; TailCallKind getTailCallKind() const { diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 2b306dbd642..546363b9cb1 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -5160,10 +5160,8 @@ bool LLParser::ParseCall(Instruction *&Inst, PerFunctionState &PFS, // If RetType is a non-function pointer type, then this is the short syntax // for the call, which means that RetType is just the return type. Infer the // rest of the function argument types from the arguments that are present. - PointerType *PFTy = nullptr; - FunctionType *Ty = nullptr; - if (!(PFTy = dyn_cast(RetType)) || - !(Ty = dyn_cast(PFTy->getElementType()))) { + FunctionType *Ty = dyn_cast(RetType); + if (!Ty) { // Pull out the types of all of the arguments... std::vector ParamTypes; for (unsigned i = 0, e = ArgList.size(); i != e; ++i) @@ -5173,12 +5171,12 @@ bool LLParser::ParseCall(Instruction *&Inst, PerFunctionState &PFS, return Error(RetTypeLoc, "Invalid result type for LLVM function"); Ty = FunctionType::get(RetType, ParamTypes, false); - PFTy = PointerType::getUnqual(Ty); } // Look up the callee. Value *Callee; - if (ConvertValIDToValue(PFTy, CalleeID, Callee, &PFS)) return true; + if (ConvertValIDToValue(PointerType::getUnqual(Ty), CalleeID, Callee, &PFS)) + return true; // Set up the Attribute for the function. SmallVector Attrs; diff --git a/lib/IR/AsmWriter.cpp b/lib/IR/AsmWriter.cpp index d314727c4ea..48737b5796e 100644 --- a/lib/IR/AsmWriter.cpp +++ b/lib/IR/AsmWriter.cpp @@ -2781,8 +2781,7 @@ void AssemblyWriter::printInstruction(const Instruction &I) { } Operand = CI->getCalledValue(); - PointerType *PTy = cast(Operand->getType()); - FunctionType *FTy = cast(PTy->getElementType()); + FunctionType *FTy = cast(CI->getFunctionType()); Type *RetTy = FTy->getReturnType(); const AttributeSet &PAL = CI->getAttributes(); @@ -2794,15 +2793,9 @@ void AssemblyWriter::printInstruction(const Instruction &I) { // and if the return type is not a pointer to a function. // Out << ' '; - if (!FTy->isVarArg() && - (!RetTy->isPointerTy() || - !cast(RetTy)->getElementType()->isFunctionTy())) { - TypePrinter.print(RetTy, Out); - Out << ' '; - writeOperand(Operand, false); - } else { - writeOperand(Operand, true); - } + TypePrinter.print(FTy->isVarArg() ? FTy : RetTy, Out); + Out << ' '; + writeOperand(Operand, false); Out << '('; for (unsigned op = 0, Eop = CI->getNumArgOperands(); op < Eop; ++op) { if (op > 0) diff --git a/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll b/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll index eb05e1edd75..98161bff927 100644 --- a/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll +++ b/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll @@ -26,7 +26,7 @@ no_exit: ; preds = %no_exit, %entry loopexit: ; preds = %no_exit, %entry %Y.0.1 = phi i32 [ 0, %entry ], [ %tmp.13, %no_exit ] ; [#uses=1] %tmp.4 = getelementptr [3 x [3 x i32]], [3 x [3 x i32]]* %X, i32 0, i32 0 ; <[3 x i32]*> [#uses=1] - %tmp.15 = call i32 (...)* @foo( [3 x i32]* %tmp.4, i32 %Y.0.1 ) ; [#uses=0] + %tmp.15 = call i32 (...) @foo( [3 x i32]* %tmp.4, i32 %Y.0.1 ) ; [#uses=0] ret void } diff --git a/test/Analysis/BasicAA/2008-04-15-Byval.ll b/test/Analysis/BasicAA/2008-04-15-Byval.ll index 9df12bdd570..9d4fd148318 100644 --- a/test/Analysis/BasicAA/2008-04-15-Byval.ll +++ b/test/Analysis/BasicAA/2008-04-15-Byval.ll @@ -10,7 +10,7 @@ entry: %tmp = getelementptr %struct.x, %struct.x* %X, i32 0, i32 0 ; <[4 x i32]*> [#uses=1] %tmp1 = getelementptr [4 x i32], [4 x i32]* %tmp, i32 0, i32 3 ; [#uses=1] store i32 2, i32* %tmp1, align 4 - %tmp2 = call i32 (...)* @bar( %struct.x* byval align 4 %X ) nounwind ; [#uses=0] + %tmp2 = call i32 (...) @bar( %struct.x* byval align 4 %X ) nounwind ; [#uses=0] br label %return return: ; preds = %entry ret void diff --git a/test/Analysis/BasicAA/byval.ll b/test/Analysis/BasicAA/byval.ll index edbe7b33de1..4f90c3f4d26 100644 --- a/test/Analysis/BasicAA/byval.ll +++ b/test/Analysis/BasicAA/byval.ll @@ -6,7 +6,7 @@ target triple = "i686-apple-darwin8" define i32 @foo(%struct.x* byval %a) nounwind { ; CHECK: ret i32 1 - %tmp1 = tail call i32 (...)* @bar( %struct.x* %a ) nounwind ; [#uses=0] + %tmp1 = tail call i32 (...) @bar( %struct.x* %a ) nounwind ; [#uses=0] %tmp2 = getelementptr %struct.x, %struct.x* %a, i32 0, i32 0 ; [#uses=2] store i32 1, i32* %tmp2, align 4 store i32 2, i32* @g, align 4 diff --git a/test/Analysis/BlockFrequencyInfo/loops_with_profile_info.ll b/test/Analysis/BlockFrequencyInfo/loops_with_profile_info.ll index e5e3f64b649..534c4ad0e94 100644 --- a/test/Analysis/BlockFrequencyInfo/loops_with_profile_info.ll +++ b/test/Analysis/BlockFrequencyInfo/loops_with_profile_info.ll @@ -124,7 +124,7 @@ for.inc10: ; preds = %for.end9 for.end12: ; preds = %for.cond %6 = load i32, i32* @g, align 4 - %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str, i32 0, i32 0), i32 %6) + %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str, i32 0, i32 0), i32 %6) store i32 0, i32* @g, align 4 store i32 0, i32* %i, align 4 br label %for.cond13 @@ -165,7 +165,7 @@ for.inc22: ; preds = %for.end21 for.end24: ; preds = %for.cond13 %11 = load i32, i32* @g, align 4 - %call25 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str, i32 0, i32 0), i32 %11) + %call25 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str, i32 0, i32 0), i32 %11) store i32 0, i32* @g, align 4 store i32 0, i32* %i, align 4 br label %for.cond26 @@ -188,7 +188,7 @@ for.inc29: ; preds = %for.body28 for.end31: ; preds = %for.cond26 %14 = load i32, i32* @g, align 4 - %call32 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str, i32 0, i32 0), i32 %14) + %call32 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str, i32 0, i32 0), i32 %14) store i32 0, i32* @g, align 4 %15 = load i32, i32* %retval ret i32 %15 diff --git a/test/Analysis/CallGraph/2008-09-09-DirectCall.ll b/test/Analysis/CallGraph/2008-09-09-DirectCall.ll index 595cc427c45..56eac49c168 100644 --- a/test/Analysis/CallGraph/2008-09-09-DirectCall.ll +++ b/test/Analysis/CallGraph/2008-09-09-DirectCall.ll @@ -12,6 +12,6 @@ entry: define void @caller() { entry: - call void (...)* @callee( void (...)* @callee ) + call void (...) @callee( void (...)* @callee ) unreachable } diff --git a/test/Analysis/GlobalsModRef/volatile-instrs.ll b/test/Analysis/GlobalsModRef/volatile-instrs.ll index a331bf370c0..5dd47bca3a0 100644 --- a/test/Analysis/GlobalsModRef/volatile-instrs.ll +++ b/test/Analysis/GlobalsModRef/volatile-instrs.ll @@ -25,6 +25,6 @@ main_entry: %0 = load volatile i32, i32* getelementptr inbounds (%struct.anon, %struct.anon* @b, i64 0, i32 0), align 4 store i32 %0, i32* @c, align 4 tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* bitcast (%struct.anon* @b to i8*), i8* bitcast (%struct.anon* @a to i8*), i64 12, i32 4, i1 false) nounwind - %call = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32 %0) nounwind + %call = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32 %0) nounwind ret i32 0 } diff --git a/test/Analysis/LazyCallGraph/basic.ll b/test/Analysis/LazyCallGraph/basic.ll index 6e2cb905c37..7c13d2bef39 100644 --- a/test/Analysis/LazyCallGraph/basic.ll +++ b/test/Analysis/LazyCallGraph/basic.ll @@ -90,7 +90,7 @@ next: select i1 true, void ()* @f3, void ()* @f4 store void ()* @f5, void ()** %x call void @f6() - call void (void ()*, void ()*)* bitcast (void ()* @f7 to void (void ()*, void ()*)*)(void ()* @f8, void ()* @f9) + call void (void ()*, void ()*) bitcast (void ()* @f7 to void (void ()*, void ()*)*)(void ()* @f8, void ()* @f9) invoke void @f10() to label %exit unwind label %unwind exit: diff --git a/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll b/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll index 46c6c59e92c..84561c5c6dc 100644 --- a/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll +++ b/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll @@ -13,7 +13,7 @@ bb.nph: ; preds = %entry bb: ; preds = %bb.nph, %bb1 %indvar = phi i32 [ 0, %bb.nph ], [ %indvar.next, %bb1 ] ; [#uses=2] %argc_addr.04 = add i32 %indvar, %argc ; [#uses=1] - tail call void (...)* @Test() nounwind + tail call void (...) @Test() nounwind %1 = add i32 %argc_addr.04, 1 ; [#uses=1] br label %bb1 diff --git a/test/Analysis/ScalarEvolution/2012-03-26-LoadConstant.ll b/test/Analysis/ScalarEvolution/2012-03-26-LoadConstant.ll index c4a4c3006dd..33fcbab9291 100644 --- a/test/Analysis/ScalarEvolution/2012-03-26-LoadConstant.ll +++ b/test/Analysis/ScalarEvolution/2012-03-26-LoadConstant.ll @@ -14,7 +14,7 @@ entry: br label %lbl_818 lbl_818: ; preds = %for.end, %entry - call void (...)* @func_27() + call void (...) @func_27() store i32 0, i32* @g_814, align 4 br label %for.cond diff --git a/test/Analysis/ScalarEvolution/max-trip-count.ll b/test/Analysis/ScalarEvolution/max-trip-count.ll index 72560c77a8e..614e9b265ab 100644 --- a/test/Analysis/ScalarEvolution/max-trip-count.ll +++ b/test/Analysis/ScalarEvolution/max-trip-count.ll @@ -65,7 +65,7 @@ for.inc: ; preds = %for.body br label %for.cond for.end: ; preds = %for.body, %for.cond - %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32 %g_4.0) nounwind ; [#uses=0] + %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32 %g_4.0) nounwind ; [#uses=0] ret i32 0 } diff --git a/test/Analysis/ScalarEvolution/zext-signed-addrec.ll b/test/Analysis/ScalarEvolution/zext-signed-addrec.ll index 31ebb3e3efe..2b12b33158f 100644 --- a/test/Analysis/ScalarEvolution/zext-signed-addrec.ll +++ b/test/Analysis/ScalarEvolution/zext-signed-addrec.ll @@ -63,7 +63,7 @@ for.cond.for.end9_crit_edge: ; preds = %for.inc8 for.end9: ; preds = %entry.for.end9_crit_edge, %for.cond.for.end9_crit_edge %3 = phi i32 [ %.pre, %entry.for.end9_crit_edge ], [ %shl, %for.cond.for.end9_crit_edge ] - %call = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32 %3) #2 + %call = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32 %3) #2 br label %return return.loopexit.split: ; preds = %for.cond1.preheader.lr.ph diff --git a/test/Analysis/ValueTracking/memory-dereferenceable.ll b/test/Analysis/ValueTracking/memory-dereferenceable.ll index 76d302ae4c6..bfee5c78df6 100644 --- a/test/Analysis/ValueTracking/memory-dereferenceable.ll +++ b/test/Analysis/ValueTracking/memory-dereferenceable.ll @@ -22,7 +22,7 @@ entry: %alloca = alloca i1 %load2 = load i1, i1* %alloca %load3 = load i32, i32 addrspace(1)* %dparam - %tok = tail call i32 (i1 ()*, i32, i32, ...)* @llvm.experimental.gc.statepoint.p0f_i1f(i1 ()* @return_i1, i32 0, i32 0, i32 0, i32 addrspace(1)* %dparam) + %tok = tail call i32 (i1 ()*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_i1f(i1 ()* @return_i1, i32 0, i32 0, i32 0, i32 addrspace(1)* %dparam) %relocate = call i32 addrspace(1)* @llvm.experimental.gc.relocate.p1i32(i32 %tok, i32 4, i32 4) %load4 = load i32, i32 addrspace(1)* %relocate %nparam = getelementptr i32, i32 addrspace(1)* %dparam, i32 5 diff --git a/test/Assembler/2002-07-25-ReturnPtrFunction.ll b/test/Assembler/2002-07-25-ReturnPtrFunction.ll index fdee93c1ca7..0fb9d55faed 100644 --- a/test/Assembler/2002-07-25-ReturnPtrFunction.ll +++ b/test/Assembler/2002-07-25-ReturnPtrFunction.ll @@ -7,7 +7,7 @@ declare void (i32)* @foo() define void @test() { - call void (i32)* ()* @foo( ) ; <%ty*>:1 [#uses=0] + call void (i32)* () @foo( ) ; <%ty*>:1 [#uses=0] ret void } diff --git a/test/Assembler/2003-05-15-AssemblerProblem.ll b/test/Assembler/2003-05-15-AssemblerProblem.ll index eba26a2093e..70c9617ef1c 100644 --- a/test/Assembler/2003-05-15-AssemblerProblem.ll +++ b/test/Assembler/2003-05-15-AssemblerProblem.ll @@ -4,12 +4,12 @@ ; RUN: verify-uselistorder %s define void @test() { - call void (...)* bitcast (void (i16*, i32)* @AddString to void (...)*)( i16* null, i32 0 ) + call void (...) bitcast (void (i16*, i32)* @AddString to void (...)*)( i16* null, i32 0 ) ret void } define void @AddString(i16* %tmp.124, i32 %tmp.127) { - call void (...)* bitcast (void (i16*, i32)* @AddString to void (...)*)( i16* %tmp.124, i32 %tmp.127 ) + call void (...) bitcast (void (i16*, i32)* @AddString to void (...)*)( i16* %tmp.124, i32 %tmp.127 ) ret void } diff --git a/test/Assembler/2008-01-11-VarargAttrs.ll b/test/Assembler/2008-01-11-VarargAttrs.ll index 0b6592c6942..3111f2d3216 100644 --- a/test/Assembler/2008-01-11-VarargAttrs.ll +++ b/test/Assembler/2008-01-11-VarargAttrs.ll @@ -6,6 +6,6 @@ declare void @foo(...) define void @bar() { - call void (...)* @foo(%struct* byval null ) + call void (...) @foo(%struct* byval null ) ret void } diff --git a/test/Assembler/musttail-invalid-1.ll b/test/Assembler/musttail-invalid-1.ll index b123a9151d3..e9141c813df 100644 --- a/test/Assembler/musttail-invalid-1.ll +++ b/test/Assembler/musttail-invalid-1.ll @@ -8,7 +8,7 @@ declare i8* @f(i8*, ...) define i8* @f_thunk(i8* %this) { - %rv = musttail call i8* (i8*, ...)* @f(i8* %this, ...) + %rv = musttail call i8* (i8*, ...) @f(i8* %this, ...) ; CHECK: error: unexpected ellipsis in argument list for musttail call in non-varargs function ret i8* %rv } diff --git a/test/Assembler/musttail-invalid-2.ll b/test/Assembler/musttail-invalid-2.ll index 3bcb51fc485..8602afd3d2c 100644 --- a/test/Assembler/musttail-invalid-2.ll +++ b/test/Assembler/musttail-invalid-2.ll @@ -7,7 +7,7 @@ declare i8* @f(i8*, ...) define i8* @f_thunk(i8* %this, ...) { - %rv = musttail call i8* (i8*, ...)* @f(i8* %this) + %rv = musttail call i8* (i8*, ...) @f(i8* %this) ; CHECK: error: expected '...' at end of argument list for musttail call in varargs function ret i8* %rv } diff --git a/test/Assembler/musttail.ll b/test/Assembler/musttail.ll index 6e2a9b2ef32..ac60ba2d02f 100644 --- a/test/Assembler/musttail.ll +++ b/test/Assembler/musttail.ll @@ -7,8 +7,8 @@ declare i8* @f(i8*, ...) define i8* @f_thunk(i8* %this, ...) { - %rv = musttail call i8* (i8*, ...)* @f(i8* %this, ...) + %rv = musttail call i8* (i8*, ...) @f(i8* %this, ...) ret i8* %rv } ; CHECK-LABEL: define i8* @f_thunk(i8* %this, ...) -; CHECK: %rv = musttail call i8* (i8*, ...)* @f(i8* %this, ...) +; CHECK: %rv = musttail call i8* (i8*, ...) @f(i8* %this, ...) diff --git a/test/Bitcode/miscInstructions.3.2.ll b/test/Bitcode/miscInstructions.3.2.ll index 6a077d5c9fa..bed26c22147 100644 --- a/test/Bitcode/miscInstructions.3.2.ll +++ b/test/Bitcode/miscInstructions.3.2.ll @@ -173,8 +173,8 @@ entry: ; CHECK-NEXT: %res2 = tail call i32 @test(i32 %x) %res2 = tail call i32 @test(i32 %x) -; CHECK-NEXT: %res3 = call i32 (i8*, ...)* @printf(i8* %msg, i32 12, i8 42) - %res3 = call i32 (i8*, ...)* @printf(i8* %msg, i32 12, i8 42) +; CHECK-NEXT: %res3 = call i32 (i8*, ...) @printf(i8* %msg, i32 12, i8 42) + %res3 = call i32 (i8*, ...) @printf(i8* %msg, i32 12, i8 42) ret void } diff --git a/test/CodeGen/AArch64/argument-blocks.ll b/test/CodeGen/AArch64/argument-blocks.ll index f1dcfa67d0e..3169abc2dcb 100644 --- a/test/CodeGen/AArch64/argument-blocks.ll +++ b/test/CodeGen/AArch64/argument-blocks.ll @@ -64,7 +64,7 @@ define void @test_varargs_stackalign() { ; CHECK-LABEL: test_varargs_stackalign: ; CHECK-DARWINPCS: stp {{w[0-9]+}}, {{w[0-9]+}}, [sp, #16] - call void(...)* @callee([3 x float] undef, [2 x float] [float 1.0, float 2.0]) + call void(...) @callee([3 x float] undef, [2 x float] [float 1.0, float 2.0]) ret void } diff --git a/test/CodeGen/AArch64/arm64-2012-06-06-FPToUI.ll b/test/CodeGen/AArch64/arm64-2012-06-06-FPToUI.ll index 41e22e95f62..b760261f788 100644 --- a/test/CodeGen/AArch64/arm64-2012-06-06-FPToUI.ll +++ b/test/CodeGen/AArch64/arm64-2012-06-06-FPToUI.ll @@ -16,11 +16,11 @@ entry: %0 = load double, double* %d.addr, align 8 %1 = load double, double* %d.addr, align 8 %conv = fptoui double %1 to i64 - %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str, i32 0, i32 0), double %0, i64 %conv) + %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str, i32 0, i32 0), double %0, i64 %conv) %2 = load double, double* %d.addr, align 8 %3 = load double, double* %d.addr, align 8 %conv1 = fptoui double %3 to i32 - %call2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str1, i32 0, i32 0), double %2, i32 %conv1) + %call2 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str1, i32 0, i32 0), double %2, i32 %conv1) ret void } @@ -37,12 +37,12 @@ entry: %conv = fpext float %0 to double %1 = load float, float* %f.addr, align 4 %conv1 = fptoui float %1 to i64 - %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str2, i32 0, i32 0), double %conv, i64 %conv1) + %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str2, i32 0, i32 0), double %conv, i64 %conv1) %2 = load float, float* %f.addr, align 4 %conv2 = fpext float %2 to double %3 = load float, float* %f.addr, align 4 %conv3 = fptoui float %3 to i32 - %call4 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([7 x i8], [7 x i8]* @.str3, i32 0, i32 0), double %conv2, i32 %conv3) + %call4 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([7 x i8], [7 x i8]* @.str3, i32 0, i32 0), double %conv2, i32 %conv3) ret void } diff --git a/test/CodeGen/AArch64/arm64-aapcs.ll b/test/CodeGen/AArch64/arm64-aapcs.ll index 41c3ad5766c..390a3c75ff8 100644 --- a/test/CodeGen/AArch64/arm64-aapcs.ll +++ b/test/CodeGen/AArch64/arm64-aapcs.ll @@ -78,7 +78,7 @@ declare void @variadic(i32 %a, ...) ; Under AAPCS variadic functions have the same calling convention as ; others. The extra arguments should go in registers rather than on the stack. define void @test_variadic() { - call void(i32, ...)* @variadic(i32 0, i64 1, double 2.0) + call void(i32, ...) @variadic(i32 0, i64 1, double 2.0) ; CHECK: fmov d0, #2.0 ; CHECK: orr w1, wzr, #0x1 ; CHECK: bl variadic diff --git a/test/CodeGen/AArch64/arm64-abi-varargs.ll b/test/CodeGen/AArch64/arm64-abi-varargs.ll index f95fec66158..03414b56144 100644 --- a/test/CodeGen/AArch64/arm64-abi-varargs.ll +++ b/test/CodeGen/AArch64/arm64-abi-varargs.ll @@ -94,7 +94,7 @@ define i32 @main() nounwind ssp { %10 = load i32, i32* %a10, align 4 %11 = load i32, i32* %a11, align 4 %12 = load i32, i32* %a12, align 4 - call void (i32, i32, i32, i32, i32, i32, i32, i32, i32, ...)* @fn9(i32 %1, i32 %2, i32 %3, i32 %4, i32 %5, i32 %6, i32 %7, i32 %8, i32 %9, i32 %10, i32 %11, i32 %12) + call void (i32, i32, i32, i32, i32, i32, i32, i32, i32, ...) @fn9(i32 %1, i32 %2, i32 %3, i32 %4, i32 %5, i32 %6, i32 %7, i32 %8, i32 %9, i32 %10, i32 %11, i32 %12) ret i32 0 } @@ -133,7 +133,7 @@ entry: store <4 x i32> %y, <4 x i32>* %y.addr, align 16 %0 = load i32, i32* %x.addr, align 4 %1 = load <4 x i32>, <4 x i32>* %y.addr, align 16 - call void (i8*, ...)* @foo(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 %0, <4 x i32> %1) + call void (i8*, ...) @foo(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 %0, <4 x i32> %1) ret void } @@ -186,6 +186,6 @@ entry: %1 = load i32, i32* %x.addr, align 4 %2 = bitcast %struct.s41* %s41 to i128* %3 = load i128, i128* %2, align 1 - call void (i8*, ...)* @foo2(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 %1, i128 %3) + call void (i8*, ...) @foo2(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 %1, i128 %3) ret void } diff --git a/test/CodeGen/AArch64/arm64-anyregcc-crash.ll b/test/CodeGen/AArch64/arm64-anyregcc-crash.ll index 241cf974c05..56c62d5fe7d 100644 --- a/test/CodeGen/AArch64/arm64-anyregcc-crash.ll +++ b/test/CodeGen/AArch64/arm64-anyregcc-crash.ll @@ -8,7 +8,7 @@ define i64 @anyreglimit(i64 %v1, i64 %v2, i64 %v3, i64 %v4, i64 %v5, i64 %v6, i6 i64 %v17, i64 %v18, i64 %v19, i64 %v20, i64 %v21, i64 %v22, i64 %v23, i64 %v24, i64 %v25, i64 %v26, i64 %v27, i64 %v28, i64 %v29, i64 %v30, i64 %v31, i64 %v32) { entry: - %result = tail call anyregcc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 12, i32 15, i8* inttoptr (i64 0 to i8*), i32 32, + %result = tail call anyregcc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 12, i32 15, i8* inttoptr (i64 0 to i8*), i32 32, i64 %v1, i64 %v2, i64 %v3, i64 %v4, i64 %v5, i64 %v6, i64 %v7, i64 %v8, i64 %v9, i64 %v10, i64 %v11, i64 %v12, i64 %v13, i64 %v14, i64 %v15, i64 %v16, i64 %v17, i64 %v18, i64 %v19, i64 %v20, i64 %v21, i64 %v22, i64 %v23, i64 %v24, diff --git a/test/CodeGen/AArch64/arm64-anyregcc.ll b/test/CodeGen/AArch64/arm64-anyregcc.ll index e26875d52f9..2a2f4519604 100644 --- a/test/CodeGen/AArch64/arm64-anyregcc.ll +++ b/test/CodeGen/AArch64/arm64-anyregcc.ll @@ -55,7 +55,7 @@ ; CHECK-NEXT: .long 3 define i64 @test() nounwind ssp uwtable { entry: - call anyregcc void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 0, i32 16, i8* null, i32 2, i32 1, i32 2, i64 3) + call anyregcc void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 0, i32 16, i8* null, i32 2, i32 1, i32 2, i64 3) ret i64 0 } @@ -77,7 +77,7 @@ entry: define i64 @property_access1(i8* %obj) nounwind ssp uwtable { entry: %f = inttoptr i64 281474417671919 to i8* - %ret = call anyregcc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 1, i32 20, i8* %f, i32 1, i8* %obj) + %ret = call anyregcc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 1, i32 20, i8* %f, i32 1, i8* %obj) ret i64 %ret } @@ -100,7 +100,7 @@ define i64 @property_access2() nounwind ssp uwtable { entry: %obj = alloca i64, align 8 %f = inttoptr i64 281474417671919 to i8* - %ret = call anyregcc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 2, i32 20, i8* %f, i32 1, i64* %obj) + %ret = call anyregcc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 2, i32 20, i8* %f, i32 1, i64* %obj) ret i64 %ret } @@ -123,7 +123,7 @@ define i64 @property_access3() nounwind ssp uwtable { entry: %obj = alloca i64, align 8 %f = inttoptr i64 281474417671919 to i8* - %ret = call anyregcc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 3, i32 20, i8* %f, i32 0, i64* %obj) + %ret = call anyregcc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 3, i32 20, i8* %f, i32 0, i64* %obj) ret i64 %ret } @@ -205,7 +205,7 @@ entry: define i64 @anyreg_test1(i8* %a1, i8* %a2, i8* %a3, i8* %a4, i8* %a5, i8* %a6, i8* %a7, i8* %a8, i8* %a9, i8* %a10, i8* %a11, i8* %a12, i8* %a13) nounwind ssp uwtable { entry: %f = inttoptr i64 281474417671919 to i8* - %ret = call anyregcc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 4, i32 20, i8* %f, i32 13, i8* %a1, i8* %a2, i8* %a3, i8* %a4, i8* %a5, i8* %a6, i8* %a7, i8* %a8, i8* %a9, i8* %a10, i8* %a11, i8* %a12, i8* %a13) + %ret = call anyregcc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 4, i32 20, i8* %f, i32 13, i8* %a1, i8* %a2, i8* %a3, i8* %a4, i8* %a5, i8* %a6, i8* %a7, i8* %a8, i8* %a9, i8* %a10, i8* %a11, i8* %a12, i8* %a13) ret i64 %ret } @@ -287,7 +287,7 @@ entry: define i64 @anyreg_test2(i8* %a1, i8* %a2, i8* %a3, i8* %a4, i8* %a5, i8* %a6, i8* %a7, i8* %a8, i8* %a9, i8* %a10, i8* %a11, i8* %a12, i8* %a13) nounwind ssp uwtable { entry: %f = inttoptr i64 281474417671919 to i8* - %ret = call anyregcc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 5, i32 20, i8* %f, i32 8, i8* %a1, i8* %a2, i8* %a3, i8* %a4, i8* %a5, i8* %a6, i8* %a7, i8* %a8, i8* %a9, i8* %a10, i8* %a11, i8* %a12, i8* %a13) + %ret = call anyregcc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 5, i32 20, i8* %f, i32 8, i8* %a1, i8* %a2, i8* %a3, i8* %a4, i8* %a5, i8* %a6, i8* %a7, i8* %a8, i8* %a9, i8* %a10, i8* %a11, i8* %a12, i8* %a13) ret i64 %ret } @@ -315,7 +315,7 @@ entry: ; CHECK-NEXT: .long 0 define i64 @patchpoint_spilldef(i64 %p1, i64 %p2, i64 %p3, i64 %p4) { entry: - %result = tail call anyregcc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 12, i32 16, i8* inttoptr (i64 0 to i8*), i32 2, i64 %p1, i64 %p2) + %result = tail call anyregcc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 12, i32 16, i8* inttoptr (i64 0 to i8*), i32 2, i64 %p1, i64 %p2) tail call void asm sideeffect "nop", "~{x0},~{x1},~{x2},~{x3},~{x4},~{x5},~{x6},~{x7},~{x8},~{x9},~{x10},~{x11},~{x12},~{x13},~{x14},~{x15},~{x16},~{x17},~{x18},~{x19},~{x20},~{x21},~{x22},~{x23},~{x24},~{x25},~{x26},~{x27},~{x28},~{x29},~{x30},~{x31}"() nounwind ret i64 %result } @@ -355,7 +355,7 @@ entry: define i64 @patchpoint_spillargs(i64 %p1, i64 %p2, i64 %p3, i64 %p4) { entry: tail call void asm sideeffect "nop", "~{x0},~{x1},~{x2},~{x3},~{x4},~{x5},~{x6},~{x7},~{x8},~{x9},~{x10},~{x11},~{x12},~{x13},~{x14},~{x15},~{x16},~{x17},~{x18},~{x19},~{x20},~{x21},~{x22},~{x23},~{x24},~{x25},~{x26},~{x27},~{x28},~{x29},~{x30},~{x31}"() nounwind - %result = tail call anyregcc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 13, i32 16, i8* inttoptr (i64 0 to i8*), i32 2, i64 %p1, i64 %p2, i64 %p3, i64 %p4) + %result = tail call anyregcc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 13, i32 16, i8* inttoptr (i64 0 to i8*), i32 2, i64 %p1, i64 %p2, i64 %p3, i64 %p4) ret i64 %result } diff --git a/test/CodeGen/AArch64/arm64-fcopysign.ll b/test/CodeGen/AArch64/arm64-fcopysign.ll index 66241df9444..feffd41f002 100644 --- a/test/CodeGen/AArch64/arm64-fcopysign.ll +++ b/test/CodeGen/AArch64/arm64-fcopysign.ll @@ -39,7 +39,7 @@ entry: ; CHECK: fcvt s0, d0 ; CHECK: movi.4s v[[CONST:[0-9]+]], #0x80, lsl #24 ; CHECK: bit.16b v{{[0-9]+}}, v0, v[[CONST]] - %0 = tail call double (...)* @bar() nounwind + %0 = tail call double (...) @bar() nounwind %1 = fptrunc double %0 to float %2 = tail call float @copysignf(float 5.000000e-01, float %1) nounwind readnone %3 = fadd float %1, %2 diff --git a/test/CodeGen/AArch64/arm64-join-reserved.ll b/test/CodeGen/AArch64/arm64-join-reserved.ll index e99168b5eba..dee03448354 100644 --- a/test/CodeGen/AArch64/arm64-join-reserved.ll +++ b/test/CodeGen/AArch64/arm64-join-reserved.ll @@ -10,7 +10,7 @@ target triple = "arm64-apple-macosx10" ; CHECK: ret define void @g() nounwind ssp { entry: - tail call void (i32, ...)* @f(i32 0, i32 0) nounwind + tail call void (i32, ...) @f(i32 0, i32 0) nounwind ret void } diff --git a/test/CodeGen/AArch64/arm64-patchpoint-scratch-regs.ll b/test/CodeGen/AArch64/arm64-patchpoint-scratch-regs.ll index 5a740d83df3..2651f119412 100644 --- a/test/CodeGen/AArch64/arm64-patchpoint-scratch-regs.ll +++ b/test/CodeGen/AArch64/arm64-patchpoint-scratch-regs.ll @@ -9,7 +9,7 @@ define void @clobberScratch(i32* %p) { %v = load i32, i32* %p tail call void asm sideeffect "nop", "~{x0},~{x1},~{x2},~{x3},~{x4},~{x5},~{x6},~{x7},~{x8},~{x9},~{x10},~{x11},~{x12},~{x13},~{x14},~{x15},~{x18},~{x19},~{x20},~{x21},~{x22},~{x23},~{x24},~{x25},~{x26},~{x27},~{x28},~{x29},~{x30},~{x31}"() nounwind - tail call void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 5, i32 20, i8* null, i32 0, i32* %p, i32 %v) + tail call void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 5, i32 20, i8* null, i32 0, i32* %p, i32 %v) store i32 %v, i32* %p ret void } diff --git a/test/CodeGen/AArch64/arm64-patchpoint-webkit_jscc.ll b/test/CodeGen/AArch64/arm64-patchpoint-webkit_jscc.ll index 8f79f80ba33..b8236c5b247 100644 --- a/test/CodeGen/AArch64/arm64-patchpoint-webkit_jscc.ll +++ b/test/CodeGen/AArch64/arm64-patchpoint-webkit_jscc.ll @@ -23,9 +23,9 @@ entry: ; FAST-NEXT: movk x16, #0xbeef ; FAST-NEXT: blr x16 %resolveCall2 = inttoptr i64 281474417671919 to i8* - %result = tail call webkit_jscc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 5, i32 20, i8* %resolveCall2, i32 2, i64 %p4, i64 %p2) + %result = tail call webkit_jscc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 5, i32 20, i8* %resolveCall2, i32 2, i64 %p4, i64 %p2) %resolveCall3 = inttoptr i64 244837814038255 to i8* - tail call webkit_jscc void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 6, i32 20, i8* %resolveCall3, i32 2, i64 %p4, i64 %result) + tail call webkit_jscc void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 6, i32 20, i8* %resolveCall3, i32 2, i64 %p4, i64 %result) ret void } @@ -59,7 +59,7 @@ entry: ; FAST-NEXT: movk x16, #0xbeef ; FAST-NEXT: blr x16 %call = inttoptr i64 281474417671919 to i8* - %result = call webkit_jscc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 7, i32 20, i8* %call, i32 6, i64 %callee, i64 2, i64 undef, i32 4, i32 undef, i64 6) + %result = call webkit_jscc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 7, i32 20, i8* %call, i32 6, i64 %callee, i64 2, i64 undef, i32 4, i32 undef, i64 6) ret i64 %result } @@ -101,7 +101,7 @@ entry: ; FAST-NEXT: movk x16, #0xbeef ; FAST-NEXT: blr x16 %call = inttoptr i64 281474417671919 to i8* - %result = call webkit_jscc i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 7, i32 20, i8* %call, i32 10, i64 %callee, i64 2, i64 undef, i32 4, i32 undef, i64 6, i32 undef, i32 8, i32 undef, i64 10) + %result = call webkit_jscc i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 7, i32 20, i8* %call, i32 10, i64 %callee, i64 2, i64 undef, i32 4, i32 undef, i64 6, i32 undef, i32 8, i32 undef, i64 10) ret i64 %result } diff --git a/test/CodeGen/AArch64/arm64-patchpoint.ll b/test/CodeGen/AArch64/arm64-patchpoint.ll index cf066532a62..d9ec7e50ff8 100644 --- a/test/CodeGen/AArch64/arm64-patchpoint.ll +++ b/test/CodeGen/AArch64/arm64-patchpoint.ll @@ -16,9 +16,9 @@ entry: ; CHECK-NEXT: blr x16 ; CHECK: ret %resolveCall2 = inttoptr i64 244837814094590 to i8* - %result = tail call i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 2, i32 20, i8* %resolveCall2, i32 4, i64 %p1, i64 %p2, i64 %p3, i64 %p4) + %result = tail call i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 2, i32 20, i8* %resolveCall2, i32 4, i64 %p1, i64 %p2, i64 %p3, i64 %p4) %resolveCall3 = inttoptr i64 244837814094591 to i8* - tail call void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 3, i32 20, i8* %resolveCall3, i32 2, i64 %p1, i64 %result) + tail call void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 3, i32 20, i8* %resolveCall3, i32 2, i64 %p1, i64 %result) ret i64 %result } @@ -38,7 +38,7 @@ entry: store i64 11, i64* %metadata store i64 12, i64* %metadata store i64 13, i64* %metadata - call void (i64, i32, ...)* @llvm.experimental.stackmap(i64 4, i32 0, i64* %metadata) + call void (i64, i32, ...) @llvm.experimental.stackmap(i64 4, i32 0, i64* %metadata) ret void } @@ -51,14 +51,14 @@ entry: %tmp80 = add i64 %tmp79, -16 %tmp81 = inttoptr i64 %tmp80 to i64* %tmp82 = load i64, i64* %tmp81, align 8 - tail call void (i64, i32, ...)* @llvm.experimental.stackmap(i64 14, i32 8, i64 %arg, i64 %tmp2, i64 %tmp10, i64 %tmp82) - tail call void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 15, i32 32, i8* null, i32 3, i64 %arg, i64 %tmp10, i64 %tmp82) + tail call void (i64, i32, ...) @llvm.experimental.stackmap(i64 14, i32 8, i64 %arg, i64 %tmp2, i64 %tmp10, i64 %tmp82) + tail call void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 15, i32 32, i8* null, i32 3, i64 %arg, i64 %tmp10, i64 %tmp82) %tmp83 = load i64, i64* %tmp33, align 8 %tmp84 = add i64 %tmp83, -24 %tmp85 = inttoptr i64 %tmp84 to i64* %tmp86 = load i64, i64* %tmp85, align 8 - tail call void (i64, i32, ...)* @llvm.experimental.stackmap(i64 17, i32 8, i64 %arg, i64 %tmp10, i64 %tmp86) - tail call void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 18, i32 32, i8* null, i32 3, i64 %arg, i64 %tmp10, i64 %tmp86) + tail call void (i64, i32, ...) @llvm.experimental.stackmap(i64 17, i32 8, i64 %arg, i64 %tmp10, i64 %tmp86) + tail call void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 18, i32 32, i8* null, i32 3, i64 %arg, i64 %tmp10, i64 %tmp86) ret i64 10 } @@ -74,7 +74,7 @@ entry: ; CHECK-NEXT: nop ; CHECK-NEXT: ldp ; CHECK-NEXT: ret - %result = tail call i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 5, i32 20, i8* null, i32 2, i64 %p1, i64 %p2) + %result = tail call i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 5, i32 20, i8* null, i32 2, i64 %p1, i64 %p2) ret void } diff --git a/test/CodeGen/AArch64/arm64-stackmap-nops.ll b/test/CodeGen/AArch64/arm64-stackmap-nops.ll index 5915b64edf0..2647ac44296 100644 --- a/test/CodeGen/AArch64/arm64-stackmap-nops.ll +++ b/test/CodeGen/AArch64/arm64-stackmap-nops.ll @@ -8,7 +8,7 @@ entry: ; CHECK: nop ; CHECK-NEXT: nop ; CHECK-NOT: nop - tail call void (i64, i32, ...)* @llvm.experimental.stackmap(i64 0, i32 16) + tail call void (i64, i32, ...) @llvm.experimental.stackmap(i64 0, i32 16) ret void } diff --git a/test/CodeGen/AArch64/arm64-stackmap.ll b/test/CodeGen/AArch64/arm64-stackmap.ll index 29e44846035..1a4df7a6f2d 100644 --- a/test/CodeGen/AArch64/arm64-stackmap.ll +++ b/test/CodeGen/AArch64/arm64-stackmap.ll @@ -78,7 +78,7 @@ target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" define void @constantargs() { entry: %0 = inttoptr i64 244837814094590 to i8* - tail call void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 1, i32 20, i8* %0, i32 0, i64 65535, i64 65536, i64 4294967295, i64 4294967296) + tail call void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 1, i32 20, i8* %0, i32 0, i64 65535, i64 65536, i64 4294967295, i64 4294967296) ret void } @@ -100,7 +100,7 @@ entry: ; Runtime void->void call. call void inttoptr (i64 244837814094590 to void ()*)() ; Followed by inline OSR patchpoint with 12-byte shadow and 2 live vars. - call void (i64, i32, ...)* @llvm.experimental.stackmap(i64 3, i32 12, i64 %a, i64 %b) + call void (i64, i32, ...) @llvm.experimental.stackmap(i64 3, i32 12, i64 %a, i64 %b) ret void } @@ -126,7 +126,7 @@ entry: cold: ; OSR patchpoint with 12-byte nop-slide and 2 live vars. %thunk = inttoptr i64 244837814094590 to i8* - call void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 4, i32 20, i8* %thunk, i32 0, i64 %a, i64 %b) + call void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 4, i32 20, i8* %thunk, i32 0, i64 %a, i64 %b) unreachable ret: ret void @@ -142,7 +142,7 @@ ret: define i64 @propertyRead(i64* %obj) { entry: %resolveRead = inttoptr i64 244837814094590 to i8* - %result = call i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 5, i32 20, i8* %resolveRead, i32 1, i64* %obj) + %result = call i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 5, i32 20, i8* %resolveRead, i32 1, i64* %obj) %add = add i64 %result, 3 ret i64 %add } @@ -162,7 +162,7 @@ entry: define void @propertyWrite(i64 %dummy1, i64* %obj, i64 %dummy2, i64 %a) { entry: %resolveWrite = inttoptr i64 244837814094590 to i8* - call anyregcc void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 6, i32 20, i8* %resolveWrite, i32 2, i64* %obj, i64 %a) + call anyregcc void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 6, i32 20, i8* %resolveWrite, i32 2, i64* %obj, i64 %a) ret void } @@ -184,7 +184,7 @@ entry: define void @jsVoidCall(i64 %dummy1, i64* %obj, i64 %arg, i64 %l1, i64 %l2) { entry: %resolveCall = inttoptr i64 244837814094590 to i8* - call void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 7, i32 20, i8* %resolveCall, i32 2, i64* %obj, i64 %arg, i64 %l1, i64 %l2) + call void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 7, i32 20, i8* %resolveCall, i32 2, i64* %obj, i64 %arg, i64 %l1, i64 %l2) ret void } @@ -206,7 +206,7 @@ entry: define i64 @jsIntCall(i64 %dummy1, i64* %obj, i64 %arg, i64 %l1, i64 %l2) { entry: %resolveCall = inttoptr i64 244837814094590 to i8* - %result = call i64 (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.i64(i64 8, i32 20, i8* %resolveCall, i32 2, i64* %obj, i64 %arg, i64 %l1, i64 %l2) + %result = call i64 (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.i64(i64 8, i32 20, i8* %resolveCall, i32 2, i64* %obj, i64 %arg, i64 %l1, i64 %l2) %add = add i64 %result, 3 ret i64 %add } @@ -226,7 +226,7 @@ entry: ; CHECK-NEXT: .short 29 define void @spilledValue(i64 %arg0, i64 %arg1, i64 %arg2, i64 %arg3, i64 %arg4, i64 %l0, i64 %l1, i64 %l2, i64 %l3, i64 %l4, i64 %l5, i64 %l6, i64 %l7, i64 %l8, i64 %l9, i64 %l10, i64 %l11, i64 %l12, i64 %l13, i64 %l14, i64 %l15, i64 %l16, i64 %l17, i64 %l18, i64 %l19, i64 %l20, i64 %l21, i64 %l22, i64 %l23, i64 %l24, i64 %l25, i64 %l26, i64 %l27) { entry: - call void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 11, i32 20, i8* null, i32 5, i64 %arg0, i64 %arg1, i64 %arg2, i64 %arg3, i64 %arg4, i64 %l0, i64 %l1, i64 %l2, i64 %l3, i64 %l4, i64 %l5, i64 %l6, i64 %l7, i64 %l8, i64 %l9, i64 %l10, i64 %l11, i64 %l12, i64 %l13, i64 %l14, i64 %l15, i64 %l16, i64 %l17, i64 %l18, i64 %l19, i64 %l20, i64 %l21, i64 %l22, i64 %l23, i64 %l24, i64 %l25, i64 %l26, i64 %l27) + call void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 11, i32 20, i8* null, i32 5, i64 %arg0, i64 %arg1, i64 %arg2, i64 %arg3, i64 %arg4, i64 %l0, i64 %l1, i64 %l2, i64 %l3, i64 %l4, i64 %l5, i64 %l6, i64 %l7, i64 %l8, i64 %l9, i64 %l10, i64 %l11, i64 %l12, i64 %l13, i64 %l14, i64 %l15, i64 %l16, i64 %l17, i64 %l18, i64 %l19, i64 %l20, i64 %l21, i64 %l22, i64 %l23, i64 %l24, i64 %l25, i64 %l26, i64 %l27) ret void } @@ -245,7 +245,7 @@ entry: ; CHECK-NEXT: .short 29 define webkit_jscc void @spilledStackMapValue(i64 %l0, i64 %l1, i64 %l2, i64 %l3, i64 %l4, i64 %l5, i64 %l6, i64 %l7, i64 %l8, i64 %l9, i64 %l10, i64 %l11, i64 %l12, i64 %l13, i64 %l14, i64 %l15, i64 %l16, i64 %l17, i64 %l18, i64 %l19, i64 %l20, i64 %l21, i64 %l22, i64 %l23, i64 %l24, i64 %l25, i64 %l26, i64 %l27, i64 %l28, i64 %l29) { entry: - call void (i64, i32, ...)* @llvm.experimental.stackmap(i64 12, i32 16, i64 %l0, i64 %l1, i64 %l2, i64 %l3, i64 %l4, i64 %l5, i64 %l6, i64 %l7, i64 %l8, i64 %l9, i64 %l10, i64 %l11, i64 %l12, i64 %l13, i64 %l14, i64 %l15, i64 %l16, i64 %l17, i64 %l18, i64 %l19, i64 %l20, i64 %l21, i64 %l22, i64 %l23, i64 %l24, i64 %l25, i64 %l26, i64 %l27, i64 %l28, i64 %l29) + call void (i64, i32, ...) @llvm.experimental.stackmap(i64 12, i32 16, i64 %l0, i64 %l1, i64 %l2, i64 %l3, i64 %l4, i64 %l5, i64 %l6, i64 %l7, i64 %l8, i64 %l9, i64 %l10, i64 %l11, i64 %l12, i64 %l13, i64 %l14, i64 %l15, i64 %l16, i64 %l17, i64 %l18, i64 %l19, i64 %l20, i64 %l21, i64 %l22, i64 %l23, i64 %l24, i64 %l25, i64 %l26, i64 %l27, i64 %l28, i64 %l29) ret void } @@ -263,7 +263,7 @@ entry: ; CHECK-NEXT: .long 33 define void @liveConstant() { - tail call void (i64, i32, ...)* @llvm.experimental.stackmap(i64 15, i32 8, i32 33) + tail call void (i64, i32, ...) @llvm.experimental.stackmap(i64 15, i32 8, i32 33) ret void } @@ -280,7 +280,7 @@ define void @liveConstant() { ; CHECK-NEXT: .long -{{[0-9]+}} define void @clobberLR(i32 %a) { tail call void asm sideeffect "nop", "~{x0},~{x1},~{x2},~{x3},~{x4},~{x5},~{x6},~{x7},~{x8},~{x9},~{x10},~{x11},~{x12},~{x13},~{x14},~{x15},~{x16},~{x17},~{x18},~{x19},~{x20},~{x21},~{x22},~{x23},~{x24},~{x25},~{x26},~{x27},~{x28},~{x29},~{x31}"() nounwind - tail call void (i64, i32, ...)* @llvm.experimental.stackmap(i64 16, i32 8, i32 %a) + tail call void (i64, i32, ...) @llvm.experimental.stackmap(i64 16, i32 8, i32 %a) ret void } diff --git a/test/CodeGen/AArch64/br-to-eh-lpad.ll b/test/CodeGen/AArch64/br-to-eh-lpad.ll index e948b87a63d..f304ba4ca28 100644 --- a/test/CodeGen/AArch64/br-to-eh-lpad.ll +++ b/test/CodeGen/AArch64/br-to-eh-lpad.ll @@ -30,12 +30,12 @@ invoke.cont7: unreachable if.end50.thread: - tail call void (i8*, ...)* @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str1, i64 0, i64 0), i32 125) - tail call void (i8*, ...)* @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str1, i64 0, i64 0), i32 128) + tail call void (i8*, ...) @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str1, i64 0, i64 0), i32 125) + tail call void (i8*, ...) @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str1, i64 0, i64 0), i32 128) unreachable invoke.cont33: - tail call void (i8*, ...)* @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str1, i64 0, i64 0), i32 119) + tail call void (i8*, ...) @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str1, i64 0, i64 0), i32 119) unreachable invoke.cont41: @@ -51,7 +51,7 @@ lpad40: br label %finally.catchall finally.catchall: - tail call void (i8*, ...)* @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str1, i64 0, i64 0), i32 125) + tail call void (i8*, ...) @printf(i8* getelementptr inbounds ([17 x i8], [17 x i8]* @.str1, i64 0, i64 0), i32 125) unreachable } diff --git a/test/CodeGen/AArch64/dag-combine-invaraints.ll b/test/CodeGen/AArch64/dag-combine-invaraints.ll index 36141331633..ac2d057ff3c 100644 --- a/test/CodeGen/AArch64/dag-combine-invaraints.ll +++ b/test/CodeGen/AArch64/dag-combine-invaraints.ll @@ -20,7 +20,7 @@ main_: %DHSelect = select i1 %tmp8, i32 %tmp9, i32 %tmp10 store i32 %DHSelect, i32* %i32X, align 4 %tmp15 = load i32, i32* %i32X, align 4 - %tmp17 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str2, i32 0, i32 0), i32 %tmp15) + %tmp17 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str2, i32 0, i32 0), i32 %tmp15) ret i32 0 ; CHECK: main: diff --git a/test/CodeGen/AArch64/stackmap-liveness.ll b/test/CodeGen/AArch64/stackmap-liveness.ll index 91dcbb20cd8..6b37aac16f9 100644 --- a/test/CodeGen/AArch64/stackmap-liveness.ll +++ b/test/CodeGen/AArch64/stackmap-liveness.ll @@ -39,7 +39,7 @@ define i64 @stackmap_liveness(i1 %c) { ; Align ; CHECK-NEXT: .align 3 %1 = select i1 %c, i64 1, i64 2 - call anyregcc void (i64, i32, i8*, i32, ...)* @llvm.experimental.patchpoint.void(i64 1, i32 32, i8* null, i32 0) + call anyregcc void (i64, i32, i8*, i32, ...) @llvm.experimental.patchpoint.void(i64 1, i32 32, i8* null, i32 0) ret i64 %1 } diff --git a/test/CodeGen/ARM/2007-03-21-JoinIntervalsCrash.ll b/test/CodeGen/ARM/2007-03-21-JoinIntervalsCrash.ll index 0162d7f55ce..7c425961958 100644 --- a/test/CodeGen/ARM/2007-03-21-JoinIntervalsCrash.ll +++ b/test/CodeGen/ARM/2007-03-21-JoinIntervalsCrash.ll @@ -83,7 +83,7 @@ cond_next881: ; preds = %bb866 %tmp884885 = inttoptr i64 %tmp10959 to %struct.tree_identifier* ; <%struct.tree_identifier*> [#uses=1] %tmp887 = getelementptr %struct.tree_identifier, %struct.tree_identifier* %tmp884885, i32 0, i32 1, i32 0 ; [#uses=1] %tmp888 = load i8*, i8** %tmp887 ; [#uses=1] - tail call void (i32, ...)* @error( i32 undef, i8* %tmp888 ) + tail call void (i32, ...) @error( i32 undef, i8* %tmp888 ) ret void cond_true918: ; preds = %cond_false841 diff --git a/test/CodeGen/ARM/2007-04-03-PEIBug.ll b/test/CodeGen/ARM/2007-04-03-PEIBug.ll index cf5094fb380..87863bd3ec1 100644 --- a/test/CodeGen/ARM/2007-04-03-PEIBug.ll +++ b/test/CodeGen/ARM/2007-04-03-PEIBug.ll @@ -5,7 +5,7 @@ entry: %A = alloca [1123 x i32], align 16 ; <[1123 x i32]*> [#uses=1] %B = alloca [3123 x i32], align 16 ; <[3123 x i32]*> [#uses=1] %C = alloca [12312 x i32], align 16 ; <[12312 x i32]*> [#uses=1] - %tmp = call i32 (...)* @bar( [3123 x i32]* %B, [1123 x i32]* %A, [12312 x i32]* %C ) ; [#uses=0] + %tmp = call i32 (...) @bar( [3123 x i32]* %B, [1123 x i32]* %A, [12312 x i32]* %C ) ; [#uses=0] ret i32 undef } diff --git a/test/CodeGen/ARM/2007-04-03-UndefinedSymbol.ll b/test/CodeGen/ARM/2007-04-03-UndefinedSymbol.ll index b687029d62a..11f3003e05b 100644 --- a/test/CodeGen/ARM/2007-04-03-UndefinedSymbol.ll +++ b/test/CodeGen/ARM/2007-04-03-UndefinedSymbol.ll @@ -10,7 +10,7 @@ define internal void @_ZN1B1iEv(%struct.B* %this) { entry: %tmp1 = getelementptr %struct.B, %struct.B* %this, i32 0, i32 0 ; [#uses=1] %tmp2 = load i32, i32* %tmp1 ; [#uses=1] - %tmp4 = tail call i32 (i8*, ...)* @printf( i8* getelementptr ([7 x i8], [7 x i8]* @str, i32 0, i32 0), i32 %tmp2 ) ; [#uses=0] + %tmp4 = tail call i32 (i8*, ...) @printf( i8* getelementptr ([7 x i8], [7 x i8]* @str, i32 0, i32 0), i32 %tmp2 ) ; [#uses=0] ret void } @@ -20,7 +20,7 @@ define internal void @_ZN1B1jEv(%struct.B* %this) { entry: %tmp1 = getelementptr %struct.B, %struct.B* %this, i32 0, i32 0 ; [#uses=1] %tmp2 = load i32, i32* %tmp1 ; [#uses=1] - %tmp4 = tail call i32 (i8*, ...)* @printf( i8* getelementptr ([7 x i8], [7 x i8]* @str1, i32 0, i32 0), i32 %tmp2 ) ; [#uses=0] + %tmp4 = tail call i32 (i8*, ...) @printf( i8* getelementptr ([7 x i8], [7 x i8]* @str1, i32 0, i32 0), i32 %tmp2 ) ; [#uses=0] ret void } diff --git a/test/CodeGen/ARM/2007-05-03-BadPostIndexedLd.ll b/test/CodeGen/ARM/2007-05-03-BadPostIndexedLd.ll index ca168b68ab0..50573b457c3 100644 --- a/test/CodeGen/ARM/2007-05-03-BadPostIndexedLd.ll +++ b/test/CodeGen/ARM/2007-05-03-BadPostIndexedLd.ll @@ -93,7 +93,7 @@ cond_true1272: ; preds = %cond_next1267 %tmp42.i348 = sub i32 0, %tmp2930.i ; [#uses=1] %tmp45.i = getelementptr %struct.TestObj, %struct.TestObj* %tmp1273, i32 0, i32 0 ; [#uses=2] %tmp48.i = load i8*, i8** %tmp45.i ; [#uses=1] - %tmp50.i350 = call i32 (i8*, i8*, ...)* @sprintf( i8* getelementptr ([256 x i8], [256 x i8]* @Msg, i32 0, i32 0), i8* getelementptr ([48 x i8], [48 x i8]* @.str53615, i32 0, i32 0), i8* null, i8** %tmp45.i, i8* %tmp48.i ) ; [#uses=0] + %tmp50.i350 = call i32 (i8*, i8*, ...) @sprintf( i8* getelementptr ([256 x i8], [256 x i8]* @Msg, i32 0, i32 0), i8* getelementptr ([48 x i8], [48 x i8]* @.str53615, i32 0, i32 0), i8* null, i8** %tmp45.i, i8* %tmp48.i ) ; [#uses=0] br i1 false, label %cond_true.i632.i, label %Ut_TraceMsg.exit648.i cond_true.i632.i: ; preds = %cond_true1272 diff --git a/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll b/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll index 5895a3263e3..f49c805469a 100644 --- a/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll +++ b/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll @@ -24,13 +24,13 @@ entry: br i1 %toBool, label %cond_true, label %cond_false cond_true: ; preds = %entry - %tmp3 = call i32 (...)* @bar( ) ; [#uses=0] - %tmp4 = call i32 (...)* @baz( i32 5, i32 6 ) ; [#uses=0] + %tmp3 = call i32 (...) @bar( ) ; [#uses=0] + %tmp4 = call i32 (...) @baz( i32 5, i32 6 ) ; [#uses=0] br label %cond_next cond_false: ; preds = %entry - %tmp5 = call i32 (...)* @foo( ) ; [#uses=0] - %tmp6 = call i32 (...)* @baz( i32 5, i32 6 ) ; [#uses=0] + %tmp5 = call i32 (...) @foo( ) ; [#uses=0] + %tmp6 = call i32 (...) @baz( i32 5, i32 6 ) ; [#uses=0] br label %cond_next cond_next: ; preds = %cond_false, %cond_true @@ -41,17 +41,17 @@ cond_next: ; preds = %cond_false, %cond_true br i1 %toBool10, label %cond_true11, label %cond_false15 cond_true11: ; preds = %cond_next - %tmp13 = call i32 (...)* @foo( ) ; [#uses=0] - %tmp14 = call i32 (...)* @quux( i32 3, i32 4 ) ; [#uses=0] + %tmp13 = call i32 (...) @foo( ) ; [#uses=0] + %tmp14 = call i32 (...) @quux( i32 3, i32 4 ) ; [#uses=0] br label %cond_next18 cond_false15: ; preds = %cond_next - %tmp16 = call i32 (...)* @bar( ) ; [#uses=0] - %tmp17 = call i32 (...)* @quux( i32 3, i32 4 ) ; [#uses=0] + %tmp16 = call i32 (...) @bar( ) ; [#uses=0] + %tmp17 = call i32 (...) @quux( i32 3, i32 4 ) ; [#uses=0] br label %cond_next18 cond_next18: ; preds = %cond_false15, %cond_true11 - %tmp19 = call i32 (...)* @bar( ) ; [#uses=0] + %tmp19 = call i32 (...) @bar( ) ; [#uses=0] br label %return return: ; preds = %cond_next18 diff --git a/test/CodeGen/ARM/2007-05-09-tailmerge-2.ll b/test/CodeGen/ARM/2007-05-09-tailmerge-2.ll index abb6a33f601..421d501a2ca 100644 --- a/test/CodeGen/ARM/2007-05-09-tailmerge-2.ll +++ b/test/CodeGen/ARM/2007-05-09-tailmerge-2.ll @@ -26,8 +26,8 @@ entry: br i1 %toBool, label %cond_true, label %cond_false cond_true: ; preds = %entry - %tmp3 = call i32 (...)* @bar( ) ; [#uses=0] - %tmp4 = call i32 (...)* @baz( i32 5, i32 6 ) ; [#uses=0] + %tmp3 = call i32 (...) @bar( ) ; [#uses=0] + %tmp4 = call i32 (...) @baz( i32 5, i32 6 ) ; [#uses=0] %tmp7 = load i32, i32* %q_addr ; [#uses=1] %tmp8 = icmp ne i32 %tmp7, 0 ; [#uses=1] %tmp89 = zext i1 %tmp8 to i8 ; [#uses=1] @@ -35,8 +35,8 @@ cond_true: ; preds = %entry br i1 %toBool10, label %cond_true11, label %cond_false15 cond_false: ; preds = %entry - %tmp5 = call i32 (...)* @foo( ) ; [#uses=0] - %tmp6 = call i32 (...)* @baz( i32 5, i32 6 ) ; [#uses=0] + %tmp5 = call i32 (...) @foo( ) ; [#uses=0] + %tmp6 = call i32 (...) @baz( i32 5, i32 6 ) ; [#uses=0] %tmp27 = load i32, i32* %q_addr ; [#uses=1] %tmp28 = icmp ne i32 %tmp27, 0 ; [#uses=1] %tmp289 = zext i1 %tmp28 to i8 ; [#uses=1] @@ -44,17 +44,17 @@ cond_false: ; preds = %entry br i1 %toBool210, label %cond_true11, label %cond_false15 cond_true11: ; preds = %cond_next - %tmp13 = call i32 (...)* @foo( ) ; [#uses=0] - %tmp14 = call i32 (...)* @quux( i32 3, i32 4 ) ; [#uses=0] + %tmp13 = call i32 (...) @foo( ) ; [#uses=0] + %tmp14 = call i32 (...) @quux( i32 3, i32 4 ) ; [#uses=0] br label %cond_next18 cond_false15: ; preds = %cond_next - %tmp16 = call i32 (...)* @bar( ) ; [#uses=0] - %tmp17 = call i32 (...)* @quux( i32 3, i32 4 ) ; [#uses=0] + %tmp16 = call i32 (...) @bar( ) ; [#uses=0] + %tmp17 = call i32 (...) @quux( i32 3, i32 4 ) ; [#uses=0] br label %cond_next18 cond_next18: ; preds = %cond_false15, %cond_true11 - %tmp19 = call i32 (...)* @bar( ) ; [#uses=0] + %tmp19 = call i32 (...) @bar( ) ; [#uses=0] br label %return return: ; preds = %cond_next18 diff --git a/test/CodeGen/ARM/2007-05-22-tailmerge-3.ll b/test/CodeGen/ARM/2007-05-22-tailmerge-3.ll index 1edaefbc034..52cc37e2408 100644 --- a/test/CodeGen/ARM/2007-05-22-tailmerge-3.ll +++ b/test/CodeGen/ARM/2007-05-22-tailmerge-3.ll @@ -36,8 +36,8 @@ entry: br i1 %toBool, label %cond_true, label %cond_false cond_true: ; preds = %entry - %tmp3 = call i32 (...)* @bar( ) ; [#uses=0] - %tmp4 = call i32 (...)* @baz( i32 5, i32 6 ) ; [#uses=0] + %tmp3 = call i32 (...) @bar( ) ; [#uses=0] + %tmp4 = call i32 (...) @baz( i32 5, i32 6 ) ; [#uses=0] %tmp7 = load i32, i32* %q_addr ; [#uses=1] %tmp8 = icmp ne i32 %tmp7, 0 ; [#uses=1] %tmp89 = zext i1 %tmp8 to i8 ; [#uses=1] @@ -45,8 +45,8 @@ cond_true: ; preds = %entry br i1 %toBool10, label %cond_true11, label %cond_false15 cond_false: ; preds = %entry - %tmp5 = call i32 (...)* @foo( ) ; [#uses=0] - %tmp6 = call i32 (...)* @baz( i32 5, i32 6 ) ; [#uses=0] + %tmp5 = call i32 (...) @foo( ) ; [#uses=0] + %tmp6 = call i32 (...) @baz( i32 5, i32 6 ) ; [#uses=0] %tmp27 = load i32, i32* %q_addr ; [#uses=1] %tmp28 = icmp ne i32 %tmp27, 0 ; [#uses=1] %tmp289 = zext i1 %tmp28 to i8 ; [#uses=1] @@ -54,17 +54,17 @@ cond_false: ; preds = %entry br i1 %toBool210, label %cond_true11, label %cond_false15 cond_true11: ; preds = %cond_next - %tmp13 = call i32 (...)* @foo( ) ; [#uses=0] - %tmp14 = call i32 (...)* @quux( i32 3, i32 4 ) ; [#uses=0] + %tmp13 = call i32 (...) @foo( ) ; [#uses=0] + %tmp14 = call i32 (...) @quux( i32 3, i32 4 ) ; [#uses=0] br label %cond_next18 cond_false15: ; preds = %cond_next - %tmp16 = call i32 (...)* @bar( ) ; [#uses=0] - %tmp17 = call i32 (...)* @quux( i32 3, i32 4 ) ; [#uses=0] + %tmp16 = call i32 (...) @bar( ) ; [#uses=0] + %tmp17 = call i32 (...) @quux( i32 3, i32 4 ) ; [#uses=0] br label %cond_next18 cond_next18: ; preds = %cond_false15, %cond_true11 - %tmp19 = call i32 (...)* @bar( ) ; [#uses=0] + %tmp19 = call i32 (...) @bar( ) ; [#uses=0] br label %return return: ; preds = %cond_next18 diff --git a/test/CodeGen/ARM/2008-03-07-RegScavengerAssert.ll b/test/CodeGen/ARM/2008-03-07-RegScavengerAssert.ll index 5ee8b46bdd1..753f9e3d133 100644 --- a/test/CodeGen/ARM/2008-03-07-RegScavengerAssert.ll +++ b/test/CodeGen/ARM/2008-03-07-RegScavengerAssert.ll @@ -13,7 +13,7 @@ bb88.i: ; preds = %bb74.i mandel.exit: ; preds = %bb88.i %tmp2 = load volatile double, double* getelementptr ({ double, double }, { double, double }* @accum, i32 0, i32 0), align 8 ; [#uses=1] %tmp23 = fptosi double %tmp2 to i32 ; [#uses=1] - %tmp5 = tail call i32 (i8*, ...)* @printf( i8* getelementptr ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 %tmp23 ) ; [#uses=0] + %tmp5 = tail call i32 (i8*, ...) @printf( i8* getelementptr ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 %tmp23 ) ; [#uses=0] ret i32 0 } diff --git a/test/CodeGen/ARM/2008-04-10-ScavengerAssert.ll b/test/CodeGen/ARM/2008-04-10-ScavengerAssert.ll index bd1f1742a22..1ededa3c387 100644 --- a/test/CodeGen/ARM/2008-04-10-ScavengerAssert.ll +++ b/test/CodeGen/ARM/2008-04-10-ScavengerAssert.ll @@ -73,10 +73,10 @@ bb609.i.i: ; preds = %cond_next602.i.i br label %bb620.i.i bb620.i.i: ; preds = %bb620.i.i, %bb609.i.i %indvar166.i465.i = phi i32 [ %indvar.next167.i.i, %bb620.i.i ], [ 0, %bb609.i.i ] ; [#uses=1] - %tmp640.i.i = call i32 (%struct.FILE*, i8*, ...)* @fscanf( %struct.FILE* %tmp61, i8* getelementptr ([5 x i8], [5 x i8]* @.str584, i32 0, i32 0), [1024 x i8]* null ) ; [#uses=0] + %tmp640.i.i = call i32 (%struct.FILE*, i8*, ...) @fscanf( %struct.FILE* %tmp61, i8* getelementptr ([5 x i8], [5 x i8]* @.str584, i32 0, i32 0), [1024 x i8]* null ) ; [#uses=0] %tmp648.i.i = load i32, i32* null, align 4 ; [#uses=1] %tmp650.i468.i = icmp sgt i32 0, %tmp648.i.i ; [#uses=1] - %tmp624.i469.i = call i32 (%struct.FILE*, i8*, ...)* @fscanf( %struct.FILE* %tmp61, i8* getelementptr ([5 x i8], [5 x i8]* @.str584, i32 0, i32 0), [1024 x i8]* null ) ; [#uses=0] + %tmp624.i469.i = call i32 (%struct.FILE*, i8*, ...) @fscanf( %struct.FILE* %tmp61, i8* getelementptr ([5 x i8], [5 x i8]* @.str584, i32 0, i32 0), [1024 x i8]* null ) ; [#uses=0] %indvar.next167.i.i = add i32 %indvar166.i465.i, 1 ; [#uses=1] br i1 %tmp650.i468.i, label %bb653.i.i.loopexit, label %bb620.i.i bb653.i.i.loopexit: ; preds = %bb620.i.i diff --git a/test/CodeGen/ARM/2009-02-16-SpillerBug.ll b/test/CodeGen/ARM/2009-02-16-SpillerBug.ll index d090da07c50..cad5440bddc 100644 --- a/test/CodeGen/ARM/2009-02-16-SpillerBug.ll +++ b/test/CodeGen/ARM/2009-02-16-SpillerBug.ll @@ -81,7 +81,7 @@ bb244: ; preds = %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122 br i1 %0, label %bb435, label %bb433 bb394: ; preds = %bb122 - call void (i32, i32, i8*, i32, %struct.FILE_POS*, ...)* @Error(i32 1, i32 3, i8* getelementptr ([23 x i8], [23 x i8]* @"\01LC13423", i32 0, i32 0), i32 0, %struct.FILE_POS* @no_file_pos, i8* getelementptr ([13 x i8], [13 x i8]* @"\01LC18972", i32 0, i32 0), i8* null) nounwind + call void (i32, i32, i8*, i32, %struct.FILE_POS*, ...) @Error(i32 1, i32 3, i8* getelementptr ([23 x i8], [23 x i8]* @"\01LC13423", i32 0, i32 0), i32 0, %struct.FILE_POS* @no_file_pos, i8* getelementptr ([13 x i8], [13 x i8]* @"\01LC18972", i32 0, i32 0), i8* null) nounwind br label %bb396 bb396: ; preds = %bb394, %bb131, %bb122, %bb122, %bb122, %bb122, %RESUME diff --git a/test/CodeGen/ARM/2009-04-08-FREM.ll b/test/CodeGen/ARM/2009-04-08-FREM.ll index 606c6b1471b..e0f9485888d 100644 --- a/test/CodeGen/ARM/2009-04-08-FREM.ll +++ b/test/CodeGen/ARM/2009-04-08-FREM.ll @@ -4,6 +4,6 @@ declare i32 @printf(i8*, ...) define i32 @main() { %rem_r = frem double 0.000000e+00, 0.000000e+00 ; [#uses=1] - %1 = call i32 (i8*, ...)* @printf(i8* null, double %rem_r) ; [#uses=0] + %1 = call i32 (i8*, ...) @printf(i8* null, double %rem_r) ; [#uses=0] ret i32 0 } diff --git a/test/CodeGen/ARM/2009-05-07-RegAllocLocal.ll b/test/CodeGen/ARM/2009-05-07-RegAllocLocal.ll index 887fb0b37a9..ac641f99dbf 100644 --- a/test/CodeGen/ARM/2009-05-07-RegAllocLocal.ll +++ b/test/CodeGen/ARM/2009-05-07-RegAllocLocal.ll @@ -5,7 +5,7 @@ define i16 @fn16(i16 %arg0.0, <2 x i16> %arg1, i16 %arg2.0) nounwind { entry: store <2 x i16> %arg1, <2 x i16>* null - %0 = call i32 (i8*, ...)* @printf(i8* getelementptr ([30 x i8], [30 x i8]* @.str, i32 0, i32 0), i32 0) nounwind ; [#uses=0] + %0 = call i32 (i8*, ...) @printf(i8* getelementptr ([30 x i8], [30 x i8]* @.str, i32 0, i32 0), i32 0) nounwind ; [#uses=0] ret i16 0 } diff --git a/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll b/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll index b616cb3eca5..ae005dbf4b1 100644 --- a/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll +++ b/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll @@ -19,7 +19,7 @@ bb1: ; preds = %bb bb3: ; preds = %bb1, %bb %iftmp.0.0 = phi i32 [ 0, %bb1 ], [ -1, %bb ] ; [#uses=1] - %1 = tail call i32 (i8*, ...)* @printf(i8* getelementptr ([7 x i8], [7 x i8]* @"\01LC", i32 0, i32 0), i32 0, i32 %iftmp.0.0) nounwind ; [#uses=0] + %1 = tail call i32 (i8*, ...) @printf(i8* getelementptr ([7 x i8], [7 x i8]* @"\01LC", i32 0, i32 0), i32 0, i32 %iftmp.0.0) nounwind ; [#uses=0] %2 = load %struct.List*, %struct.List** null, align 4 ; <%struct.List*> [#uses=2] %phitmp = icmp eq %struct.List* %2, null ; [#uses=1] br i1 %phitmp, label %bb5, label %bb diff --git a/test/CodeGen/ARM/2009-06-02-ISelCrash.ll b/test/CodeGen/ARM/2009-06-02-ISelCrash.ll index 0612d51ced5..7bbb8090c84 100644 --- a/test/CodeGen/ARM/2009-06-02-ISelCrash.ll +++ b/test/CodeGen/ARM/2009-06-02-ISelCrash.ll @@ -57,6 +57,6 @@ Fft.exit.i: ; preds = %bb7.i.i br i1 undef, label %bb5.i, label %bb1.outer2.i.i.outer bb5.i: ; preds = %Fft.exit.i - %0 = tail call i32 (i8*, ...)* @printf(i8* getelementptr ([15 x i8], [15 x i8]* @"\01LC", i32 0, i32 0), double undef, double undef) nounwind ; [#uses=0] + %0 = tail call i32 (i8*, ...) @printf(i8* getelementptr ([15 x i8], [15 x i8]* @"\01LC", i32 0, i32 0), double undef, double undef) nounwind ; [#uses=0] unreachable } diff --git a/test/CodeGen/ARM/2009-06-30-RegScavengerAssert.ll b/test/CodeGen/ARM/2009-06-30-RegScavengerAssert.ll index 72a41f9bfaa..e9c4b0335dc 100644 --- a/test/CodeGen/ARM/2009-06-30-RegScavengerAssert.ll +++ b/test/CodeGen/ARM/2009-06-30-RegScavengerAssert.ll @@ -47,14 +47,14 @@ bb11: ; preds = %bb9 tail call void @diff(i8* undef, i8* %3, i32 undef, i32 undef, i32 undef, i32 undef) nounwind %4 = sitofp i32 undef to double ; [#uses=1] %5 = fdiv double %4, 1.000000e+01 ; [#uses=1] - %6 = tail call i32 (i8*, ...)* @printf(i8* getelementptr ([29 x i8], [29 x i8]* @"\01LC12", i32 0, i32 0), double %5) nounwind ; [#uses=0] + %6 = tail call i32 (i8*, ...) @printf(i8* getelementptr ([29 x i8], [29 x i8]* @"\01LC12", i32 0, i32 0), double %5) nounwind ; [#uses=0] %7 = load i32, i32* @al_len, align 4 ; [#uses=1] %8 = load i32, i32* @no_mat, align 4 ; [#uses=1] %9 = load i32, i32* @no_mis, align 4 ; [#uses=1] %10 = sub i32 %7, %8 ; [#uses=1] %11 = sub i32 %10, %9 ; [#uses=1] - %12 = tail call i32 (i8*, ...)* @printf(i8* getelementptr ([33 x i8], [33 x i8]* @"\01LC16", i32 0, i32 0), i32 %11) nounwind ; [#uses=0] - %13 = tail call i32 (i8*, ...)* @printf(i8* getelementptr ([47 x i8], [47 x i8]* @"\01LC17", i32 0, i32 0), i32 undef, i32 %1, i32 undef, i32 undef) nounwind ; [#uses=0] + %12 = tail call i32 (i8*, ...) @printf(i8* getelementptr ([33 x i8], [33 x i8]* @"\01LC16", i32 0, i32 0), i32 %11) nounwind ; [#uses=0] + %13 = tail call i32 (i8*, ...) @printf(i8* getelementptr ([47 x i8], [47 x i8]* @"\01LC17", i32 0, i32 0), i32 undef, i32 %1, i32 undef, i32 undef) nounwind ; [#uses=0] br i1 undef, label %bb15, label %bb12 bb12: ; preds = %bb11 diff --git a/test/CodeGen/ARM/2009-06-30-RegScavengerAssert2.ll b/test/CodeGen/ARM/2009-06-30-RegScavengerAssert2.ll index 92b1869f20e..08291e62b65 100644 --- a/test/CodeGen/ARM/2009-06-30-RegScavengerAssert2.ll +++ b/test/CodeGen/ARM/2009-06-30-RegScavengerAssert2.ll @@ -42,10 +42,10 @@ bb11: ; preds = %bb9 store i32 0, i32* @no_mis, align 4 %4 = getelementptr i8, i8* %B, i32 %0 ; [#uses=1] tail call void @diff(i8* undef, i8* %4, i32 undef, i32 %3, i32 undef, i32 undef) nounwind - %5 = tail call i32 (i8*, ...)* @printf(i8* getelementptr ([33 x i8], [33 x i8]* @"\01LC11", i32 0, i32 0), i32 %tmp13) nounwind ; [#uses=0] + %5 = tail call i32 (i8*, ...) @printf(i8* getelementptr ([33 x i8], [33 x i8]* @"\01LC11", i32 0, i32 0), i32 %tmp13) nounwind ; [#uses=0] %6 = load i32, i32* @no_mis, align 4 ; [#uses=1] - %7 = tail call i32 (i8*, ...)* @printf(i8* getelementptr ([33 x i8], [33 x i8]* @"\01LC15", i32 0, i32 0), i32 %6) nounwind ; [#uses=0] - %8 = tail call i32 (i8*, ...)* @printf(i8* getelementptr ([47 x i8], [47 x i8]* @"\01LC17", i32 0, i32 0), i32 undef, i32 %1, i32 undef, i32 %2) nounwind ; [#uses=0] + %7 = tail call i32 (i8*, ...) @printf(i8* getelementptr ([33 x i8], [33 x i8]* @"\01LC15", i32 0, i32 0), i32 %6) nounwind ; [#uses=0] + %8 = tail call i32 (i8*, ...) @printf(i8* getelementptr ([47 x i8], [47 x i8]* @"\01LC17", i32 0, i32 0), i32 undef, i32 %1, i32 undef, i32 %2) nounwind ; [#uses=0] br i1 undef, label %bb15, label %bb12 bb12: ; preds = %bb11 diff --git a/test/CodeGen/ARM/2009-10-27-double-align.ll b/test/CodeGen/ARM/2009-10-27-double-align.ll index b43f2a66500..39f3292e260 100644 --- a/test/CodeGen/ARM/2009-10-27-double-align.ll +++ b/test/CodeGen/ARM/2009-10-27-double-align.ll @@ -8,7 +8,7 @@ entry: ;CHECK: [sp, #8] ;CHECK: [sp, #12] ;CHECK: [sp] - tail call void (i8*, ...)* @f(i8* getelementptr ([1 x i8], [1 x i8]* @.str, i32 0, i32 0), i32 1, double 2.000000e+00, i32 3, double 4.000000e+00) + tail call void (i8*, ...) @f(i8* getelementptr ([1 x i8], [1 x i8]* @.str, i32 0, i32 0), i32 1, double 2.000000e+00, i32 3, double 4.000000e+00) ret void } diff --git a/test/CodeGen/ARM/2010-05-18-LocalAllocCrash.ll b/test/CodeGen/ARM/2010-05-18-LocalAllocCrash.ll index 89ad5f50aab..deb58840326 100644 --- a/test/CodeGen/ARM/2010-05-18-LocalAllocCrash.ll +++ b/test/CodeGen/ARM/2010-05-18-LocalAllocCrash.ll @@ -19,12 +19,12 @@ entry: %tmp21 = load i32, i32* undef ; [#uses=1] %0 = mul i32 1, %tmp21 ; [#uses=1] %vla22 = alloca i8, i32 %0, align 1 ; [#uses=1] - call void (...)* @zz(i8* getelementptr inbounds ([1 x i8], [1 x i8]* @.str, i32 0, i32 0), i32 2, i32 1) + call void (...) @zz(i8* getelementptr inbounds ([1 x i8], [1 x i8]* @.str, i32 0, i32 0), i32 2, i32 1) br i1 undef, label %if.then, label %if.end36 if.then: ; preds = %entry - %call = call i32 (...)* @x(%struct.q* undef, i8* undef, i8* %vla6, i8* %vla10, i32 undef) ; [#uses=0] - %call35 = call i32 (...)* @x(%struct.q* undef, i8* %vla14, i8* %vla18, i8* %vla22, i32 undef) ; [#uses=0] + %call = call i32 (...) @x(%struct.q* undef, i8* undef, i8* %vla6, i8* %vla10, i32 undef) ; [#uses=0] + %call35 = call i32 (...) @x(%struct.q* undef, i8* %vla14, i8* %vla18, i8* %vla22, i32 undef) ; [#uses=0] unreachable if.end36: ; preds = %entry diff --git a/test/CodeGen/ARM/2010-06-21-LdStMultipleBug.ll b/test/CodeGen/ARM/2010-06-21-LdStMultipleBug.ll index 9cd61d38b92..6f55ac05805 100644 --- a/test/CodeGen/ARM/2010-06-21-LdStMultipleBug.ll +++ b/test/CodeGen/ARM/2010-06-21-LdStMultipleBug.ll @@ -13,7 +13,7 @@ define void @TW_oldinput(%struct.FILE* nocapture %fp) nounwind { entry: %xcenter = alloca i32, align 4 ; [#uses=2] - %0 = call i32 (%struct.FILE*, i8*, ...)* @fscanf(%struct.FILE* %fp, i8* getelementptr inbounds ([14 x i8], [14 x i8]* @.str2708, i32 0, i32 0), i32* undef, i32* undef, i32* %xcenter, i32* null) nounwind ; [#uses=1] + %0 = call i32 (%struct.FILE*, i8*, ...) @fscanf(%struct.FILE* %fp, i8* getelementptr inbounds ([14 x i8], [14 x i8]* @.str2708, i32 0, i32 0), i32* undef, i32* undef, i32* %xcenter, i32* null) nounwind ; [#uses=1] %1 = icmp eq i32 %0, 4 ; [#uses=1] br i1 %1, label %bb, label %return @@ -137,7 +137,7 @@ bb322: ; preds = %bb248 br i1 undef, label %bb248, label %bb445 bb445: ; preds = %bb322, %bb10, %bb - %49 = call i32 (%struct.FILE*, i8*, ...)* @fscanf(%struct.FILE* %fp, i8* getelementptr inbounds ([14 x i8], [14 x i8]* @.str2708, i32 0, i32 0), i32* undef, i32* undef, i32* %xcenter, i32* null) nounwind ; [#uses=1] + %49 = call i32 (%struct.FILE*, i8*, ...) @fscanf(%struct.FILE* %fp, i8* getelementptr inbounds ([14 x i8], [14 x i8]* @.str2708, i32 0, i32 0), i32* undef, i32* undef, i32* %xcenter, i32* null) nounwind ; [#uses=1] %50 = icmp eq i32 %49, 4 ; [#uses=1] br i1 %50, label %bb, label %return diff --git a/test/CodeGen/ARM/2010-07-26-GlobalMerge.ll b/test/CodeGen/ARM/2010-07-26-GlobalMerge.ll index 4c5d8d9af2f..b02efea929f 100644 --- a/test/CodeGen/ARM/2010-07-26-GlobalMerge.ll +++ b/test/CodeGen/ARM/2010-07-26-GlobalMerge.ll @@ -31,7 +31,7 @@ define internal void @_ZN1AD1Ev(%struct.A* nocapture %this) nounwind ssp align 2 entry: %tmp.i = getelementptr inbounds %struct.A, %struct.A* %this, i32 0, i32 0 ; [#uses=1] %tmp2.i = load i32, i32* %tmp.i ; [#uses=1] - %call.i = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str4, i32 0, i32 0), i32 %tmp2.i) nounwind ; [#uses=0] + %call.i = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str4, i32 0, i32 0), i32 %tmp2.i) nounwind ; [#uses=0] %tmp3.i = load i32, i32* @d ; [#uses=1] %inc.i = add nsw i32 %tmp3.i, 1 ; [#uses=1] store i32 %inc.i, i32* @d @@ -46,7 +46,7 @@ entry: %exception.i = tail call i8* @__cxa_allocate_exception(i32 4) nounwind ; [#uses=2] %tmp2.i.i.i = bitcast i8* %exception.i to i32* ; [#uses=1] store i32 1, i32* %tmp2.i.i.i - %call.i.i.i = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str5, i32 0, i32 0), i32 1) nounwind ; [#uses=0] + %call.i.i.i = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str5, i32 0, i32 0), i32 1) nounwind ; [#uses=0] invoke void @__cxa_throw(i8* %exception.i, i8* bitcast (%0* @_ZTI1A to i8*), i8* bitcast (void (%struct.A*)* @_ZN1AD1Ev to i8*)) noreturn to label %.noexc unwind label %lpad @@ -55,16 +55,16 @@ entry: try.cont: ; preds = %lpad %0 = tail call i8* @__cxa_get_exception_ptr(i8* %exn) nounwind ; [#uses=0] - %call.i.i = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([16 x i8], [16 x i8]* @.str3, i32 0, i32 0), i32 2) nounwind ; [#uses=0] + %call.i.i = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([16 x i8], [16 x i8]* @.str3, i32 0, i32 0), i32 2) nounwind ; [#uses=0] %1 = tail call i8* @__cxa_begin_catch(i8* %exn) nounwind ; [#uses=0] %puts = tail call i32 @puts(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @str1, i32 0, i32 0)) ; [#uses=0] - %call.i.i3 = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str4, i32 0, i32 0), i32 2) nounwind ; [#uses=0] + %call.i.i3 = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str4, i32 0, i32 0), i32 2) nounwind ; [#uses=0] %tmp3.i.i = load i32, i32* @d ; [#uses=1] %inc.i.i4 = add nsw i32 %tmp3.i.i, 1 ; [#uses=1] store i32 %inc.i.i4, i32* @d tail call void @__cxa_end_catch() %tmp13 = load i32, i32* @d ; [#uses=1] - %call14 = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([18 x i8], [18 x i8]* @.str2, i32 0, i32 0), i32 2, i32 %tmp13) ; [#uses=0] + %call14 = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([18 x i8], [18 x i8]* @.str2, i32 0, i32 0), i32 2, i32 %tmp13) ; [#uses=0] %tmp16 = load i32, i32* @d ; [#uses=1] %cmp = icmp ne i32 %tmp16, 2 ; [#uses=1] %conv = zext i1 %cmp to i32 ; [#uses=1] diff --git a/test/CodeGen/ARM/2011-04-15-AndVFlagPeepholeBug.ll b/test/CodeGen/ARM/2011-04-15-AndVFlagPeepholeBug.ll index e712e08ddb6..f17884e0fa4 100644 --- a/test/CodeGen/ARM/2011-04-15-AndVFlagPeepholeBug.ll +++ b/test/CodeGen/ARM/2011-04-15-AndVFlagPeepholeBug.ll @@ -12,7 +12,7 @@ entry: br i1 %cmp, label %if.then, label %if.end if.then: ; preds = %entry - tail call void (...)* @g(i32 %a, i32 %b) nounwind + tail call void (...) @g(i32 %a, i32 %b) nounwind br label %if.end if.end: ; preds = %if.then, %entry diff --git a/test/CodeGen/ARM/2011-04-15-RegisterCmpPeephole.ll b/test/CodeGen/ARM/2011-04-15-RegisterCmpPeephole.ll index 5404cf57a59..864e2917b7b 100644 --- a/test/CodeGen/ARM/2011-04-15-RegisterCmpPeephole.ll +++ b/test/CodeGen/ARM/2011-04-15-RegisterCmpPeephole.ll @@ -12,7 +12,7 @@ entry: br i1 %cmp, label %if.then, label %if.end if.then: ; preds = %entry - tail call void (...)* @h(i32 %a, i32 %b) nounwind + tail call void (...) @h(i32 %a, i32 %b) nounwind br label %if.end if.end: ; preds = %if.then, %entry @@ -31,7 +31,7 @@ entry: br i1 %cmp, label %if.then, label %if.end if.then: ; preds = %entry - tail call void (...)* @h(i32 %a, i32 %b) nounwind + tail call void (...) @h(i32 %a, i32 %b) nounwind br label %if.end if.end: ; preds = %if.then, %entry diff --git a/test/CodeGen/ARM/2011-10-26-ExpandUnalignedLoadCrash.ll b/test/CodeGen/ARM/2011-10-26-ExpandUnalignedLoadCrash.ll index 9f2fa63a70b..86596d6282f 100644 --- a/test/CodeGen/ARM/2011-10-26-ExpandUnalignedLoadCrash.ll +++ b/test/CodeGen/ARM/2011-10-26-ExpandUnalignedLoadCrash.ll @@ -4,7 +4,7 @@ target triple = "armv6-none-linux-gnueabi" define void @sample_test(i8* %.T0348, i16* nocapture %sourceA, i16* nocapture %destValues) { L.entry: - %0 = call i32 (...)* @get_index(i8* %.T0348, i32 0) + %0 = call i32 (...) @get_index(i8* %.T0348, i32 0) %1 = bitcast i16* %destValues to i8* %2 = mul i32 %0, 6 %3 = getelementptr i8, i8* %1, i32 %2 diff --git a/test/CodeGen/ARM/2012-10-04-AAPCS-byval-align8.ll b/test/CodeGen/ARM/2012-10-04-AAPCS-byval-align8.ll index b64b1bf4ccc..4a1341c4d6e 100644 --- a/test/CodeGen/ARM/2012-10-04-AAPCS-byval-align8.ll +++ b/test/CodeGen/ARM/2012-10-04-AAPCS-byval-align8.ll @@ -33,7 +33,7 @@ entry: ; CHECK: movw r0, #555 define i32 @main() { entry: - call void (i32, ...)* @test_byval_8_bytes_alignment(i32 555, %struct_t* byval @static_val) + call void (i32, ...) @test_byval_8_bytes_alignment(i32 555, %struct_t* byval @static_val) ret i32 0 } @@ -48,7 +48,7 @@ define void @test_byval_8_bytes_alignment_fixed_arg(i32 %n1, %struct_t* byval %v entry: %a = getelementptr inbounds %struct_t, %struct_t* %val, i32 0, i32 0 %0 = load double, double* %a - call void (double)* @f(double %0) + call void (double) @f(double %0) ret void } @@ -60,6 +60,6 @@ entry: ; CHECK: movw r0, #555 define i32 @main_fixed_arg() { entry: - call void (i32, %struct_t*)* @test_byval_8_bytes_alignment_fixed_arg(i32 555, %struct_t* byval @static_val) + call void (i32, %struct_t*) @test_byval_8_bytes_alignment_fixed_arg(i32 555, %struct_t* byval @static_val) ret i32 0 } diff --git a/test/CodeGen/ARM/2012-10-04-FixedFrame-vs-byval.ll b/test/CodeGen/ARM/2012-10-04-FixedFrame-vs-byval.ll index ef06f59b0f4..34af9026b52 100644 --- a/test/CodeGen/ARM/2012-10-04-FixedFrame-vs-byval.ll +++ b/test/CodeGen/ARM/2012-10-04-FixedFrame-vs-byval.ll @@ -14,6 +14,6 @@ define void @test_byval_usage_scheduling(i32 %n1, i32 %n2, %struct_t* byval %val entry: %a = getelementptr inbounds %struct_t, %struct_t* %val, i32 0, i32 0 %0 = load double, double* %a - %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([12 x i8], [12 x i8]* @.str, i32 0, i32 0), double %0) + %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([12 x i8], [12 x i8]* @.str, i32 0, i32 0), double %0) ret void } diff --git a/test/CodeGen/ARM/2013-04-21-AAPCS-VA-C.1.cp.ll b/test/CodeGen/ARM/2013-04-21-AAPCS-VA-C.1.cp.ll index 427519f8a84..d18dbd2db9b 100644 --- a/test/CodeGen/ARM/2013-04-21-AAPCS-VA-C.1.cp.ll +++ b/test/CodeGen/ARM/2013-04-21-AAPCS-VA-C.1.cp.ll @@ -14,7 +14,7 @@ define void @printfn(i32 %a, i16 signext %b, double %C, i8 signext %E) { entry: %conv = sext i16 %b to i32 %conv1 = sext i8 %E to i32 - %call = tail call i32 (i8*, ...)* @printf( + %call = tail call i32 (i8*, ...) @printf( i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i32 0, i32 0), ; --> R0 i32 %a, ; --> R1 i32 %conv, ; --> R2 diff --git a/test/CodeGen/ARM/aliases.ll b/test/CodeGen/ARM/aliases.ll index c24d0d23a60..04ca3e87548 100644 --- a/test/CodeGen/ARM/aliases.ll +++ b/test/CodeGen/ARM/aliases.ll @@ -38,7 +38,7 @@ entry: %tmp0 = load i32, i32* @bar_i %tmp2 = call i32 @foo_f() %tmp3 = add i32 %tmp, %tmp2 - %tmp4 = call %FunTy* @bar_f() + %tmp4 = call i32 @bar_f() %tmp5 = add i32 %tmp3, %tmp4 %tmp6 = add i32 %tmp1, %tmp5 %tmp7 = add i32 %tmp6, %tmp0 diff --git a/test/CodeGen/ARM/arguments.ll b/test/CodeGen/ARM/arguments.ll index e7fbf9f28ef..3b1d8dd0915 100644 --- a/test/CodeGen/ARM/arguments.ll +++ b/test/CodeGen/ARM/arguments.ll @@ -18,7 +18,7 @@ define i32 @f2() nounwind optsize { ; DARWIN-LABEL: f2: ; DARWIN: mov r3, #128 entry: - %0 = tail call i32 (i32, ...)* @g2(i32 5, double 1.600000e+01, i32 128) nounwind optsize ; [#uses=1] + %0 = tail call i32 (i32, ...) @g2(i32 5, double 1.600000e+01, i32 128) nounwind optsize ; [#uses=1] %not. = icmp ne i32 %0, 128 ; [#uses=1] %.0 = zext i1 %not. to i32 ; [#uses=1] ret i32 %.0 diff --git a/test/CodeGen/ARM/arm-asm.ll b/test/CodeGen/ARM/arm-asm.ll index e869abeb2dd..f9199ff82b3 100644 --- a/test/CodeGen/ARM/arm-asm.ll +++ b/test/CodeGen/ARM/arm-asm.ll @@ -2,6 +2,6 @@ define void @frame_dummy() { entry: - %tmp1 = tail call void (i8*)* (void (i8*)*)* asm "", "=r,0,~{dirflag},~{fpsr},~{flags}"( void (i8*)* null ) ; [#uses=0] + %tmp1 = tail call void (i8*)* (void (i8*)*) asm "", "=r,0,~{dirflag},~{fpsr},~{flags}"( void (i8*)* null ) ; [#uses=0] ret void } diff --git a/test/CodeGen/ARM/bx_fold.ll b/test/CodeGen/ARM/bx_fold.ll index c1aac44a13a..f6651ae8004 100644 --- a/test/CodeGen/ARM/bx_fold.ll +++ b/test/CodeGen/ARM/bx_fold.ll @@ -14,7 +14,7 @@ bb: ; preds = %bb1 bb1: ; preds = %bb, %entry %indvar = phi i32 [ 0, %entry ], [ %indvar.next, %bb ] ; [#uses=3] %i.0 = bitcast i32 %indvar to i32 ; [#uses=2] - %tmp = tail call i32 (...)* @bar( ) ; [#uses=1] + %tmp = tail call i32 (...) @bar( ) ; [#uses=1] %tmp2 = add i32 %i.0, %tmp ; [#uses=1] %Ptr_addr.0 = sub i32 %Ptr, %tmp2 ; [#uses=0] %tmp12 = icmp eq i32 %i.0, %Ptr ; [#uses=1] diff --git a/test/CodeGen/ARM/cache-intrinsic.ll b/test/CodeGen/ARM/cache-intrinsic.ll index a041d075751..12b55c7081d 100644 --- a/test/CodeGen/ARM/cache-intrinsic.ll +++ b/test/CodeGen/ARM/cache-intrinsic.ll @@ -10,10 +10,10 @@ define i32 @main() { entry: %retval = alloca i32, align 4 store i32 0, i32* %retval - %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i8* getelementptr inbounds ([32 x i8], [32 x i8]* @buffer, i32 0, i32 0)) + %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i8* getelementptr inbounds ([32 x i8], [32 x i8]* @buffer, i32 0, i32 0)) %call1 = call i8* @strcpy(i8* getelementptr inbounds ([32 x i8], [32 x i8]* @buffer, i32 0, i32 0), i8* getelementptr inbounds ([25 x i8], [25 x i8]* @.str1, i32 0, i32 0)) #3 call void @llvm.clear_cache(i8* getelementptr inbounds ([32 x i8], [32 x i8]* @buffer, i32 0, i32 0), i8* getelementptr inbounds (i8, i8* getelementptr inbounds ([32 x i8], [32 x i8]* @buffer, i32 0, i32 0), i32 32)) #3 - %call2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i8* getelementptr inbounds ([32 x i8], [32 x i8]* @buffer, i32 0, i32 0)) + %call2 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i8* getelementptr inbounds ([32 x i8], [32 x i8]* @buffer, i32 0, i32 0)) ret i32 0 } diff --git a/test/CodeGen/ARM/compare-call.ll b/test/CodeGen/ARM/compare-call.ll index d4bd92b8baa..f45ed73adb7 100644 --- a/test/CodeGen/ARM/compare-call.ll +++ b/test/CodeGen/ARM/compare-call.ll @@ -9,7 +9,7 @@ entry: br i1 %tmp.upgrd.1, label %cond_true, label %UnifiedReturnBlock cond_true: ; preds = %entry - %tmp.upgrd.2 = tail call i32 (...)* @bar( ) ; [#uses=0] + %tmp.upgrd.2 = tail call i32 (...) @bar( ) ; [#uses=0] ret void UnifiedReturnBlock: ; preds = %entry diff --git a/test/CodeGen/ARM/debug-info-branch-folding.ll b/test/CodeGen/ARM/debug-info-branch-folding.ll index 8f3a786d2ef..cb57efa7767 100644 --- a/test/CodeGen/ARM/debug-info-branch-folding.ll +++ b/test/CodeGen/ARM/debug-info-branch-folding.ll @@ -28,10 +28,10 @@ for.body9: ; preds = %for.body9, %entry for.end54: ; preds = %for.body9 %tmp115 = extractelement <4 x float> %add19, i32 1 %conv6.i75 = fpext float %tmp115 to double, !dbg !45 - %call.i82 = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i32 0, i32 0), double undef, double %conv6.i75, double undef, double undef) nounwind, !dbg !45 + %call.i82 = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i32 0, i32 0), double undef, double %conv6.i75, double undef, double undef) nounwind, !dbg !45 %tmp116 = extractelement <4 x float> %add20, i32 1 %conv6.i76 = fpext float %tmp116 to double, !dbg !45 - %call.i83 = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i32 0, i32 0), double undef, double %conv6.i76, double undef, double undef) nounwind, !dbg !45 + %call.i83 = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i32 0, i32 0), double undef, double %conv6.i76, double undef, double undef) nounwind, !dbg !45 ret i32 0, !dbg !49 } diff --git a/test/CodeGen/ARM/debug-info-d16-reg.ll b/test/CodeGen/ARM/debug-info-d16-reg.ll index ca44e67f9cc..034d0f46723 100644 --- a/test/CodeGen/ARM/debug-info-d16-reg.ll +++ b/test/CodeGen/ARM/debug-info-d16-reg.ll @@ -16,7 +16,7 @@ entry: tail call void @llvm.dbg.value(metadata double %val, i64 0, metadata !20, metadata !MDExpression()), !dbg !26 tail call void @llvm.dbg.value(metadata i8 %c, i64 0, metadata !21, metadata !MDExpression()), !dbg !26 %0 = zext i8 %c to i32, !dbg !27 - %1 = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %ptr, double %val, i32 %0) nounwind, !dbg !27 + %1 = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %ptr, double %val, i32 %0) nounwind, !dbg !27 ret i32 0, !dbg !29 } @@ -26,7 +26,7 @@ entry: tail call void @llvm.dbg.value(metadata double %val, i64 0, metadata !17, metadata !MDExpression()), !dbg !30 tail call void @llvm.dbg.value(metadata i8 %c, i64 0, metadata !18, metadata !MDExpression()), !dbg !30 %0 = zext i8 %c to i32, !dbg !31 - %1 = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %ptr, double %val, i32 %0) nounwind, !dbg !31 + %1 = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %ptr, double %val, i32 %0) nounwind, !dbg !31 ret i32 0, !dbg !33 } @@ -49,7 +49,7 @@ entry: tail call void @llvm.dbg.value(metadata double %1, i64 0, metadata !50, metadata !MDExpression()) nounwind, !dbg !38 tail call void @llvm.dbg.value(metadata i8 %5, i64 0, metadata !51, metadata !MDExpression()) nounwind, !dbg !38 %6 = zext i8 %5 to i32, !dbg !39 - %7 = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %3, double %1, i32 %6) nounwind, !dbg !39 + %7 = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %3, double %1, i32 %6) nounwind, !dbg !39 %8 = tail call i32 @printer(i8* %3, double %1, i8 zeroext %5) nounwind, !dbg !40 ret i32 0, !dbg !41 } diff --git a/test/CodeGen/ARM/debug-info-qreg.ll b/test/CodeGen/ARM/debug-info-qreg.ll index bcb51137354..9cfd67d2317 100644 --- a/test/CodeGen/ARM/debug-info-qreg.ll +++ b/test/CodeGen/ARM/debug-info-qreg.ll @@ -27,7 +27,7 @@ for.end54: ; preds = %for.body9 tail call void @llvm.dbg.value(metadata <4 x float> %add19, i64 0, metadata !27, metadata !MDExpression()), !dbg !39 %tmp115 = extractelement <4 x float> %add19, i32 1 %conv6.i75 = fpext float %tmp115 to double, !dbg !45 - %call.i82 = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i32 0, i32 0), double undef, double %conv6.i75, double undef, double undef) nounwind, !dbg !45 + %call.i82 = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i32 0, i32 0), double undef, double %conv6.i75, double undef, double undef) nounwind, !dbg !45 ret i32 0, !dbg !49 } diff --git a/test/CodeGen/ARM/debug-info-s16-reg.ll b/test/CodeGen/ARM/debug-info-s16-reg.ll index 5b7fcd6ec23..3cd2837714e 100644 --- a/test/CodeGen/ARM/debug-info-s16-reg.ll +++ b/test/CodeGen/ARM/debug-info-s16-reg.ll @@ -19,7 +19,7 @@ entry: tail call void @llvm.dbg.value(metadata i8 %c, i64 0, metadata !12, metadata !MDExpression()), !dbg !26 %conv = fpext float %val to double, !dbg !27 %conv3 = zext i8 %c to i32, !dbg !27 - %call = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %ptr, double %conv, i32 %conv3) nounwind optsize, !dbg !27 + %call = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %ptr, double %conv, i32 %conv3) nounwind optsize, !dbg !27 ret i32 0, !dbg !29 } @@ -32,7 +32,7 @@ entry: tail call void @llvm.dbg.value(metadata i8 %c, i64 0, metadata !16, metadata !MDExpression()), !dbg !32 %conv = fpext float %val to double, !dbg !33 %conv3 = zext i8 %c to i32, !dbg !33 - %call = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %ptr, double %conv, i32 %conv3) nounwind optsize, !dbg !33 + %call = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %ptr, double %conv, i32 %conv3) nounwind optsize, !dbg !33 ret i32 0, !dbg !35 } @@ -53,7 +53,7 @@ entry: tail call void @llvm.dbg.value(metadata i8 %conv6, i64 0, metadata !62, metadata !MDExpression()) nounwind, !dbg !43 %conv.i = fpext float %conv1 to double, !dbg !44 %conv3.i = and i32 %add5, 255, !dbg !44 - %call.i = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %add.ptr, double %conv.i, i32 %conv3.i) nounwind optsize, !dbg !44 + %call.i = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %add.ptr, double %conv.i, i32 %conv3.i) nounwind optsize, !dbg !44 %call14 = tail call i32 @printer(i8* %add.ptr, float %conv1, i8 zeroext %conv6) optsize, !dbg !45 ret i32 0, !dbg !46 } diff --git a/test/CodeGen/ARM/fast-isel-vararg.ll b/test/CodeGen/ARM/fast-isel-vararg.ll index aa37e7d2271..35442eea100 100644 --- a/test/CodeGen/ARM/fast-isel-vararg.ll +++ b/test/CodeGen/ARM/fast-isel-vararg.ll @@ -37,7 +37,7 @@ entry: ; THUMB: str.w {{[a-z0-9]+}}, [sp] ; THUMB: str.w {{[a-z0-9]+}}, [sp, #4] ; THUMB: bl {{_?}}CallVariadic - %call = call i32 (i32, ...)* @CallVariadic(i32 5, i32 %0, i32 %1, i32 %2, i32 %3, i32 %4) + %call = call i32 (i32, ...) @CallVariadic(i32 5, i32 %0, i32 %1, i32 %2, i32 %3, i32 %4) store i32 %call, i32* %tmp, align 4 %5 = load i32, i32* %tmp, align 4 ret i32 %5 diff --git a/test/CodeGen/ARM/fcopysign.ll b/test/CodeGen/ARM/fcopysign.ll index 1de057208ce..d013fbf8c15 100644 --- a/test/CodeGen/ARM/fcopysign.ll +++ b/test/CodeGen/ARM/fcopysign.ll @@ -48,7 +48,7 @@ entry: ; SOFT: vmov.i32 [[REG6:(d[0-9]+)]], #0x80000000 ; SOFT: vshr.u64 [[REG7]], [[REG7]], #32 ; SOFT: vbsl [[REG6]], [[REG7]], - %0 = tail call double (...)* @bar() nounwind + %0 = tail call double (...) @bar() nounwind %1 = fptrunc double %0 to float %2 = tail call float @copysignf(float 5.000000e-01, float %1) nounwind readnone %3 = fadd float %1, %2 diff --git a/test/CodeGen/ARM/ghc-tcreturn-lowered.ll b/test/CodeGen/ARM/ghc-tcreturn-lowered.ll index 9731b3d39b6..f34f8f1a66c 100644 --- a/test/CodeGen/ARM/ghc-tcreturn-lowered.ll +++ b/test/CodeGen/ARM/ghc-tcreturn-lowered.ll @@ -16,6 +16,6 @@ define ghccc void @test_indirect_tail() { ; CHECK-LABEL: test_indirect_tail: ; CHECK: bx {{r[0-9]+}} %func = load void()*, void()** @ind_func - tail call ghccc void()* %func() + tail call ghccc void() %func() ret void } diff --git a/test/CodeGen/ARM/ifcvt6.ll b/test/CodeGen/ARM/ifcvt6.ll index a00dedaee67..78901930e4b 100644 --- a/test/CodeGen/ARM/ifcvt6.ll +++ b/test/CodeGen/ARM/ifcvt6.ll @@ -10,7 +10,7 @@ entry: br i1 %tmp7, label %cond_true, label %UnifiedReturnBlock cond_true: ; preds = %entry - %tmp10 = call i32 (...)* @bar( ) ; [#uses=0] + %tmp10 = call i32 (...) @bar( ) ; [#uses=0] ret void UnifiedReturnBlock: ; preds = %entry diff --git a/test/CodeGen/ARM/indirectbr-2.ll b/test/CodeGen/ARM/indirectbr-2.ll index 044fb5610a6..ca068db1db0 100644 --- a/test/CodeGen/ARM/indirectbr-2.ll +++ b/test/CodeGen/ARM/indirectbr-2.ll @@ -27,7 +27,7 @@ define i32 @func() nounwind ssp { %9 = load i32, i32* %8 %10 = add i32 %9, ptrtoint (i8* blockaddress(@func, %4) to i32) %11 = inttoptr i32 %10 to i8* - %12 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([45 x i8], [45 x i8]* @0, i32 0, i32 0)) + %12 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([45 x i8], [45 x i8]* @0, i32 0, i32 0)) indirectbr i8* %11, [label %13, label %14] ;