From a93b44322400d8330488be0e3eaf26a67655137e Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Tue, 10 Mar 2015 06:34:57 +0000 Subject: [PATCH] Fix a stack overflow in the assembler when checking that GEPs must be over sized types. We failed to use a marking set to properly handle recursive types, which caused use to recurse infinitely and eventually overflow the stack. llvm-svn: 231760 --- lib/AsmParser/LLParser.cpp | 8 ++++++-- test/Assembler/unsized-recursive-type.ll | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 test/Assembler/unsized-recursive-type.ll diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 65e622af66c..c1d2810a5cf 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -2810,7 +2810,9 @@ bool LLParser::ParseValID(ValID &ID, PerFunctionState *PFS) { } } - if (!Indices.empty() && !BasePointerType->getElementType()->isSized()) + SmallPtrSet Visited; + if (!Indices.empty() && + !BasePointerType->getElementType()->isSized(&Visited)) return Error(ID.Loc, "base element of getelementptr must be sized"); if (!GetElementPtrInst::getIndexedType(Elts[0]->getType(), Indices)) @@ -5496,7 +5498,9 @@ int LLParser::ParseGetElementPtr(Instruction *&Inst, PerFunctionState &PFS) { Indices.push_back(Val); } - if (!Indices.empty() && !BasePointerType->getElementType()->isSized()) + SmallPtrSet Visited; + if (!Indices.empty() && + !BasePointerType->getElementType()->isSized(&Visited)) return Error(Loc, "base element of getelementptr must be sized"); if (!GetElementPtrInst::getIndexedType(BaseType, Indices)) diff --git a/test/Assembler/unsized-recursive-type.ll b/test/Assembler/unsized-recursive-type.ll new file mode 100644 index 00000000000..b6d93fa19fe --- /dev/null +++ b/test/Assembler/unsized-recursive-type.ll @@ -0,0 +1,9 @@ +; RUN: not llvm-as < %s 2>&1 | FileCheck %s + +; CHECK: base element of getelementptr must be sized + +%myTy = type { %myTy } +define void @foo(%myTy* %p){ + %0 = getelementptr %myTy, %myTy* %p, i32 0 + ret void +}