From ca14237696a1b7453bbf90f511bd9f2b03254ae9 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 28 Apr 2002 19:55:58 +0000 Subject: Split ConstantVals.h into Constant.h and Constants.h llvm-svn: 2378 --- llvm/lib/Bytecode/Reader/ConstantReader.cpp | 2 +- llvm/lib/Bytecode/Reader/Reader.cpp | 2 +- llvm/lib/Bytecode/Writer/ConstantWriter.cpp | 2 +- llvm/lib/Bytecode/Writer/Writer.cpp | 7 +++---- 4 files changed, 6 insertions(+), 7 deletions(-) (limited to 'llvm/lib/Bytecode') diff --git a/llvm/lib/Bytecode/Reader/ConstantReader.cpp b/llvm/lib/Bytecode/Reader/ConstantReader.cpp index 89beddb9568..4c7ebb119ac 100644 --- a/llvm/lib/Bytecode/Reader/ConstantReader.cpp +++ b/llvm/lib/Bytecode/Reader/ConstantReader.cpp @@ -11,7 +11,7 @@ #include "ReaderInternals.h" #include "llvm/Module.h" #include "llvm/BasicBlock.h" -#include "llvm/ConstantVals.h" +#include "llvm/Constants.h" #include "llvm/GlobalVariable.h" #include #include diff --git a/llvm/lib/Bytecode/Reader/Reader.cpp b/llvm/lib/Bytecode/Reader/Reader.cpp index fff2d02898c..7418c81bbea 100644 --- a/llvm/lib/Bytecode/Reader/Reader.cpp +++ b/llvm/lib/Bytecode/Reader/Reader.cpp @@ -16,7 +16,7 @@ #include "llvm/GlobalVariable.h" #include "llvm/Module.h" #include "llvm/BasicBlock.h" -#include "llvm/ConstantVals.h" +#include "llvm/Constants.h" #include "llvm/iPHINode.h" #include "llvm/iOther.h" #include "llvm/Argument.h" diff --git a/llvm/lib/Bytecode/Writer/ConstantWriter.cpp b/llvm/lib/Bytecode/Writer/ConstantWriter.cpp index 296e326445a..d85ee2fe755 100644 --- a/llvm/lib/Bytecode/Writer/ConstantWriter.cpp +++ b/llvm/lib/Bytecode/Writer/ConstantWriter.cpp @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #include "WriterInternals.h" -#include "llvm/ConstantVals.h" +#include "llvm/Constants.h" #include "llvm/SymbolTable.h" #include "llvm/DerivedTypes.h" #include diff --git a/llvm/lib/Bytecode/Writer/Writer.cpp b/llvm/lib/Bytecode/Writer/Writer.cpp index 2f427770d90..145004b716d 100644 --- a/llvm/lib/Bytecode/Writer/Writer.cpp +++ b/llvm/lib/Bytecode/Writer/Writer.cpp @@ -24,7 +24,6 @@ #include "llvm/GlobalVariable.h" #include "llvm/Function.h" #include "llvm/BasicBlock.h" -#include "llvm/ConstantVals.h" #include "llvm/SymbolTable.h" #include "llvm/DerivedTypes.h" #include "Support/STLExtras.h" @@ -78,8 +77,8 @@ void BytecodeWriter::outputConstants(bool isFunction) { unsigned NC = ValNo; // Number of constants for (; NC < Plane.size() && - (isa(Plane[NC]) || - isa(Plane[NC])); NC++) /*empty*/; + (isa(Plane[NC]) || isa(Plane[NC])); NC++) + /*empty*/; NC -= ValNo; // Convert from index into count if (NC == 0) continue; // Skip empty type planes... @@ -125,7 +124,7 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) { // If we have an initializer, output it now. if (GV->hasInitializer()) { - Slot = Table.getValSlot(GV->getInitializer()); + Slot = Table.getValSlot((Value*)GV->getInitializer()); assert(Slot != -1 && "No slot for global var initializer!"); output_vbr((unsigned)Slot, Out); } -- cgit v1.2.3