Commit 44c79302 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r352307: 

------------------------------------------------------------------------
r352307 | void | 2019-01-27 08:24:03 +0100 (Sun, 27 Jan 2019) | 11 lines

Remove Expr sugar decorating the CXXUuidofExpr node.

Summary: Sugar, like ConstantExpr, causes an infinite expansion of the template object.

Reviewers: rsmith, aaron.ballman

Reviewed By: aaron.ballman

Subscribers: riccibruno, aaron.ballman, cfe-commits, tzik, rnk

Differential Revision: https://reviews.llvm.org/D57114
------------------------------------------------------------------------

llvm-svn: 353031
parent 8cc77b4a

clang/lib/Sema/SemaTemplate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6309,7 +6309,7 @@ ExprResult Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param, 
      // -- a predefined __func__ variable

      if (auto *E = Value.getLValueBase().dyn_cast<const Expr*>()) {

        if (isa<CXXUuidofExpr>(E)) {

          Converted = TemplateArgument(ArgResult.get());

          Converted = TemplateArgument(ArgResult.get()->IgnoreImpCasts());

          break;

        }

        Diag(Arg->getBeginLoc(), diag::err_template_arg_not_decl_ref)

clang/test/SemaCXX/PR40395.cpp

0 → 100644
+16 −0
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -std=c++17 -fms-extensions -triple=x86_64-pc-win32 -verify %s

// expected-no-diagnostics



// PR40395 - ConstantExpr shouldn't cause the template object to infinitely

// expand.

struct _GUID {};

struct __declspec(uuid("{AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA}")) B {};



template <const _GUID* piid>

struct A {

  virtual void baz() { A<piid>(); }

};



void f() {

  A<&__uuidof(B)>();

}