summaryrefslogtreecommitdiffstats
path: root/clang/test/SemaCXX/linkage2.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-02-14 03:31:26 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-02-14 03:31:26 +0000
commit46d2b6bacfc3208376668c41b7907468bf7df0ff (patch)
tree1378eea8956dd3b06a44e6430a3028f18fb921ca /clang/test/SemaCXX/linkage2.cpp
parentc5d33d83597329bd3fba2f274723ae2dbd9e20a7 (diff)
downloadbcm5719-llvm-46d2b6bacfc3208376668c41b7907468bf7df0ff.tar.gz
bcm5719-llvm-46d2b6bacfc3208376668c41b7907468bf7df0ff.zip
Partially revert r175117 so that we don't break assumptions about how
static functions in extern "C" contexts are mangled. Should fix the bootstrap. llvm-svn: 175132
Diffstat (limited to 'clang/test/SemaCXX/linkage2.cpp')
-rw-r--r--clang/test/SemaCXX/linkage2.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/test/SemaCXX/linkage2.cpp b/clang/test/SemaCXX/linkage2.cpp
index 2cee581b49c..744741b7ca6 100644
--- a/clang/test/SemaCXX/linkage2.cpp
+++ b/clang/test/SemaCXX/linkage2.cpp
@@ -12,12 +12,12 @@ namespace test1 {
}
}
-// This is OK. Both test2_f don't have language linkage since they have
-// internal linkage.
+// FIXME: This should be OK. Both test2_f don't have language linkage since they
+// have internal linkage.
extern "C" {
- static void test2_f() {
+ static void test2_f() { // expected-note {{previous definition is here}}
}
- static void test2_f(int x) {
+ static void test2_f(int x) { // expected-error {{conflicting types for 'test2_f'}}
}
}
OpenPOWER on IntegriCloud