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

Constify this properly. Found by gcc48 -Wcast-qual. 

llvm-svn: 163256
This commit is contained in:
Roman Divacky 2012-09-05 22:15:49 +00:00
parent 9f33d68668
commit 9338344acb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
View File

@ -8924,7 +8924,7 @@ SDValue DAGCombiner::BuildUDIV(SDNode *N) {
// to alias with anything but itself. Provides base object and offset as // to alias with anything but itself. Provides base object and offset as
// results. // results.
static bool FindBaseOffset(SDValue Ptr, SDValue &Base, int64_t &Offset, static bool FindBaseOffset(SDValue Ptr, SDValue &Base, int64_t &Offset,
const GlobalValue *&GV, void *&CV) { const GlobalValue *&GV, const void *&CV) {
// Assume it is a primitive operation. // Assume it is a primitive operation.
Base = Ptr; Offset = 0; GV = 0; CV = 0; Base = Ptr; Offset = 0; GV = 0; CV = 0;
@ -8949,8 +8949,8 @@ static bool FindBaseOffset(SDValue Ptr, SDValue &Base, int64_t &Offset,
// for ConstantSDNodes since the same constant pool entry may be represented // for ConstantSDNodes since the same constant pool entry may be represented
// by multiple nodes with different offsets. // by multiple nodes with different offsets.
if (ConstantPoolSDNode *C = dyn_cast<ConstantPoolSDNode>(Base)) { if (ConstantPoolSDNode *C = dyn_cast<ConstantPoolSDNode>(Base)) {
CV = C->isMachineConstantPoolEntry() ? (void *)C->getMachineCPVal() CV = C->isMachineConstantPoolEntry() ? (const void *)C->getMachineCPVal()
: (void *)C->getConstVal(); : (const void *)C->getConstVal();
Offset += C->getOffset(); Offset += C->getOffset();
return false; return false;
} }
@ -8975,7 +8975,7 @@ bool DAGCombiner::isAlias(SDValue Ptr1, int64_t Size1,
SDValue Base1, Base2; SDValue Base1, Base2;
int64_t Offset1, Offset2; int64_t Offset1, Offset2;
const GlobalValue *GV1, *GV2; const GlobalValue *GV1, *GV2;
void *CV1, *CV2; const void *CV1, *CV2;
bool isFrameIndex1 = FindBaseOffset(Ptr1, Base1, Offset1, GV1, CV1); bool isFrameIndex1 = FindBaseOffset(Ptr1, Base1, Offset1, GV1, CV1);
bool isFrameIndex2 = FindBaseOffset(Ptr2, Base2, Offset2, GV2, CV2); bool isFrameIndex2 = FindBaseOffset(Ptr2, Base2, Offset2, GV2, CV2);