replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Relax constrains on GEP type indexes 

llvm-svn: 10228
This commit is contained in:
Chris Lattner 2003-11-25 21:21:46 +00:00
parent 1c45d5185f
commit ad70d4a15b
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/VMCore/ConstantHandling.cpp
View File

@ -15,6 +15,7 @@
#include "llvm/iPHINode.h" #include "llvm/iPHINode.h"
#include "llvm/InstrTypes.h" #include "llvm/InstrTypes.h"
#include "llvm/DerivedTypes.h" #include "llvm/DerivedTypes.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
#include <cmath> #include <cmath>
using namespace llvm; using namespace llvm;
@ -159,22 +160,29 @@ Constant *llvm::ConstantFoldGetElementPtr(const Constant *C,
// TODO If C is null and all idx's are null, return null of the right type. // TODO If C is null and all idx's are null, return null of the right type.
if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) { if (ConstantExpr *CE = dyn_cast<ConstantExpr>(const_cast<Constant*>(C))) {
// Combine Indices - If the source pointer to this getelementptr instruction // Combine Indices - If the source pointer to this getelementptr instruction
// is a getelementptr instruction, combine the indices of the two // is a getelementptr instruction, combine the indices of the two
// getelementptr instructions into a single instruction. // getelementptr instructions into a single instruction.
// //
if (CE->getOpcode() == Instruction::GetElementPtr) { if (CE->getOpcode() == Instruction::GetElementPtr) {
if (CE->getOperand(CE->getNumOperands()-1)->getType() == Type::LongTy) { const Type *LastTy = 0;
for (gep_type_iterator I = gep_type_begin(CE), E = gep_type_end(CE);
I != E; ++I)
LastTy = *I;
if (LastTy && isa<ArrayType>(LastTy)) {
std::vector<Constant*> NewIndices; std::vector<Constant*> NewIndices;
NewIndices.reserve(IdxList.size() + CE->getNumOperands()); NewIndices.reserve(IdxList.size() + CE->getNumOperands());
for (unsigned i = 1, e = CE->getNumOperands()-1; i != e; ++i) for (unsigned i = 1, e = CE->getNumOperands()-1; i != e; ++i)
NewIndices.push_back(cast<Constant>(CE->getOperand(i))); NewIndices.push_back(cast<Constant>(CE->getOperand(i)));
// Add the last index of the source with the first index of the new GEP. // Add the last index of the source with the first index of the new GEP.
// Make sure to handle the case when they are actually different types.
Constant *Combined = Constant *Combined =
ConstantExpr::get(Instruction::Add, IdxList[0], ConstantExpr::get(Instruction::Add,
CE->getOperand(CE->getNumOperands()-1)); ConstantExpr::getCast(IdxList[0], Type::LongTy),
ConstantExpr::getCast(CE->getOperand(CE->getNumOperands()-1), Type::LongTy));
NewIndices.push_back(Combined); NewIndices.push_back(Combined);
NewIndices.insert(NewIndices.end(), IdxList.begin()+1, IdxList.end()); NewIndices.insert(NewIndices.end(), IdxList.begin()+1, IdxList.end());

10
llvm/lib/VMCore/Type.cpp
View File

@ -261,10 +261,10 @@ const std::string &Type::getDescription() const {
bool StructType::indexValid(const Value *V) const { bool StructType::indexValid(const Value *V) const {
if (!isa<Constant>(V)) return false; // Structure indexes require unsigned integer constants.
if (V->getType() != Type::UByteTy) return false; if (ConstantUInt *CU = dyn_cast<ConstantUInt>(V))
unsigned Idx = cast<ConstantUInt>(V)->getValue(); return CU->getValue() < ETypes.size();
return Idx < ETypes.size(); return false;
} }
// getTypeAtIndex - Given an index value into the type, return the type of the // getTypeAtIndex - Given an index value into the type, return the type of the
@ -272,11 +272,9 @@ bool StructType::indexValid(const Value *V) const {
// //
const Type *StructType::getTypeAtIndex(const Value *V) const { const Type *StructType::getTypeAtIndex(const Value *V) const {
assert(isa<Constant>(V) && "Structure index must be a constant!!"); assert(isa<Constant>(V) && "Structure index must be a constant!!");
assert(V->getType() == Type::UByteTy && "Structure index must be ubyte!");
unsigned Idx = cast<ConstantUInt>(V)->getValue(); unsigned Idx = cast<ConstantUInt>(V)->getValue();
assert(Idx < ETypes.size() && "Structure index out of range!"); assert(Idx < ETypes.size() && "Structure index out of range!");
assert(indexValid(V) && "Invalid structure index!"); // Duplicate check assert(indexValid(V) && "Invalid structure index!"); // Duplicate check
return ETypes[Idx]; return ETypes[Idx];
} }