mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 04:30:23 +00:00
- Dramatically simplify the Constant::mutateReferences implementation,
allowing it to be called on all constant types (structures/arrays) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4160 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
9e932bd566
commit
34048e2ace
@ -79,7 +79,7 @@ public:
|
||||
// WARNING: Only to be used by Bytecode & Assembly Parsers! USER CODE SHOULD
|
||||
// NOT USE THIS!!
|
||||
// Returns the number of uses of OldV that were replaced.
|
||||
virtual unsigned mutateReferences(Value* OldV, Value *NewV) { return 0; }
|
||||
unsigned mutateReferences(Value* OldV, Value *NewV);
|
||||
// END WARNING!!
|
||||
};
|
||||
|
||||
|
@ -439,12 +439,6 @@ public:
|
||||
static inline bool classof(const Value *V) {
|
||||
return isa<ConstantPointer>(V) && classof(cast<ConstantPointer>(V));
|
||||
}
|
||||
|
||||
// WARNING: Only to be used by Bytecode & Assembly Parsers! USER CODE SHOULD
|
||||
// NOT USE THIS!!
|
||||
// Returns the number of uses of OldV that were replaced.
|
||||
virtual unsigned mutateReferences(Value* OldV, Value *NewV);
|
||||
// END WARNING!!
|
||||
};
|
||||
|
||||
|
||||
@ -502,14 +496,6 @@ public:
|
||||
static inline bool classof(const Value *V) {
|
||||
return isa<Constant>(V) && classof(cast<Constant>(V));
|
||||
}
|
||||
|
||||
public:
|
||||
// WARNING: Only to be used by Bytecode & Assembly Parsers! USER CODE SHOULD
|
||||
// NOT USE THIS!!
|
||||
// Returns the number of uses of OldV that were replaced.
|
||||
virtual unsigned mutateReferences(Value* OldV, Value *NewV);
|
||||
// END WARNING!!
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
@ -59,7 +59,8 @@ private:
|
||||
SymbolTable *SymTab;
|
||||
|
||||
// Accessor for the underlying GlobalValRefMap... only through the
|
||||
// ConstantPointerRef class...
|
||||
// Constant class...
|
||||
friend class Constant;
|
||||
friend class ConstantPointerRef;
|
||||
void mutateConstantPointerRef(GlobalValue *OldGV, GlobalValue *NewGV);
|
||||
ConstantPointerRef *getConstantPointerRef(GlobalValue *GV);
|
||||
|
@ -685,27 +685,25 @@ const char *ConstantExpr::getOpcodeName() const {
|
||||
return Instruction::getOpcodeName(getOpcode());
|
||||
}
|
||||
|
||||
unsigned Constant::mutateReferences(Value *OldV, Value *NewV) {
|
||||
// Uses of constant pointer refs are global values, not constants!
|
||||
if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(this)) {
|
||||
GlobalValue *NewGV = cast<GlobalValue>(NewV);
|
||||
GlobalValue *OldGV = CPR->getValue();
|
||||
|
||||
//---- ConstantPointerRef::mutateReferences() implementation...
|
||||
//
|
||||
unsigned ConstantPointerRef::mutateReferences(Value *OldV, Value *NewV) {
|
||||
assert(getValue() == OldV && "Cannot mutate old value if I'm not using it!");
|
||||
GlobalValue *NewGV = cast<GlobalValue>(NewV);
|
||||
getValue()->getParent()->mutateConstantPointerRef(getValue(), NewGV);
|
||||
Operands[0] = NewGV;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
//---- ConstantPointerExpr::mutateReferences() implementation...
|
||||
//
|
||||
unsigned ConstantExpr::mutateReferences(Value* OldV, Value *NewV) {
|
||||
unsigned NumReplaced = 0;
|
||||
Constant *NewC = cast<Constant>(NewV);
|
||||
for (unsigned i = 0, N = getNumOperands(); i != N; ++i)
|
||||
if (Operands[i] == OldV) {
|
||||
++NumReplaced;
|
||||
Operands[i] = NewC;
|
||||
}
|
||||
return NumReplaced;
|
||||
assert(OldGV == OldV && "Cannot mutate old value if I'm not using it!");
|
||||
|
||||
OldGV->getParent()->mutateConstantPointerRef(OldGV, NewGV);
|
||||
Operands[0] = NewGV;
|
||||
return 1;
|
||||
} else {
|
||||
Constant *NewC = cast<Constant>(NewV);
|
||||
unsigned NumReplaced = 0;
|
||||
for (unsigned i = 0, N = getNumOperands(); i != N; ++i)
|
||||
if (Operands[i] == OldV) {
|
||||
++NumReplaced;
|
||||
Operands[i] = NewC;
|
||||
}
|
||||
return NumReplaced;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user