diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-10-01 08:00:54 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-10-01 08:00:54 +0000 |
| commit | 7753d66468faba90059031833c294df672f93942 (patch) | |
| tree | 11794c20042b359cf65266d4752286c82d0b7ea5 /llvm/lib/Target/ARM/ARMConstantPoolValue.cpp | |
| parent | f117a35de0720a0e44b1418e6da29e86435205a8 (diff) | |
| download | bcm5719-llvm-7753d66468faba90059031833c294df672f93942.tar.gz bcm5719-llvm-7753d66468faba90059031833c294df672f93942.zip | |
Switch over to using ARMConstantPoolConstant for global variables, functions,
and block addresses.
llvm-svn: 140936
Diffstat (limited to 'llvm/lib/Target/ARM/ARMConstantPoolValue.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMConstantPoolValue.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp b/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp index 8a4e555367e..2d21e7fcf28 100644 --- a/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp +++ b/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp @@ -31,7 +31,7 @@ ARMConstantPoolValue::ARMConstantPoolValue(Type *Ty, unsigned id, unsigned char PCAdj, ARMCP::ARMCPModifier modifier, bool addCurrentAddress) - : MachineConstantPoolValue(Ty), S(NULL), LabelId(id), Kind(kind), + : MachineConstantPoolValue(Ty), MBB(NULL), S(NULL), LabelId(id), Kind(kind), PCAdjust(PCAdj), Modifier(modifier), AddCurrentAddress(addCurrentAddress) {} @@ -113,8 +113,7 @@ int ARMConstantPoolValue::getExistingMachineCPValue(MachineConstantPool *CP, (Constants[i].getAlignment() & AlignMask) == 0) { ARMConstantPoolValue *CPV = (ARMConstantPoolValue *)Constants[i].Val.MachineCPVal; - if (CPV->CVal == CVal && - CPV->LabelId == LabelId && + if (CPV->LabelId == LabelId && CPV->PCAdjust == PCAdjust && CPV_streq(CPV->S, S) && CPV->Modifier == Modifier) @@ -131,7 +130,6 @@ ARMConstantPoolValue::~ARMConstantPoolValue() { void ARMConstantPoolValue::addSelectionDAGCSEId(FoldingSetNodeID &ID) { - ID.AddPointer(CVal); ID.AddPointer(S); ID.AddInteger(LabelId); ID.AddInteger(PCAdjust); @@ -140,7 +138,6 @@ ARMConstantPoolValue::addSelectionDAGCSEId(FoldingSetNodeID &ID) { bool ARMConstantPoolValue::hasSameValue(ARMConstantPoolValue *ACPV) { if (ACPV->Kind == Kind && - ACPV->CVal == CVal && ACPV->PCAdjust == PCAdjust && CPV_streq(ACPV->S, S) && ACPV->Modifier == Modifier) { |
