maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fixed VLA code generation. 

llvm-svn: 147933
This commit is contained in:
Abramo Bagnara 2012-01-11 08:19:46 +00:00
parent 837fe5bcc9
commit fa95ed4074
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
clang/lib/CodeGen/CodeGenFunction.cpp
View File

@ -935,20 +935,6 @@ void CodeGenFunction::EmitVariablyModifiedType(QualType type) {
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 @@ void CodeGenFunction::EmitVariablyModifiedType(QualType type) {
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 @@ void CodeGenFunction::EmitVariablyModifiedType(QualType type) {
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;

24
clang/test/CodeGen/vla-4.c Normal file
View File

@ -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 ()*)()
}