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

Fix a bug that was causing GVN to crash on 252.eon. 

llvm-svn: 40494
This commit is contained in:
Owen Anderson 2007-07-25 21:13:41 +00:00
parent b9f5c0c5be
commit 7bf26ee444
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/lib/Transforms/Scalar/GVN.cpp
View File

@ -714,8 +714,15 @@ Value *GVN::performPHIConstruction(BasicBlock *BB, LoadInst* orig,
unsigned numPreds = std::distance(pred_begin(BB), pred_end(BB));
if (numPreds == 1) {
Phis[BB] = Phis[*pred_begin(BB)];
return Phis[BB];
DenseMap<BasicBlock*, Value*>::iterator DI = Phis.find(BB);
if (DI != Phis.end()) {
Phis.insert(std::make_pair(BB, DI->second));
return DI->second;
} else {
Value* domV = performPHIConstruction(*pred_begin(BB), orig, Phis);
Phis.insert(std::make_pair(BB, domV));
return domV;
}
} else {
PHINode *PN = new PHINode(orig->getType(), orig->getName()+".rle", BB->begin());
PN->reserveOperandSpace(numPreds);

29
llvm/test/Transforms/GVN/2007-07-25-SinglePredecessor.ll Normal file
View File

@ -0,0 +1,29 @@
; RUN: llvm-as < %s | opt -gvn | llvm-dis
%struct.ggBRDF = type { i32 (...)** }
%struct.ggBox3 = type { %struct.ggPoint3, %struct.ggPoint3 }
%struct.ggMaterialRecord = type { %struct.ggPoint2, %struct.ggBox3, %struct.ggBox3, %struct.ggSpectrum, %struct.ggSpectrum, %struct.ggSpectrum, %struct.ggBRDF*, i32, i32, i32, i32 }
%struct.ggONB3 = type { %struct.ggPoint3, %struct.ggPoint3, %struct.ggPoint3 }
%struct.ggPoint2 = type { [2 x double] }
%struct.ggPoint3 = type { [3 x double] }
%struct.ggSpectrum = type { [8 x float] }
%struct.mrViewingHitRecord = type { double, %struct.ggPoint3, %struct.ggONB3, %struct.ggPoint2, double, %struct.ggSpectrum, %struct.ggSpectrum, i32, i32, i32, i32 }
%struct.mrXEllipticalCylinder = type { %struct.ggBRDF, float, float, float, float, float, float }
define i32 @_ZNK21mrZEllipticalCylinder10viewingHitERK6ggRay3dddR18mrViewingHitRecordR16ggMaterialRecord(%struct.mrXEllipticalCylinder* %this, %struct.ggBox3* %ray, double %unnamed_arg, double %tmin, double %tmax, %struct.mrViewingHitRecord* %VHR, %struct.ggMaterialRecord* %unnamed_arg2) {
entry:
%tmp80.i = getelementptr %struct.mrViewingHitRecord* %VHR, i32 0, i32 1, i32 0, i32 0 ; <double*> [#uses=1]
store double 0.000000e+00, double* %tmp80.i
br i1 false, label %return, label %cond_next.i
cond_next.i: ; preds = %entry
br i1 false, label %return, label %cond_true
cond_true: ; preds = %cond_next.i
%tmp3.i8 = getelementptr %struct.mrViewingHitRecord* %VHR, i32 0, i32 1, i32 0, i32 0 ; <double*> [#uses=1]
%tmp46 = load double* %tmp3.i8 ; <double> [#uses=0]
ret i32 1
return: ; preds = %cond_next.i, %entry
ret i32 0
}