summaryrefslogtreecommitdiffstats
path: root/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
commit81134ad7a056e45b7cb4ee1b562ab8c8413d65b7 (patch)
tree83c102932790ff5cff8f88889cea6b21a1d26c6b /test/ASTMerge
parenta1aa9e36e6e21f74c56cf9e72cb5bd9aa2a92fd4 (diff)
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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@115387 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ASTMerge')
-rw-r--r--test/ASTMerge/Inputs/class1.cpp7
-rw-r--r--test/ASTMerge/Inputs/class2.cpp1
2 files changed, 8 insertions, 0 deletions
diff --git a/test/ASTMerge/Inputs/class1.cpp b/test/ASTMerge/Inputs/class1.cpp
index e13faf0539..b600cdb1fc 100644
--- a/test/ASTMerge/Inputs/class1.cpp
+++ b/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/test/ASTMerge/Inputs/class2.cpp b/test/ASTMerge/Inputs/class2.cpp
index 91b84dc13b..fa38916f5e 100644
--- a/test/ASTMerge/Inputs/class2.cpp
+++ b/test/ASTMerge/Inputs/class2.cpp
@@ -6,3 +6,4 @@ struct B : A {
int y;
int foo();
};
+