Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions clang/lib/Sema/TreeTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -5539,21 +5539,10 @@ QualType TreeTransform<Derived>::TransformTypeInObjectScope(
TLB, TL.castAs<DependentNameTypeLoc>(), /*DeducedTSTContext=*/false,
ObjectType, UnqualLookup);
}
case TypeLoc::Typedef:
case TypeLoc::TemplateSpecialization:
case TypeLoc::SubstTemplateTypeParm:
case TypeLoc::SubstTemplateTypeParmPack:
case TypeLoc::PackIndexing:
case TypeLoc::Enum:
case TypeLoc::Record:
case TypeLoc::InjectedClassName:
case TypeLoc::TemplateTypeParm:
case TypeLoc::Decltype:
case TypeLoc::UnresolvedUsing:
case TypeLoc::Using:
return getDerived().TransformType(TLB, TL);
default:
llvm_unreachable("unexpected type class");
// Any dependent canonical type can appear here, through type alias
// templates.
return getDerived().TransformType(TLB, TL);
}
}

Expand Down
21 changes: 13 additions & 8 deletions clang/test/SemaTemplate/nested-name-spec-template.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s -Wno-c++20-extensions
// RUN: %clang_cc1 -fsyntax-only -verify -std=c++98 %s
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-c++11-extensions -std=c++98 %s
// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s

namespace N {
Expand All @@ -24,14 +24,7 @@ namespace N {

M::Promote<int>::type *ret_intptr3(int* ip) { return ip; }
M::template Promote<int>::type *ret_intptr4(int* ip) { return ip; }
#if __cplusplus <= 199711L
// expected-warning@-2 {{'template' keyword outside of a template}}
#endif

M::template Promote<int> pi;
#if __cplusplus <= 199711L
// expected-warning@-2 {{'template' keyword outside of a template}}
#endif
}

N::M::Promote<int>::type *ret_intptr5(int* ip) { return ip; }
Expand Down Expand Up @@ -181,3 +174,15 @@ namespace SubstTemplateTypeParmPackType {
template void f<B>();
} // namespace SubstTemplateTypeParmPackType
#endif

namespace DependentUnaryTransform {
template <class T> using decay_t = __decay(T);
template <class, class> struct A;
template <class T> struct A<T, typename decay_t<T>::X>;
} // namespace DependentUnaryTransform

namespace DependentSizedArray {
template <int V> using Z = int[V];
template <class, class> struct A;
template <class T> struct A<T, typename Z<T(0)>::X>;
} // namespace DependentUnaryTransform
Loading