6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-28 19:31:58 +00:00
Code Issues Projects Releases Wiki Activity

Stop using getValues().

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15485 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alkis Evlogimenos 2004-08-04 08:08:13 +00:00
parent 93ad2cf910
commit cc7ba49d85
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Linker/LinkModules.cpp
View File

@ -292,18 +292,16 @@ static Value *RemapOperand(const Value *In,
Constant *Result = 0; Constant *Result = 0;
if (const ConstantArray *CPA = dyn_cast<ConstantArray>(CPV)) { if (const ConstantArray *CPA = dyn_cast<ConstantArray>(CPV)) {
const std::vector<Use> &Ops = CPA->getValues(); std::vector<Constant*> Operands(CPA->getNumOperands());
std::vector<Constant*> Operands(Ops.size()); for (unsigned i = 0, e = CPA->getNumOperands(); i != e; ++i)
for (unsigned i = 0, e = Ops.size(); i != e; ++i) Operands[i] =
Operands[i] = cast<Constant>(RemapOperand(CPA->getOperand(i), LocalMap, GlobalMap));
cast<Constant>(RemapOperand(Ops[i], LocalMap, GlobalMap));
Result = ConstantArray::get(cast<ArrayType>(CPA->getType()), Operands); Result = ConstantArray::get(cast<ArrayType>(CPA->getType()), Operands);
} else if (const ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) { } else if (const ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) {
const std::vector<Use> &Ops = CPS->getValues(); std::vector<Constant*> Operands(CPS->getNumOperands());
std::vector<Constant*> Operands(Ops.size()); for (unsigned i = 0, e = CPS->getNumOperands(); i != e; ++i)
for (unsigned i = 0; i < Ops.size(); ++i) Operands[i] =
Operands[i] = cast<Constant>(RemapOperand(CPS->getOperand(i), LocalMap, GlobalMap));
cast<Constant>(RemapOperand(Ops[i], LocalMap, GlobalMap));
Result = ConstantStruct::get(cast<StructType>(CPS->getType()), Operands); Result = ConstantStruct::get(cast<StructType>(CPS->getType()), Operands);
} else if (isa<ConstantPointerNull>(CPV)) { } else if (isa<ConstantPointerNull>(CPV)) {
Result = const_cast<Constant*>(CPV); Result = const_cast<Constant*>(CPV);
@ -774,7 +772,7 @@ static bool LinkAppendingVars(Module *M,
Inits.reserve(NewSize); Inits.reserve(NewSize);
if (ConstantArray *I = dyn_cast<ConstantArray>(G1->getInitializer())) { if (ConstantArray *I = dyn_cast<ConstantArray>(G1->getInitializer())) {
for (unsigned i = 0, e = T1->getNumElements(); i != e; ++i) for (unsigned i = 0, e = T1->getNumElements(); i != e; ++i)
Inits.push_back(cast<Constant>(I->getValues()[i])); Inits.push_back(I->getOperand(i));
} else { } else {
assert(isa<ConstantAggregateZero>(G1->getInitializer())); assert(isa<ConstantAggregateZero>(G1->getInitializer()));
Constant *CV = Constant::getNullValue(T1->getElementType()); Constant *CV = Constant::getNullValue(T1->getElementType());
@ -783,7 +781,7 @@ static bool LinkAppendingVars(Module *M,
} }
if (ConstantArray *I = dyn_cast<ConstantArray>(G2->getInitializer())) { if (ConstantArray *I = dyn_cast<ConstantArray>(G2->getInitializer())) {
for (unsigned i = 0, e = T2->getNumElements(); i != e; ++i) for (unsigned i = 0, e = T2->getNumElements(); i != e; ++i)
Inits.push_back(cast<Constant>(I->getValues()[i])); Inits.push_back(I->getOperand(i));
} else { } else {
assert(isa<ConstantAggregateZero>(G2->getInitializer())); assert(isa<ConstantAggregateZero>(G2->getInitializer()));
Constant *CV = Constant::getNullValue(T2->getElementType()); Constant *CV = Constant::getNullValue(T2->getElementType());

22
lib/VMCore/Linker.cpp
View File

@ -292,18 +292,16 @@ static Value *RemapOperand(const Value *In,
Constant *Result = 0; Constant *Result = 0;
if (const ConstantArray *CPA = dyn_cast<ConstantArray>(CPV)) { if (const ConstantArray *CPA = dyn_cast<ConstantArray>(CPV)) {
const std::vector<Use> &Ops = CPA->getValues(); std::vector<Constant*> Operands(CPA->getNumOperands());
std::vector<Constant*> Operands(Ops.size()); for (unsigned i = 0, e = CPA->getNumOperands(); i != e; ++i)
for (unsigned i = 0, e = Ops.size(); i != e; ++i) Operands[i] =
Operands[i] = cast<Constant>(RemapOperand(CPA->getOperand(i), LocalMap, GlobalMap));
cast<Constant>(RemapOperand(Ops[i], LocalMap, GlobalMap));
Result = ConstantArray::get(cast<ArrayType>(CPA->getType()), Operands); Result = ConstantArray::get(cast<ArrayType>(CPA->getType()), Operands);
} else if (const ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) { } else if (const ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) {
const std::vector<Use> &Ops = CPS->getValues(); std::vector<Constant*> Operands(CPS->getNumOperands());
std::vector<Constant*> Operands(Ops.size()); for (unsigned i = 0, e = CPS->getNumOperands(); i != e; ++i)
for (unsigned i = 0; i < Ops.size(); ++i) Operands[i] =
Operands[i] = cast<Constant>(RemapOperand(CPS->getOperand(i), LocalMap, GlobalMap));
cast<Constant>(RemapOperand(Ops[i], LocalMap, GlobalMap));
Result = ConstantStruct::get(cast<StructType>(CPS->getType()), Operands); Result = ConstantStruct::get(cast<StructType>(CPS->getType()), Operands);
} else if (isa<ConstantPointerNull>(CPV)) { } else if (isa<ConstantPointerNull>(CPV)) {
Result = const_cast<Constant*>(CPV); Result = const_cast<Constant*>(CPV);
@ -774,7 +772,7 @@ static bool LinkAppendingVars(Module *M,
Inits.reserve(NewSize); Inits.reserve(NewSize);
if (ConstantArray *I = dyn_cast<ConstantArray>(G1->getInitializer())) { if (ConstantArray *I = dyn_cast<ConstantArray>(G1->getInitializer())) {
for (unsigned i = 0, e = T1->getNumElements(); i != e; ++i) for (unsigned i = 0, e = T1->getNumElements(); i != e; ++i)
Inits.push_back(cast<Constant>(I->getValues()[i])); Inits.push_back(I->getOperand(i));
} else { } else {
assert(isa<ConstantAggregateZero>(G1->getInitializer())); assert(isa<ConstantAggregateZero>(G1->getInitializer()));
Constant *CV = Constant::getNullValue(T1->getElementType()); Constant *CV = Constant::getNullValue(T1->getElementType());
@ -783,7 +781,7 @@ static bool LinkAppendingVars(Module *M,
} }
if (ConstantArray *I = dyn_cast<ConstantArray>(G2->getInitializer())) { if (ConstantArray *I = dyn_cast<ConstantArray>(G2->getInitializer())) {
for (unsigned i = 0, e = T2->getNumElements(); i != e; ++i) for (unsigned i = 0, e = T2->getNumElements(); i != e; ++i)
Inits.push_back(cast<Constant>(I->getValues()[i])); Inits.push_back(I->getOperand(i));
} else { } else {
assert(isa<ConstantAggregateZero>(G2->getInitializer())); assert(isa<ConstantAggregateZero>(G2->getInitializer()));
Constant *CV = Constant::getNullValue(T2->getElementType()); Constant *CV = Constant::getNullValue(T2->getElementType());