maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "PR47792: Include the type of a pointer or reference non-type template" 

This reverts commit 849c60541b because it
results in a stage 2 build failure:

llvm-project/clang/include/clang/AST/ExternalASTSource.h:409:20: error:
definition with same mangled name
'_ZN5clang25LazyGenerationalUpdatePtrIPKNS_4DeclEPS1_XadL_ZNS_17ExternalASTSource19CompleteRedeclChainES3_EEE9makeValueERKNS_10ASTContextES4_'
as another definition

  static ValueType makeValue(const ASTContext &Ctx, T Value);
This commit is contained in:
Jonas Devlieghere 2020-10-11 20:14:00 -07:00
parent 6f7e1ce214
commit ba2dff0159
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/AST/ASTContext.cpp
View File

@ -5890,7 +5890,7 @@ ASTContext::getCanonicalTemplateArgument(const TemplateArgument &Arg) const {
case TemplateArgument::Declaration: {
auto *D = cast<ValueDecl>(Arg.getAsDecl()->getCanonicalDecl());
return TemplateArgument(D, getCanonicalType(Arg.getParamTypeForDecl()));
return TemplateArgument(D, Arg.getParamTypeForDecl());
}
case TemplateArgument::NullPtr:

6
clang/lib/AST/TemplateBase.cpp
View File

@ -244,8 +244,7 @@ void TemplateArgument::Profile(llvm::FoldingSetNodeID &ID,
break;
case Declaration:
ID.AddPointer(getAsDecl() ? getAsDecl()->getCanonicalDecl() : nullptr);
getParamTypeForDecl().Profile(ID);
ID.AddPointer(getAsDecl()? getAsDecl()->getCanonicalDecl() : nullptr);
break;
case Template:
@ -295,8 +294,7 @@ bool TemplateArgument::structurallyEquals(const TemplateArgument &Other) const {
return TypeOrValue.V == Other.TypeOrValue.V;
case Declaration:
return getAsDecl() == Other.getAsDecl() &&
getParamTypeForDecl() == Other.getParamTypeForDecl();
return getAsDecl() == Other.getAsDecl();
case Integral:
return getIntegralType() == Other.getIntegralType() &&

20
clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp
View File

@ -459,23 +459,3 @@ namespace PR46637 {
X<f> y;
int n = y.call(); // expected-error {{cannot initialize a variable of type 'int' with an rvalue of type 'void *'}}
}
namespace PR47792 {
using I = int;
template<decltype(auto)> int a;
const int n = 0;
const I n2 = 0;
static_assert(&a<n> == &a<0>, "both should have type 'int'");
static_assert(&a<n2> == &a<0>, "both should have type 'int'");
// FIXME: We will need to mangle these cases differently too!
int m;
const int &r1 = m;
int &r2 = m;
static_assert(&a<r1> != &a<r2>, "should have different types");
const I &r3 = m;
static_assert(&a<r1> == &a<r3>, "should have different types");
static_assert(&a<r2> != &a<r3>, "should have different types");
}