[cfe-commits] r147933 - in /cfe/trunk: lib/CodeGen/CodeGenFunction.cpp test/CodeGen/vla-4.c
Abramo Bagnara
abramo.bagnara at gmail.com
Wed Jan 11 00:19:47 PST 2012
Author: abramo
Date: Wed Jan 11 02:19:46 2012
New Revision: 147933
URL: http://llvm.org/viewvc/llvm-project?rev=147933&view=rev
Log:
Fixed VLA code generation.
Added:
cfe/trunk/test/CodeGen/vla-4.c
Modified:
cfe/trunk/lib/CodeGen/CodeGenFunction.cpp
Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.cpp?rev=147933&r1=147932&r2=147933&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.cpp Wed Jan 11 02:19:46 2012
@@ -935,20 +935,6 @@
const Type *ty = type.getTypePtr();
switch (ty->getTypeClass()) {
- default:
- // Only sugared types (different from typeof_expr) can reach this point.
- assert(!type.isCanonical() && "unhandled canonical type!");
- type = type.getSingleStepDesugaredType(getContext());
- break;
-
- case Type::TypeOfExpr: {
- // This is the only sugared type requiring special treatment.
- // Emit typeof expression and we are done.
- Expr *E = cast<TypeOfExprType>(ty)->getUnderlyingExpr();
- EmitIgnoredExpr(E);
- return;
- }
-
#define TYPE(Class, Base)
#define ABSTRACT_TYPE(Class, Base)
#define NON_CANONICAL_TYPE(Class, Base)
@@ -964,6 +950,8 @@
case Type::ExtVector:
case Type::Record:
case Type::Enum:
+ case Type::Elaborated:
+ case Type::TemplateSpecialization:
case Type::ObjCObject:
case Type::ObjCInterface:
case Type::ObjCObjectPointer:
@@ -1018,6 +1006,26 @@
type = cast<FunctionType>(ty)->getResultType();
break;
+ case Type::Paren:
+ case Type::TypeOf:
+ case Type::UnaryTransform:
+ case Type::Attributed:
+ case Type::SubstTemplateTypeParm:
+ // Keep walking after single level desugaring.
+ type = type.getSingleStepDesugaredType(getContext());
+ break;
+
+ case Type::Typedef:
+ case Type::Decltype:
+ case Type::Auto:
+ // Stop walking: nothing to do.
+ return;
+
+ case Type::TypeOfExpr:
+ // Stop walking: emit typeof expression.
+ EmitIgnoredExpr(cast<TypeOfExprType>(ty)->getUnderlyingExpr());
+ return;
+
case Type::Atomic:
type = cast<AtomicType>(ty)->getValueType();
break;
Added: cfe/trunk/test/CodeGen/vla-4.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/vla-4.c?rev=147933&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/vla-4.c (added)
+++ cfe/trunk/test/CodeGen/vla-4.c Wed Jan 11 02:19:46 2012
@@ -0,0 +1,24 @@
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm -o - | FileCheck %s
+
+int f();
+int h();
+
+void t1() {
+ _Atomic(typeof((int (*)[f()]) h())) v;
+ // CHECK: [[N:%.*]] = alloca i32*, align 4
+ // CHECK-NEXT: [[P:%.*]] = call i32 bitcast (i32 (...)* @f to i32 ()*)()
+ // CHECK-NEXT: [[P:%.*]] = call i32 bitcast (i32 (...)* @h to i32 ()*)()
+}
+
+void t2() {
+ typeof(typeof((int (*)[f()]) h())) v;
+ // CHECK: [[N:%.*]] = alloca i32*, align 4
+ // CHECK-NEXT: [[P:%.*]] = call i32 bitcast (i32 (...)* @f to i32 ()*)()
+ // CHECK-NEXT: [[P:%.*]] = call i32 bitcast (i32 (...)* @h to i32 ()*)()
+}
+
+void t3(typeof((int (*)[f()]) h()) v) {
+ // CHECK: store i32* %v, i32** %v.addr, align 4
+ // CHECK-NEXT: [[P:%.*]] = call i32 bitcast (i32 (...)* @f to i32 ()*)()
+ // CHECK-NEXT: [[P:%.*]] = call i32 bitcast (i32 (...)* @h to i32 ()*)()
+}
More information about the cfe-commits
mailing list