summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-04-03 12:23:05 (GMT)
committerBrad King <brad.king@kitware.com>2020-04-03 12:23:05 (GMT)
commitfa1f2da3b06e7b4d93617f2cfa7e9bf3bf2fa743 (patch)
tree9f8374c0ea9b177402591f1043047d3c990ba5d6
parent365a07625e55f1eab0c45d0725ad5bccbf44292e (diff)
parent4ef8cb855487f6a7b8673e771d26e55e0067be56 (diff)
downloadCastXML-fa1f2da3b06e7b4d93617f2cfa7e9bf3bf2fa743.zip
CastXML-fa1f2da3b06e7b4d93617f2cfa7e9bf3bf2fa743.tar.gz
CastXML-fa1f2da3b06e7b4d93617f2cfa7e9bf3bf2fa743.tar.bz2
Merge branch 'msvc-builtin-conflict' into release-0.3
-rw-r--r--test/CMakeLists.txt1
-rw-r--r--test/input/assume_aligned.cxx8
2 files changed, 9 insertions, 0 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9449011..4b6139d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -400,6 +400,7 @@ castxml_test_cmd(cc-msvc-std-explicit --castxml-cc-msvc "(" $<TARGET_FILE:cc-msv
castxml_test_cmd(cc-msvc-builtin-1800-E --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1800 ")" ${empty_cxx} -E -dM)
castxml_test_cmd(cc-msvc-builtin-1900-E --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1900 ")" ${empty_cxx} -E -dM)
castxml_test_cmd(cc-msvc-builtin-1900 --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1900 ")" ${input}/make_integer_seq.cxx)
+castxml_test_cmd(cc-msvc-builtin-1923 --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1923 ")" ${input}/assume_aligned.cxx)
castxml_test_cmd(cc-msvc-c-bad-cmd --castxml-cc-msvc-c "(" cc-msvc-c-bad-cmd ")" ${empty_c})
castxml_test_cmd(cc-msvc-c-src-c-E --castxml-cc-msvc-c $<TARGET_FILE:cc-msvc> ${empty_c} -E -dM)
castxml_test_cmd(cc-msvc-c-src-c-cmd --castxml-cc-msvc-c $<TARGET_FILE:cc-msvc> ${empty_c} "-###")
diff --git a/test/input/assume_aligned.cxx b/test/input/assume_aligned.cxx
new file mode 100644
index 0000000..a6e9dc2
--- /dev/null
+++ b/test/input/assume_aligned.cxx
@@ -0,0 +1,8 @@
+constexpr void* __cdecl __builtin_assume_aligned(const void*, size_t,
+ ...) noexcept;
+
+int* check_assume_aligned(int* p)
+{
+ __builtin_assume_aligned(p, 4);
+ return p;
+}