From a80cc93f103a3033f90a47d5e316c32d5e5a8826 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 16 Jan 2007 18:02:45 +0000 Subject: Fix SMG2000 with the CBE: opaque types need names too. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33258 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/CBackend/CBackend.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'lib/Target/CBackend') diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index 304145887b..737a346ca4 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -272,7 +272,7 @@ bool CBackendNameAllUsedStructsAndMergeFunctions::runOnModule(Module &M) { // If this isn't a struct type, remove it from our set of types to name. // This simplifies emission later. - if (!isa(I->second)) { + if (!isa(I->second) && !isa(I->second)) { TST.remove(I); } else { // If this is not used, remove it from the symbol table. @@ -1691,23 +1691,21 @@ void CWriter::printModuleTypes(const TypeSymbolTable &TST) { // Print out forward declarations for structure types before anything else! Out << "/* Structure forward decls */\n"; - for (; I != End; ++I) - if (const Type *STy = dyn_cast(I->second)) { - std::string Name = "struct l_" + Mang->makeNameProper(I->first); - Out << Name << ";\n"; - TypeNames.insert(std::make_pair(STy, Name)); - } + for (; I != End; ++I) { + std::string Name = "struct l_" + Mang->makeNameProper(I->first); + Out << Name << ";\n"; + TypeNames.insert(std::make_pair(I->second, Name)); + } Out << '\n'; // Now we can print out typedefs. Above, we guaranteed that this can only be - // for struct types. + // for struct or opaque types. Out << "/* Typedefs */\n"; for (I = TST.begin(); I != End; ++I) { - const StructType *Ty = cast(I->second); std::string Name = "l_" + Mang->makeNameProper(I->first); Out << "typedef "; - printType(Out, Ty, false, Name); + printType(Out, I->second, false, Name); Out << ";\n"; } -- cgit v1.2.3