Skip to content

Commit 23af648

Browse files
dwblaikiedwblaikie
committedApr 16, 2015
[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)) llvm-svn: 235145
1 parent e68c008 commit 23af648

File tree

560 files changed

+1498
-1503
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

560 files changed

+1498
-1503
lines changed
 

‎llvm/include/llvm/IR/Instructions.h

+4
Original file line numberDiff line numberDiff line change
@@ -1337,6 +1337,10 @@ class CallInst : public Instruction {
13371337

13381338
~CallInst() override;
13391339

1340+
Type *getFunctionType() const {
1341+
return cast<PointerType>(getCalledValue()->getType())->getElementType();
1342+
}
1343+
13401344
// Note that 'musttail' implies 'tail'.
13411345
enum TailCallKind { TCK_None = 0, TCK_Tail = 1, TCK_MustTail = 2 };
13421346
TailCallKind getTailCallKind() const {

‎llvm/lib/AsmParser/LLParser.cpp

+4-6
Original file line numberDiff line numberDiff line change
@@ -5160,10 +5160,8 @@ bool LLParser::ParseCall(Instruction *&Inst, PerFunctionState &PFS,
51605160
// If RetType is a non-function pointer type, then this is the short syntax
51615161
// for the call, which means that RetType is just the return type. Infer the
51625162
// rest of the function argument types from the arguments that are present.
5163-
PointerType *PFTy = nullptr;
5164-
FunctionType *Ty = nullptr;
5165-
if (!(PFTy = dyn_cast<PointerType>(RetType)) ||
5166-
!(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
5163+
FunctionType *Ty = dyn_cast<FunctionType>(RetType);
5164+
if (!Ty) {
51675165
// Pull out the types of all of the arguments...
51685166
std::vector<Type*> ParamTypes;
51695167
for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
@@ -5173,12 +5171,12 @@ bool LLParser::ParseCall(Instruction *&Inst, PerFunctionState &PFS,
51735171
return Error(RetTypeLoc, "Invalid result type for LLVM function");
51745172

51755173
Ty = FunctionType::get(RetType, ParamTypes, false);
5176-
PFTy = PointerType::getUnqual(Ty);
51775174
}
51785175

51795176
// Look up the callee.
51805177
Value *Callee;
5181-
if (ConvertValIDToValue(PFTy, CalleeID, Callee, &PFS)) return true;
5178+
if (ConvertValIDToValue(PointerType::getUnqual(Ty), CalleeID, Callee, &PFS))
5179+
return true;
51825180

51835181
// Set up the Attribute for the function.
51845182
SmallVector<AttributeSet, 8> Attrs;

0 commit comments

Comments
 (0)
Please sign in to comment.