commit af35c8e6ad053bc5f2323ebbda3c347cb7d79414
author Stephen Hines <srhines@google.com> Thu Nov 29 14:23:23 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 29 14:23:23 2012 -0800
tree 92cbf6ed20078148572c5beec0833f61c0fc296b
parent 0fd6b1d1e2acf2ad5f35f83fcdbdb30f0e1c4eb5
parent fdae63e8142f56521813f59e0c506ed3a1636021

Merge "Fix overly strict check for float3 in structures."

slang_rs_export_type.cpp

diff --git a/slang_rs_export_type.cpp b/slang_rs_export_type.cpp
index 94bd6bb..ae13bf6 100644
--- a/slang_rs_export_type.cpp
+++ b/slang_rs_export_type.cpp
@@ -512,7 +512,9 @@
       const clang::Type *ElementType = GET_EXT_VECTOR_ELEMENT_TYPE(EVT);
       if (TargetAPI < SLANG_ICS_TARGET_API &&
           InCompositeType &&
-          EVT->getNumElements() == 3) {
+          EVT->getNumElements() == 3 &&
+          ND &&
+          ND->getLinkage() == clang::ExternalLinkage) {
         ReportTypeError(&C.getDiagnostics(), ND, NULL,
                         "structs containing vectors of dimension 3 cannot "
                         "be exported at this API level: '%0'");

tests/P_static_struct/static_struct.rs

diff --git a/tests/P_static_struct/static_struct.rs b/tests/P_static_struct/static_struct.rs
new file mode 100644
index 0000000..0b3e9ec
--- /dev/null
+++ b/tests/P_static_struct/static_struct.rs
@@ -0,0 +1,11 @@
+// -target-api 12
+#pragma version(1)
+#pragma rs java_package_name(com.example);
+
+typedef struct Plane_s {
+    float3 point;
+} Plane;
+
+static Plane carouselPlane = {
+    { 0.0f, 0.0f, 0.0f }
+};

tests/P_static_struct/stderr.txt.expect

diff --git a/tests/P_static_struct/stderr.txt.expect b/tests/P_static_struct/stderr.txt.expect
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/P_static_struct/stderr.txt.expect

tests/P_static_struct/stdout.txt.expect

diff --git a/tests/P_static_struct/stdout.txt.expect b/tests/P_static_struct/stdout.txt.expect
new file mode 100644
index 0000000..9bf4e1c
--- /dev/null
+++ b/tests/P_static_struct/stdout.txt.expect
@@ -0,0 +1 @@
+Generating ScriptC_static_struct.java ...