From 0333dd95636da52229ca14b4e5525c1cd8ba62d2 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 14 May 2019 18:51:07 +0000 Subject: Restore test files accidentally deleted in r354839 I think there must be a bug in git-llvm causing parent directories to be deleted when the diff deletes files in a subdirectory. Perhaps it is Windows-only. There has been a behavior change, so some of these tests now fail. I have marked them XFAIL and will fix them in a follow-up to separate the changes. llvm-svn: 360699 --- clang/test/ASTMerge/function-cpp/Inputs/function-1.cpp | 8 ++++++++ clang/test/ASTMerge/function-cpp/test.cpp | 10 ++++++++++ 2 files changed, 18 insertions(+) create mode 100644 clang/test/ASTMerge/function-cpp/Inputs/function-1.cpp create mode 100644 clang/test/ASTMerge/function-cpp/test.cpp (limited to 'clang/test/ASTMerge/function-cpp') diff --git a/clang/test/ASTMerge/function-cpp/Inputs/function-1.cpp b/clang/test/ASTMerge/function-cpp/Inputs/function-1.cpp new file mode 100644 index 00000000000..ee97a1a8a5d --- /dev/null +++ b/clang/test/ASTMerge/function-cpp/Inputs/function-1.cpp @@ -0,0 +1,8 @@ + +template constexpr T add(T arg1, T arg2) { + return arg1 + arg2; +} + +template<> constexpr int add(int arg1, int arg2) { + return arg1 + arg2 + 2; +} diff --git a/clang/test/ASTMerge/function-cpp/test.cpp b/clang/test/ASTMerge/function-cpp/test.cpp new file mode 100644 index 00000000000..304ce3c634c --- /dev/null +++ b/clang/test/ASTMerge/function-cpp/test.cpp @@ -0,0 +1,10 @@ +// RUN: %clang_cc1 -std=c++1z -emit-pch -o %t.1.ast %S/Inputs/function-1.cpp +// RUN: %clang_cc1 -std=c++1z -ast-merge %t.1.ast -fsyntax-only %s 2>&1 | FileCheck %s +// XFAIL: * + +static_assert(add(1, 2) == 5); + +// FIXME: support of templated function overload is still not implemented. +static_assert(add('\1', '\2') == 3); + +// CHECK-NOT: static_assert -- cgit v1.2.3