aboutsummaryrefslogtreecommitdiff
path: root/test/Analysis/cstring-syntax-cxx.cpp
diff options
context:
space:
mode:
authorEli Bendersky <eliben@chromium.org>2013-07-15 16:08:08 -0700
committerEli Bendersky <eliben@chromium.org>2013-07-15 16:08:08 -0700
commite789858899a7b36caf11b371a97411a1582a482b (patch)
treee8c28b178b32010f73b477b3c65b5ff74437530c /test/Analysis/cstring-syntax-cxx.cpp
parent99a5501f5ae5b75017dfc386d4abf648234e85df (diff)
parent20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8 (diff)
Merge commit '20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8'
Conflicts: lib/CodeGen/ItaniumCXXABI.cpp
Diffstat (limited to 'test/Analysis/cstring-syntax-cxx.cpp')
-rw-r--r--test/Analysis/cstring-syntax-cxx.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/Analysis/cstring-syntax-cxx.cpp b/test/Analysis/cstring-syntax-cxx.cpp
index bae3d0a164..39c978ab60 100644
--- a/test/Analysis/cstring-syntax-cxx.cpp
+++ b/test/Analysis/cstring-syntax-cxx.cpp
@@ -15,3 +15,8 @@ void test(X a, X b) {
X c = a + b;
}
+// Ensure we don't crash on custom-defined strncat.
+char strncat ();
+int main () {
+ return strncat ();
+} \ No newline at end of file