aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNate Begeman <natebegeman@mac.com>2008-01-25 05:34:48 +0000
committerNate Begeman <natebegeman@mac.com>2008-01-25 05:34:48 +0000
commitd47d4f518e43eaa716e2d18359bd725a03b87f58 (patch)
tree1a57ddf9a8f55ae9f4f97486879a3c4f66a68617
parenta99603333fffb57cf9ac37eabb190c8f5afc914b (diff)
Support checking and codegen of constant vector globals
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@46343 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--AST/Expr.cpp3
-rw-r--r--CodeGen/CodeGenModule.cpp12
-rw-r--r--test/CodeGen/ocu-vector.c1
-rw-r--r--test/Sema/vector-init.c5
4 files changed, 19 insertions, 2 deletions
diff --git a/AST/Expr.cpp b/AST/Expr.cpp
index 8aa5eed80b..becce2a622 100644
--- a/AST/Expr.cpp
+++ b/AST/Expr.cpp
@@ -487,7 +487,8 @@ bool Expr::isConstantExpr(ASTContext &Ctx, SourceLocation *Loc) const {
case CompoundLiteralExprClass:
if (Loc) *Loc = getLocStart();
// Allow "(int []){2,4}", since the array will be converted to a pointer.
- return TR->isArrayType();
+ // Allow "(vector type){2,4}" since the elements are all constant.
+ return TR->isArrayType() || TR->isVectorType();
case UnaryOperatorClass: {
const UnaryOperator *Exp = cast<UnaryOperator>(this);
diff --git a/CodeGen/CodeGenModule.cpp b/CodeGen/CodeGenModule.cpp
index bb61dc7cd8..e841ee5492 100644
--- a/CodeGen/CodeGenModule.cpp
+++ b/CodeGen/CodeGenModule.cpp
@@ -300,7 +300,8 @@ static llvm::Constant *GenerateAggregateInit(const InitListExpr *ILE,
return 0;
}
- assert((ILE->getType()->isArrayType() || ILE->getType()->isStructureType()) &&
+ assert((ILE->getType()->isArrayType() || ILE->getType()->isStructureType() ||
+ ILE->getType()->isVectorType()) &&
"Bad type for init list!");
CodeGenTypes& Types = CGM.getTypes();
@@ -342,6 +343,9 @@ static llvm::Constant *GenerateAggregateInit(const InitListExpr *ILE,
if (ILE->getType()->isStructureType())
return llvm::ConstantStruct::get(cast<llvm::StructType>(CType), Elts);
+ if (ILE->getType()->isVectorType())
+ return llvm::ConstantVector::get(cast<llvm::VectorType>(CType), Elts);
+
// Make sure we have an array at this point
assert(AType);
@@ -417,6 +421,12 @@ static llvm::Constant *GenerateConstantExpr(const Expr *Expression,
return llvm::ConstantArray::get(Str, false);
}
+ // Generate initializer for the CompoundLiteral
+ case Stmt::CompoundLiteralExprClass: {
+ const CompoundLiteralExpr *CLE = cast<CompoundLiteralExpr>(Expression);
+ return GenerateConstantExpr(CLE->getInitializer(), CGM);
+ }
+
// Elide parenthesis.
case Stmt::ParenExprClass:
return GenerateConstantExpr(cast<ParenExpr>(Expression)->getSubExpr(), CGM);
diff --git a/test/CodeGen/ocu-vector.c b/test/CodeGen/ocu-vector.c
index ee6e737a58..cffef339ee 100644
--- a/test/CodeGen/ocu-vector.c
+++ b/test/CodeGen/ocu-vector.c
@@ -3,6 +3,7 @@
typedef __attribute__(( ocu_vector_type(4) )) float float4;
typedef __attribute__(( ocu_vector_type(2) )) float float2;
+float4 foo = (float4){ 1.0, 2.0, 3.0, 4.0 };
float4 test1(float4 V) {
return V.wzyx+V;
diff --git a/test/Sema/vector-init.c b/test/Sema/vector-init.c
new file mode 100644
index 0000000000..5436cbac8c
--- /dev/null
+++ b/test/Sema/vector-init.c
@@ -0,0 +1,5 @@
+// RUN: clang %s -verify -fsyntax-only
+
+typedef __attribute__(( ocu_vector_type(4) )) float float4;
+
+float4 foo = (float4){ 1.0, 2.0, 3.0, 4.0 };