6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-09-30 19:55:11 +00:00
Code Issues Projects Releases Wiki Activity

rework this logic to not depend on the last argument to GetConstantStringInfo,

Browse Source 
which is going away.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149348 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2012-01-31 04:39:22 +00:00
parent c63352f633
commit 4a6facbc57
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/CodeGen/SelectionDAG/SelectionDAG.cpp
View File

@ -3323,7 +3323,10 @@ static SDValue getMemsetStringVal(EVT VT, DebugLoc dl, SelectionDAG &DAG,
if (TLI.isLittleEndian())
Offset = Offset + MSB - 1;
for (unsigned i = 0; i != MSB; ++i) {
Val = (Val << 8) | (unsigned char)Str[Offset];
Val = (Val << 8);
if (Offset < Str.size())
Val |= (unsigned char)Str[Offset];
Offset += TLI.isLittleEndian() ? -1 : 1;
}
return DAG.getConstant(Val, VT);
@ -3354,9 +3357,12 @@ static bool isMemSrcFromString(SDValue Src, std::string &Str) {
if (!G)
return false;
const GlobalVariable *GV = dyn_cast<GlobalVariable>(G->getGlobal());
if (GV && GetConstantStringInfo(GV, Str, SrcDelta, false))
return true;
if (const GlobalVariable *GV = dyn_cast<GlobalVariable>(G->getGlobal()))
if (GetConstantStringInfo(GV, Str, SrcDelta)) {
// The nul can also be read.
Str.push_back(0);
return true;
}
return false;
}