diff options
| -rw-r--r-- | lib/CodeGen/CodeGenTypes.cpp | 11 | ||||
| -rw-r--r-- | test/CodeGen/regparm.c | 2 | ||||
| -rw-r--r-- | test/CodeGen/transparent-union.c | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp index fdfdd9895b..dde1322e3c 100644 --- a/lib/CodeGen/CodeGenTypes.cpp +++ b/lib/CodeGen/CodeGenTypes.cpp @@ -384,16 +384,15 @@ const llvm::Type *CodeGenTypes::ConvertNewType(QualType T) { OS << TD->getQualifiedNameAsString(); else TD->printName(OS); - } else if (const TypedefType *TdT = dyn_cast<TypedefType>(T)) { + } else if (const TypedefDecl *TDD = TD->getTypedefForAnonDecl()) { // FIXME: We should not have to check for a null decl context here. // Right now we do it because the implicit Obj-C decls don't have one. - if (TdT->getDecl()->getDeclContext()) - OS << TdT->getDecl()->getQualifiedNameAsString(); + if (TDD->getDeclContext()) + OS << TDD->getQualifiedNameAsString(); else - TdT->getDecl()->printName(OS); - } else { + TDD->printName(OS); + } else OS << "anon"; - } TheModule.addTypeName(OS.str(), Res); return Res; diff --git a/test/CodeGen/regparm.c b/test/CodeGen/regparm.c index ec5cbab16a..dd0be96818 100644 --- a/test/CodeGen/regparm.c +++ b/test/CodeGen/regparm.c @@ -21,7 +21,7 @@ void f1(int i, int j, int k) { } int main(void) { - // CHECK: call void @reduced(i8 signext inreg 0, {{.*}} %struct.anon* inreg null + // CHECK: call void @reduced(i8 signext inreg 0, {{.*}} %struct.foo* inreg null reduced(0, 0.0, 0, 0.0, 0); // CHECK: call x86_stdcallcc void {{.*}}(i32 inreg 1, i32 inreg 2) bar(1,2); diff --git a/test/CodeGen/transparent-union.c b/test/CodeGen/transparent-union.c index 0bdbd577f9..97a731855c 100644 --- a/test/CodeGen/transparent-union.c +++ b/test/CodeGen/transparent-union.c @@ -11,7 +11,7 @@ typedef union { void f0(transp_t0 obj); // CHECK: define void @f1_0(i32* %a0) -// CHECK: call void @f0(%union.anon* byval %{{.*}}) +// CHECK: call void @f0(%union.transp_t0* byval %{{.*}}) // CHECK: call void %{{.*}}(i8* %{{[a-z0-9]*}}) // CHECK: } void f1_0(int *a0) { |