nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[opaque pointer type] Explicit pointee type for call instruction

Browse Source 
Use an extra bit in the CCInfo to flag the newer version of the
instructiont hat includes the type explicitly.

Tested the newer error cases I added, but didn't add tests for the finer
granularity improvements to existing error paths.

llvm-svn: 235160
This commit is contained in:
David Blaikie
2015-04-17 06:40:14 +00:00
parent e6aba2806c
commit dbe6e0f171
5 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@@ -299,9 +299,9 @@ private:
// have.
ResVal = getFnValueByID(ValNo, nullptr);
return ResVal == nullptr;
} else if (Slot == Record.size()) {
return true;
}
if (Slot == Record.size())
return true;
unsigned TypeNo = (unsigned)Record[Slot++];
ResVal = getFnValueByID(ValNo, getTypeByID(TypeNo));
@@ -4168,19 +4168,32 @@ std::error_code BitcodeReader::ParseFunctionBody(Function *F) {
if (Record.size() < 3)
return Error("Invalid record");
AttributeSet PAL = getAttributes(Record[0]);
unsigned CCInfo = Record[1];
unsigned OpNum = 0;
AttributeSet PAL = getAttributes(Record[OpNum++]);
unsigned CCInfo = Record[OpNum++];
FunctionType *FTy = nullptr;
if (CCInfo >> 15 & 1 &&
!(FTy = dyn_cast<FunctionType>(getTypeByID(Record[OpNum++]))))
return Error("Explicit call type is not a function type");
unsigned OpNum = 2;
Value *Callee;
if (getValueTypePair(Record, OpNum, NextValueNo, Callee))
return Error("Invalid record");
PointerType *OpTy = dyn_cast<PointerType>(Callee->getType());
FunctionType *FTy = nullptr;
if (OpTy) FTy = dyn_cast<FunctionType>(OpTy->getElementType());
if (!FTy || Record.size() < FTy->getNumParams()+OpNum)
return Error("Invalid record");
if (!OpTy)
return Error("Callee is not a pointer type");
FunctionType *PFTy = dyn_cast<FunctionType>(OpTy->getElementType());
if (!PFTy)
return Error("Callee is not of pointer to function type");
if (!FTy)
FTy = PFTy;
if (PFTy != FTy)
return Error("Explicit call type does not match pointee type of "
"callee operand");
if (Record.size() < FTy->getNumParams() + OpNum)
return Error("Insufficient operands to call");
SmallVector<Value*, 16> Args;
// Read the fixed params.