Commit 6c2a4d63 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r287999: 

------------------------------------------------------------------------
r287999 | hfinkel | 2016-11-27 08:26:14 -0800 (Sun, 27 Nov 2016) | 14 lines

Adjust type-trait evaluation to properly handle Using(Shadow)Decls

Since r274049, for an inheriting constructor declaration, the name of the using
declaration (and using shadow declaration comes from the using declaration) is
the name of a derived class, not the base class (line 8225-8232 of
lib/Sema/SemaDeclCXX.cpp in https://reviews.llvm.org/rL274049). Because of
this, name-based lookup performed inside Sema::LookupConstructors returns not
only CXXConstructorDecls but also Using(Shadow)Decls, which results assertion
failure reported in PR29087.

Patch by Taewook Oh, thanks!

Differential Revision: https://reviews.llvm.org/D23765

------------------------------------------------------------------------

llvm-svn: 288058
parent dd822f5b

clang/lib/Sema/SemaExprCXX.cpp

+10 −4
Original line number Diff line number Diff line
@@ -4221,9 +4221,12 @@ static bool EvaluateUnaryTypeTrait(Sema &Self, TypeTrait UTT, 
        // A template constructor is never a copy constructor.

        // FIXME: However, it may actually be selected at the actual overload

        // resolution point.

        if (isa<FunctionTemplateDecl>(ND))

        if (isa<FunctionTemplateDecl>(ND->getUnderlyingDecl()))

          continue;

        // UsingDecl itself is not a constructor

        if (isa<UsingDecl>(ND))

          continue;

        const CXXConstructorDecl *Constructor = cast<CXXConstructorDecl>(ND);

        auto *Constructor = cast<CXXConstructorDecl>(ND->getUnderlyingDecl());

        if (Constructor->isCopyConstructor(FoundTQs)) {

          FoundConstructor = true;

          const FunctionProtoType *CPT
@@ -4257,9 +4260,12 @@ static bool EvaluateUnaryTypeTrait(Sema &Self, TypeTrait UTT, 
      bool FoundConstructor = false;

      for (const auto *ND : Self.LookupConstructors(RD)) {

        // FIXME: In C++0x, a constructor template can be a default constructor.

        if (isa<FunctionTemplateDecl>(ND))

        if (isa<FunctionTemplateDecl>(ND->getUnderlyingDecl()))

          continue;

        // UsingDecl itself is not a constructor

        if (isa<UsingDecl>(ND))

          continue;

        const CXXConstructorDecl *Constructor = cast<CXXConstructorDecl>(ND);

        auto *Constructor = cast<CXXConstructorDecl>(ND->getUnderlyingDecl());

        if (Constructor->isDefaultConstructor()) {

          FoundConstructor = true;

          const FunctionProtoType *CPT

clang/test/SemaCXX/cxx11-crashes.cpp

+12 −0
Original line number Diff line number Diff line
@@ -91,3 +91,15 @@ void test(int some_number) { // expected-note {{'some_number' declared here}} 
  Foo(lambda);

}

}



namespace pr29091 {

  struct X{ X(const X &x); };

  struct Y: X { using X::X; };

  bool foo() { return __has_nothrow_constructor(Y); }

  bool bar() { return __has_nothrow_copy(Y); }



  struct A { template <typename T> A(); };

  struct B : A { using A::A; };

  bool baz() { return __has_nothrow_constructor(B); }

  bool qux() { return __has_nothrow_copy(B); }

}