C++: support clang's __builtin_convertvector

nickrolfe · nickrolfe · commit 0957ee7c1b05 · 2018-09-13T10:28:41.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/exprs/BuiltInOperations.qll b/cpp/ql/src/semmle/code/cpp/exprs/BuiltInOperations.qll
@@ -202,6 +202,13 @@ class BuiltInOperationBuiltInShuffleVector extends BuiltInOperation, @builtinshu
   override string toString() { result = "__builtin_shufflevector" }
 }
 
+/**
+ * A clang `__builtin_convertvector` expression.
+ */
+class BuiltInOperationBuiltInConvertVector extends BuiltInOperation, @builtinconvertvector {
+  override string toString() { result = "__builtin_convertvector" }
+}
+
 /**
  * A clang `__builtin_addressof` expression (can be used to implement C++'s std::addressof).
  */
diff --git a/cpp/ql/src/semmlecode.cpp.dbscheme b/cpp/ql/src/semmlecode.cpp.dbscheme
@@ -1431,6 +1431,7 @@ case @expr.kind of
 | 321 = @builtinchooseexpr
 | 322 = @builtinaddressof
 | 323 = @vec_fill
+| 324 = @builtinconvertvector
 ;
 
 new_allocated_type(
diff --git a/cpp/ql/test/library-tests/vector_types/builtin_ops.expected b/cpp/ql/test/library-tests/vector_types/builtin_ops.expected
@@ -1 +1,2 @@
 | vector_types.cpp:31:13:31:49 | __builtin_shufflevector |
+| vector_types.cpp:58:10:58:52 | __builtin_convertvector |
diff --git a/cpp/ql/test/library-tests/vector_types/variables.expected b/cpp/ql/test/library-tests/vector_types/variables.expected
@@ -17,3 +17,4 @@
 | vector_types.cpp:47:23:47:25 | dst | dst | file://:0:0:0:0 | v16i * | 8 |
 | vector_types.cpp:47:34:47:36 | src | src | file://:0:0:0:0 | v16i * | 8 |
 | vector_types.cpp:47:43:47:43 | n | n | file://:0:0:0:0 | int | 4 |
+| vector_types.cpp:57:43:57:44 | vf | vf | vector_types.cpp:55:16:55:27 | vector4float | 16 |
diff --git a/cpp/ql/test/library-tests/vector_types/vector_types.cpp b/cpp/ql/test/library-tests/vector_types/vector_types.cpp
@@ -50,3 +50,10 @@ void shift_left(v16i *dst, v16i *src, int n) {
   // each element).
   *dst = *src << n;
 }
+
+typedef double vector4double __attribute__((__vector_size__(32)));
+typedef float  vector4float  __attribute__((__vector_size__(16)));
+
+vector4double convert_vector(vector4float vf) {
+  return __builtin_convertvector(vf, vector4double);
+}

Original file line number	Diff line number	Diff line change
`@@ -1431,6 +1431,7 @@ case @expr.kind of`
`1431`	`1431`	`\| 321 = @builtinchooseexpr`
`1432`	`1432`	`\| 322 = @builtinaddressof`
`1433`	`1433`	`\| 323 = @vec_fill`
	`1434`	`+\| 324 = @builtinconvertvector`
`1434`	`1435`	`;`
`1435`	`1436`
`1436`	`1437`	`new_allocated_type(`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`\| vector_types.cpp:31:13:31:49 \| __builtin_shufflevector \|`
	`2`	`+\| vector_types.cpp:58:10:58:52 \| __builtin_convertvector \|`