diff options
| author | Owen Anderson <resistor@mac.com> | 2015-03-13 06:41:26 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2015-03-13 06:41:26 +0000 |
| commit | 08f46e1de67f333b10f4e299b4eccccc84ca6697 (patch) | |
| tree | 8aa63682991b770921bc6ea4c06b9507ecfa47e1 | |
| parent | 04183242b34d660cc5f265c329eca2fcb4d781e9 (diff) | |
| download | bcm5719-llvm-08f46e1de67f333b10f4e299b4eccccc84ca6697.tar.gz bcm5719-llvm-08f46e1de67f333b10f4e299b4eccccc84ca6697.zip | |
Fix an infinite recursion in the verifier caused by calling isSized on a recursive type.
llvm-svn: 232143
| -rw-r--r-- | llvm/lib/IR/Verifier.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/Verifier/recursive-struct-param.ll | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp index eaad5fb1b98..9e77c32ee4b 100644 --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -1014,7 +1014,8 @@ void Verifier::VerifyParameterAttrs(AttributeSet Attrs, unsigned Idx, Type *Ty, V); if (PointerType *PTy = dyn_cast<PointerType>(Ty)) { - if (!PTy->getElementType()->isSized()) { + SmallPtrSet<const Type*, 4> Visited; + if (!PTy->getElementType()->isSized(&Visited)) { Assert(!Attrs.hasAttribute(Idx, Attribute::ByVal) && !Attrs.hasAttribute(Idx, Attribute::InAlloca), "Attributes 'byval' and 'inalloca' do not support unsized types!", diff --git a/llvm/test/Verifier/recursive-struct-param.ll b/llvm/test/Verifier/recursive-struct-param.ll new file mode 100644 index 00000000000..4b280a010f0 --- /dev/null +++ b/llvm/test/Verifier/recursive-struct-param.ll @@ -0,0 +1,15 @@ +; RUN: opt -verify < %s + +%struct.__sFILE = type { %struct.__sFILE } + +@.str = private unnamed_addr constant [13 x i8] c"Hello world\0A\00", align 1 + +; Function Attrs: nounwind ssp +define void @test(%struct.__sFILE* %stream, i8* %str) { + %fputs = call i32 @fputs(i8* %str, %struct.__sFILE* %stream) + ret void +} + +; Function Attrs: nounwind +declare i32 @fputs(i8* nocapture, %struct.__sFILE* nocapture) + |
