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

Generic target: declare in anonymous namespace only l_array_*

Browse Source
This commit is contained in:
Dmitry Babokin
2015-05-08 00:06:49 +03:00
parent c76f03a263
commit 256e8325e3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cbackend.cpp
View File

@@ -2957,7 +2957,6 @@ void CWriter::printModuleTypes() {
// If any of them are missing names, add a unique ID to UnnamedStructIDs. // If any of them are missing names, add a unique ID to UnnamedStructIDs.
// Print out forward declarations for structure types. // Print out forward declarations for structure types.
Out << "namespace {\n";
for (unsigned i = 0, e = StructTypes.size(); i != e; ++i) { for (unsigned i = 0, e = StructTypes.size(); i != e; ++i) {
llvm::StructType *ST = StructTypes[i]; llvm::StructType *ST = StructTypes[i];
@@ -2966,9 +2965,10 @@ void CWriter::printModuleTypes() {
std::string Name = getStructName(ST); std::string Name = getStructName(ST);
Out << " struct " << Name << ";\n"; Out << "struct " << Name << ";\n";
} }
Out << "namespace {\n";
for (unsigned i = 0, e = ArrayTypes.size(); i != e; ++i) { for (unsigned i = 0, e = ArrayTypes.size(); i != e; ++i) {
llvm::ArrayType *AT = ArrayTypes[i]; llvm::ArrayType *AT = ArrayTypes[i];
ArrayIDs[AT] = NextTypeID++; ArrayIDs[AT] = NextTypeID++;
@@ -2998,13 +2998,13 @@ void CWriter::printModuleTypes() {
// printed in the correct order. // printed in the correct order.
// //
Out << "/* Structure and array contents */\n"; Out << "/* Structure and array contents */\n";
Out << "namespace {\n";
for (unsigned i = 0, e = StructTypes.size(); i != e; ++i) { for (unsigned i = 0, e = StructTypes.size(); i != e; ++i) {
if (StructTypes[i]->isStructTy()) if (StructTypes[i]->isStructTy())
// Only print out used types! // Only print out used types!
printContainedStructs(StructTypes[i], StructArrayPrinted); printContainedStructs(StructTypes[i], StructArrayPrinted);
} }
Out << "namespace {\n";
for (unsigned i = 0, e = ArrayTypes.size(); i != e; ++i) for (unsigned i = 0, e = ArrayTypes.size(); i != e; ++i)
printContainedArrays(ArrayTypes[i], StructArrayPrinted); printContainedArrays(ArrayTypes[i], StructArrayPrinted);
@@ -3047,8 +3047,9 @@ void CWriter::printContainedStructs(llvm::Type *Ty,
if (!Printed.insert(Ty)) return; if (!Printed.insert(Ty)) return;
#endif #endif
Out << "namespace {\n";
printType(Out, AT, false, getArrayName(AT), true); printType(Out, AT, false, getArrayName(AT), true);
Out << ";\n\n"; Out << ";\n}\n\n";
} }
} }