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

bug 122: 

- Replace ConstantPointerRef usage with GlobalValue usage
- Correct isa<Constant> for GlobalValue subclass

llvm-svn: 14939
This commit is contained in:
Reid Spencer 2004-07-18 00:12:03 +00:00
parent edbb40b23c
commit db1863d50c
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/lib/Bytecode/Reader/Reader.cpp
View File

@ -425,12 +425,9 @@ Constant* BytecodeReader::getConstantValue(unsigned TypeSlot, unsigned Slot) {
if (Value *V = getValue(TypeSlot, Slot, false))
if (Constant *C = dyn_cast<Constant>(V))
return C; // If we already have the value parsed, just return it
else if (GlobalValue *GV = dyn_cast<GlobalValue>(V))
// ConstantPointerRef's are an abomination, but at least they don't have
// to infest bytecode files.
return ConstantPointerRef::get(GV);
else
error("Reference of a value is expected to be a constant!");
error("Value for slot " + utostr(Slot) +
" is expected to be a constant!");
const Type *Ty = getType(TypeSlot);
std::pair<const Type*, unsigned> Key(Ty, Slot);
@ -1356,14 +1353,13 @@ Constant *BytecodeReader::ParseConstantValue(unsigned TypeID) {
GlobalValue *GV;
if (Val) {
if (!(GV = dyn_cast<GlobalValue>(Val)))
error("Value of ConstantPointerRef not in ValueTable!");
error("GlobalValue not in ValueTable!");
} else {
error("Forward references are not allowed here.");
}
Constant* Result = ConstantPointerRef::get(GV);
if (Handler) Handler->handleConstantPointer(PT, Slot, GV, Result);
return Result;
if (Handler) Handler->handleConstantPointer(PT, Slot, GV );
return GV;
}
default: