aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tracking LLVM trunk: SmallPtrSet changes

Browse Source
This commit is contained in:
Dmitry Babokin
2014-11-21 16:37:47 +03:00
parent 56c78e55d5
commit 22dcc9a651
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cbackend.cpp
View File

@@ -2762,14 +2762,22 @@ void CWriter::printContainedStructs(llvm::Type *Ty,
if (llvm::StructType *ST = llvm::dyn_cast<llvm::StructType>(Ty)) { if (llvm::StructType *ST = llvm::dyn_cast<llvm::StructType>(Ty)) {
// Check to see if we have already printed this struct. // Check to see if we have already printed this struct.
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) && !defined(LLVM_3_5) // LLVM 3.6+
if (!Printed.insert(Ty).second) return;
#else
if (!Printed.insert(Ty)) return; if (!Printed.insert(Ty)) return;
#endif
// Print structure type out. // Print structure type out.
printType(Out, ST, false, getStructName(ST), true); printType(Out, ST, false, getStructName(ST), true);
Out << ";\n\n"; Out << ";\n\n";
} }
if (llvm::ArrayType *AT = llvm::dyn_cast<llvm::ArrayType>(Ty)) { if (llvm::ArrayType *AT = llvm::dyn_cast<llvm::ArrayType>(Ty)) {
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) && !defined(LLVM_3_5) // LLVM 3.6+
if (!Printed.insert(Ty).second) return;
#else
if (!Printed.insert(Ty)) return; if (!Printed.insert(Ty)) return;
#endif
printType(Out, AT, false, getArrayName(AT), true); printType(Out, AT, false, getArrayName(AT), true);
Out << ";\n\n"; Out << ";\n\n";
@@ -2778,8 +2786,13 @@ void CWriter::printContainedStructs(llvm::Type *Ty,
void CWriter::printContainedArrays(llvm::ArrayType *ATy, void CWriter::printContainedArrays(llvm::ArrayType *ATy,
llvm::SmallPtrSet<llvm::Type *, 16> &Printed) { llvm::SmallPtrSet<llvm::Type *, 16> &Printed) {
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) && !defined(LLVM_3_5) // LLVM 3.6+
if (!Printed.insert(ATy).second)
return;
#else
if (!Printed.insert(ATy)) if (!Printed.insert(ATy))
return; return;
#endif
llvm::ArrayType *ChildTy = llvm::dyn_cast<llvm::ArrayType>(ATy->getElementType()); llvm::ArrayType *ChildTy = llvm::dyn_cast<llvm::ArrayType>(ATy->getElementType());
if (ChildTy != NULL) if (ChildTy != NULL)