summaryrefslogtreecommitdiffstats
path: root/clang/test/ASTMerge
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-10-01 23:55:07 +0000
committerDouglas Gregor <dgregor@apple.com>2010-10-01 23:55:07 +0000
commit0eaa2bfe79855ce2f57431d13b60b1455cc6d3f7 (patch)
treeeb2c551c10018eb3682a156ab26bb571db2432ab /clang/test/ASTMerge
parentbfea05afd6bec72ee064d37d0063168c189f78c0 (diff)
downloadbcm5719-llvm-0eaa2bfe79855ce2f57431d13b60b1455cc6d3f7.tar.gz
bcm5719-llvm-0eaa2bfe79855ce2f57431d13b60b1455cc6d3f7.zip
Don't add an imported function into its lexical context until *after*
we've set all of its parameters. Fixes <rdar://problem/8499598>; thanks to Sean for the diagnosis. llvm-svn: 115387
Diffstat (limited to 'clang/test/ASTMerge')
-rw-r--r--clang/test/ASTMerge/Inputs/class1.cpp7
-rw-r--r--clang/test/ASTMerge/Inputs/class2.cpp1
2 files changed, 8 insertions, 0 deletions
diff --git a/clang/test/ASTMerge/Inputs/class1.cpp b/clang/test/ASTMerge/Inputs/class1.cpp
index e13faf0539b..b600cdb1fcf 100644
--- a/clang/test/ASTMerge/Inputs/class1.cpp
+++ b/clang/test/ASTMerge/Inputs/class1.cpp
@@ -6,3 +6,10 @@ struct B : A {
float y;
float foo();
};
+
+struct C {
+ C(int i = 10);
+ C(const C&);
+ C &operator=(C&);
+ ~C();
+};
diff --git a/clang/test/ASTMerge/Inputs/class2.cpp b/clang/test/ASTMerge/Inputs/class2.cpp
index 91b84dc13b7..fa38916f5e2 100644
--- a/clang/test/ASTMerge/Inputs/class2.cpp
+++ b/clang/test/ASTMerge/Inputs/class2.cpp
@@ -6,3 +6,4 @@ struct B : A {
int y;
int foo();
};
+
OpenPOWER on IntegriCloud