[cfe-commits] r72299 - in /cfe/trunk: lib/Sema/SemaTemplateInstantiateExpr.cpp test/SemaTemplate/instantiate-clang.cpp test/SemaTemplate/instantiate-expr-3.cpp

[Douglas Gregor]

Author: dgregor
Date: Fri May 22 18:07:44 2009
New Revision: 72299

URL: http://llvm.org/viewvc/llvm-project?rev=72299&view=rev
Log:
Template instantiation for ExtVectorElementExpr.

Added:
    cfe/trunk/test/SemaTemplate/instantiate-clang.cpp
Modified:
    cfe/trunk/lib/Sema/SemaTemplateInstantiateExpr.cpp
    cfe/trunk/test/SemaTemplate/instantiate-expr-3.cpp

Modified: cfe/trunk/lib/Sema/SemaTemplateInstantiateExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateInstantiateExpr.cpp?rev=72299&r1=72298&r2=72299&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplateInstantiateExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateInstantiateExpr.cpp Fri May 22 18:07:44 2009
@@ -64,7 +64,7 @@
     OwningExprResult VisitInitListExpr(InitListExpr *E);
     OwningExprResult VisitDesignatedInitExpr(DesignatedInitExpr *E);
     OwningExprResult VisitImplicitValueInitExpr(ImplicitValueInitExpr *E);
-    // FIXME: ExtVectorElementExpr
+    OwningExprResult VisitExtVectorElementExpr(ExtVectorElementExpr *E);
     // FIXME: BlockExpr
     // FIXME: BlockDeclRefExpr
     OwningExprResult VisitSizeOfAlignOfExpr(SizeOfAlignOfExpr *E);
@@ -708,6 +708,23 @@
 }
 
 Sema::OwningExprResult 
+TemplateExprInstantiator::VisitExtVectorElementExpr(ExtVectorElementExpr *E) {
+  OwningExprResult Base = Visit(E->getBase());
+  if (Base.isInvalid())
+    return SemaRef.ExprError();
+
+  SourceLocation FakeOperatorLoc = 
+    SemaRef.PP.getLocForEndOfToken(E->getBase()->getSourceRange().getEnd());
+  return SemaRef.ActOnMemberReferenceExpr(/*Scope=*/0,
+                                          move(Base), 
+                                          /*FIXME*/FakeOperatorLoc,
+                                          tok::period,
+                                          E->getAccessorLoc(),
+                                          E->getAccessor(),
+                                   /*FIXME?*/Sema::DeclPtrTy::make((Decl*)0));
+}
+
+Sema::OwningExprResult 
 TemplateExprInstantiator::VisitSizeOfAlignOfExpr(SizeOfAlignOfExpr *E) {
   bool isSizeOf = E->isSizeOf();
 

Added: cfe/trunk/test/SemaTemplate/instantiate-clang.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-clang.cpp?rev=72299&view=auto

==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiate-clang.cpp (added)
+++ cfe/trunk/test/SemaTemplate/instantiate-clang.cpp Fri May 22 18:07:44 2009
@@ -0,0 +1,35 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
+// Test template instantiation for Clang-specific features.
+
+// ---------------------------------------------------------------------
+// Vector types
+// ---------------------------------------------------------------------
+typedef __attribute__(( ext_vector_type(2) )) double double2;
+typedef __attribute__(( ext_vector_type(4) )) double double4;
+
+template<typename T>
+struct ExtVectorAccess0 {
+  void f(T v1, double4 v2) {
+    v1.xy = v2.yx;
+  }
+};
+
+template struct ExtVectorAccess0<double2>;
+template struct ExtVectorAccess0<double4>;
+
+typedef __attribute__(( ext_vector_type(2) )) double double2;
+
+template<typename T, typename U, int N, int M>
+struct ShuffleVector0 {
+  void f(T t, U u, double2 a, double2 b) {
+    (void)__builtin_shufflevector(t, u, N, M); // expected-error{{index}}
+    (void)__builtin_shufflevector(a, b, N, M);
+    (void)__builtin_shufflevector(a, b, 2, 1);
+  }
+};
+
+template struct ShuffleVector0<double2, double2, 2, 1>;
+template struct ShuffleVector0<double2, double2, 4, 3>; // expected-note{{instantiation}}
+
+

Modified: cfe/trunk/test/SemaTemplate/instantiate-expr-3.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-expr-3.cpp?rev=72299&r1=72298&r2=72299&view=diff

==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiate-expr-3.cpp (original)
+++ cfe/trunk/test/SemaTemplate/instantiate-expr-3.cpp Fri May 22 18:07:44 2009
@@ -71,23 +71,6 @@
 template struct StatementExpr0<N1::X>; // expected-note{{instantiation}}
 
 // ---------------------------------------------------------------------
-// __builtin_shufflevector
-// ---------------------------------------------------------------------
-typedef __attribute__(( ext_vector_type(2) )) double double2;
-
-template<typename T, typename U, int N, int M>
-struct ShuffleVector0 {
-  void f(T t, U u, double2 a, double2 b) {
-    (void)__builtin_shufflevector(t, u, N, M); // expected-error{{index}}
-    (void)__builtin_shufflevector(a, b, N, M);
-    (void)__builtin_shufflevector(a, b, 2, 1);
-  }
-};
-
-template struct ShuffleVector0<double2, double2, 2, 1>;
-template struct ShuffleVector0<double2, double2, 4, 3>; // expected-note{{instantiation}}
-
-// ---------------------------------------------------------------------
 // __builtin_choose_expr
 // ---------------------------------------------------------------------
 template<bool Cond, typename T, typename U, typename Result>
@@ -130,22 +113,3 @@
 
 template struct VaArg1<__builtin_va_list, int>;
 template struct VaArg1<int, int>; // expected-note{{instantiation}}
-
-// ---------------------------------------------------------------------
-// Vector element expressions
-// ---------------------------------------------------------------------
-#if 0
-// Not supported until we have full support for MemberExpr.
-typedef __attribute__(( ext_vector_type(2) )) double double2;
-typedef __attribute__(( ext_vector_type(4) )) double double4;
-
-template<typename T, typename U>
-struct VectorElem0 {
-  void f(T t, U u) {
-    t.xy = u.zw;
-  }
-};
-
-template struct VectorElem0<double2, double4>;
-template struct VectorElem0<double4, double4>;
-#endif