maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[CodeGen] Make logic of CCState::resultsCompatible clearer" 

This reverts commit d782d1f898
which caused test CodeGen/X86/sibcall.ll to fail.
This commit is contained in:
David Spickett 2020-05-06 10:13:20 +01:00
parent cf5ed6dc59
commit e1022cb5d4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/CodeGen/CallingConvLower.cpp
View File

@ -276,14 +276,18 @@ bool CCState::resultsCompatible(CallingConv::ID CalleeCC,
for (unsigned I = 0, E = RVLocs1.size(); I != E; ++I) {
const CCValAssign &Loc1 = RVLocs1[I];
const CCValAssign &Loc2 = RVLocs2[I];
if ( // Must both be in registers, or both in memory
Loc1.isRegLoc() != Loc2.isRegLoc() ||
// Must fill the same part of their locations
Loc1.getLocInfo() != Loc2.getLocInfo() ||
// Memory offset/register number must be the same
Loc1.getExtraInfo() != Loc1.getExtraInfo())
if (Loc1.getLocInfo() != Loc2.getLocInfo())
return false;
bool RegLoc1 = Loc1.isRegLoc();
if (RegLoc1 != Loc2.isRegLoc())
return false;
if (RegLoc1) {
if (Loc1.getLocReg() != Loc2.getLocReg())
return false;
} else {
if (Loc1.getLocMemOffset() != Loc2.getLocMemOffset())
return false;
}
}
return true;
}