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

Revert [IR] allow fast-math-flags on phi of FP values

Browse Source 
This reverts r372866 (git commit dec03223a9)

llvm-svn: 372868
This commit is contained in:
Sanjay Patel
2019-09-25 13:29:09 +00:00
parent 7915260853
commit 2cec4b58f5
10 changed files with 14 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4629,48 +4629,31 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
InstructionList.push_back(I);
break;
case bitc::FUNC_CODE_INST_PHI: { // PHI: [ty, val0,bb0, ...]
if (Record.size() < 1)
if (Record.size() < 1 || ((Record.size()-1)&1))
return error("Invalid record");
// The first record specifies the type.
FullTy = getFullyStructuredTypeByID(Record[0]);
Type *Ty = flattenPointerTypes(FullTy);
if (!Ty)
return error("Invalid record");
// Phi arguments are pairs of records of [value, basic block].
// There is an optional final record for fast-math-flags if this phi has a
// floating-point type.
size_t NumArgs = (Record.size() - 1) / 2;
if ((Record.size() - 1) % 2 == 1 && !Ty->isFloatingPointTy())
return error("Invalid record");
PHINode *PN = PHINode::Create(Ty, NumArgs);
PHINode *PN = PHINode::Create(Ty, (Record.size()-1)/2);
InstructionList.push_back(PN);
for (unsigned i = 0; i != NumArgs; i++) {
for (unsigned i = 0, e = Record.size()-1; i != e; i += 2) {
Value *V;
// With the new function encoding, it is possible that operands have
// negative IDs (for forward references). Use a signed VBR
// representation to keep the encoding small.
if (UseRelativeIDs)
V = getValueSigned(Record, i * 2 + 1, NextValueNo, Ty);
V = getValueSigned(Record, 1+i, NextValueNo, Ty);
else
V = getValue(Record, i * 2 + 1, NextValueNo, Ty);
BasicBlock *BB = getBasicBlock(Record[i * 2 + 2]);
V = getValue(Record, 1+i, NextValueNo, Ty);
BasicBlock *BB = getBasicBlock(Record[2+i]);
if (!V || !BB)
return error("Invalid record");
PN->addIncoming(V, BB);
}
I = PN;
// If there are an even number of records, the final record must be FMF.
if (Record.size() % 2 == 0) {
assert(isa<FPMathOperator>(I) && "Unexpected phi type");
FastMathFlags FMF = getDecodedFastMathFlags(Record[Record.size() - 1]);
if (FMF.any())
I->setFastMathFlags(FMF);
}
break;
}