Missed merge that goes with the merge of r128210.
--- Merging r128208 into '.':
U test/SemaCXX/goto.cpp
A test/SemaCXX/goto2.cpp
U lib/Sema/IdentifierResolver.cpp
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_29@128364 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/IdentifierResolver.cpp b/lib/Sema/IdentifierResolver.cpp
index d520a6e..95420a3 100644
--- a/lib/Sema/IdentifierResolver.cpp
+++ b/lib/Sema/IdentifierResolver.cpp
@@ -172,13 +172,28 @@
DeclarationName Name = D->getDeclName();
void *Ptr = Name.getFETokenInfo<void>();
- if (Pos == iterator() || isDeclPtr(Ptr)) {
- // Simple case: insert at the end of the list (which is the
- // end of the stored vector).
+ if (!Ptr) {
AddDecl(D);
return;
}
+ if (isDeclPtr(Ptr)) {
+ // We only have a single declaration: insert before or after it,
+ // as appropriate.
+ if (Pos == iterator()) {
+ // Add the new declaration before the existing declaration.
+ NamedDecl *PrevD = static_cast<NamedDecl*>(Ptr);
+ RemoveDecl(PrevD);
+ AddDecl(D);
+ AddDecl(PrevD);
+ } else {
+ // Add new declaration after the existing declaration.
+ AddDecl(D);
+ }
+
+ return;
+ }
+
if (IdentifierInfo *II = Name.getAsIdentifierInfo())
II->setIsFromAST(false);
diff --git a/test/SemaCXX/goto.cpp b/test/SemaCXX/goto.cpp
index d7057bb..c07e942 100644
--- a/test/SemaCXX/goto.cpp
+++ b/test/SemaCXX/goto.cpp
@@ -13,6 +13,26 @@
return;
}
+namespace N {
+ float* end;
+ void f(bool b1, bool b2) {
+ {
+ do {
+ int end = 0;
+ if (b2) {
+ do {
+ goto end;
+ } while (b2);
+ }
+ end = 1;
+ } while (b1);
+ }
+
+ end:
+ return;
+ }
+}
+
void g() {
end = 1; // expected-error{{assigning to 'double *' from incompatible type 'int'}}
}
diff --git a/test/SemaCXX/goto2.cpp b/test/SemaCXX/goto2.cpp
new file mode 100644
index 0000000..01ea031
--- /dev/null
+++ b/test/SemaCXX/goto2.cpp
@@ -0,0 +1,47 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+
+//PR9463
+int subfun(const char *text) {
+ const char *tmp = text;
+ return 0;
+}
+
+void fun(const char* text) {
+ int count = 0;
+ bool check = true;
+
+ if (check)
+ {
+ const char *end = text;
+
+ if (check)
+ {
+ do
+ {
+ if (check)
+ {
+ count = subfun(end);
+ goto end;
+ }
+
+ check = !check;
+ }
+ while (check);
+ }
+ // also works, after commenting following line of source code
+ int e = subfun(end);
+ }
+ end:
+ if (check)
+ ++count;
+}
+
+const char *text = "some text";
+
+int main() {
+ const char *ptr = text;
+
+ fun(ptr);
+
+ return 0;
+}
