diff options
Diffstat (limited to 'lib/Bytecode/Writer')
| -rw-r--r-- | lib/Bytecode/Writer/SlotCalculator.cpp | 4 | ||||
| -rw-r--r-- | lib/Bytecode/Writer/Writer.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp index d0f37fb723..38980e5e63 100644 --- a/lib/Bytecode/Writer/SlotCalculator.cpp +++ b/lib/Bytecode/Writer/SlotCalculator.cpp @@ -106,7 +106,7 @@ void SlotCalculator::processSymbolTableConstants(const SymbolTable *ST) { for (SymbolTable::const_iterator I = ST->begin(), E = ST->end(); I != E; ++I) for (SymbolTable::type_const_iterator TI = I->second.begin(), TE = I->second.end(); TI != TE; ++TI) - if (TI->second->isConstant()) + if (isa<ConstPoolVal>(TI->second)) insertValue(TI->second); } @@ -223,7 +223,7 @@ int SlotCalculator::getValSlot(const Value *D) const { int SlotCalculator::insertValue(const Value *D) { - if (D->isConstant() || D->isGlobal()) { + if (isa<ConstPoolVal>(D) || isa<GlobalVariable>(D)) { const User *U = (const User *)D; // This makes sure that if a constant has uses (for example an array // of const ints), that they are inserted also. Same for global variable diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp index 94cbcec328..5df2fdabde 100644 --- a/lib/Bytecode/Writer/Writer.cpp +++ b/lib/Bytecode/Writer/Writer.cpp @@ -79,7 +79,7 @@ void BytecodeWriter::outputConstants(bool isMethod) { ValNo = Type::FirstDerivedTyID; // Start emitting at the derived types... // Scan through and ignore method arguments... - for (; ValNo < Plane.size() && Plane[ValNo]->isMethodArgument(); ValNo++) + for (; ValNo < Plane.size() && isa<MethodArgument>(Plane[ValNo]); ValNo++) /*empty*/; unsigned NC = ValNo; // Number of constants @@ -103,7 +103,7 @@ void BytecodeWriter::outputConstants(bool isMethod) { for (unsigned i = ValNo; i < ValNo+NC; ++i) { const Value *V = Plane[i]; - if (const ConstPoolVal *CPV = V->castConstant()) { + if (const ConstPoolVal *CPV = dyn_cast<ConstPoolVal>(V)) { //cerr << "Serializing value: <" << V->getType() << ">: " // << ((const ConstPoolVal*)V)->getStrValue() << ":" // << Out.size() << "\n"; @@ -127,7 +127,7 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) { // Fields: bit0 = isConstant, bit1 = hasInitializer, bit2+ = slot# unsigned oSlot = ((unsigned)Slot << 2) | (GV->hasInitializer() << 1) | - GV->isConstant(); + isa<ConstPoolVal>(GV); output_vbr(oSlot, Out); // If we have an initialized, output it now. |