Commit 2ff2fd82 authored by Bill Wendling's avatar Bill Wendling
Browse files

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

llvm-svn: 128364
parent b802b82e

clang/lib/Sema/IdentifierResolver.cpp

+18 −3
Original line number Diff line number Diff line
@@ -172,10 +172,25 @@ void IdentifierResolver::InsertDeclAfter(iterator Pos, NamedDecl *D) { 
  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;

  }

clang/test/SemaCXX/goto.cpp

+20 −0
Original line number Diff line number Diff line
@@ -13,6 +13,26 @@ void f() { 
  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'}}

}

clang/test/SemaCXX/goto2.cpp

0 → 100644
+47 −0
Original line number Diff line number Diff line 
// 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;

}