@@ -781,15 +781,11 @@ class RedeclarableTemplateDecl : public TemplateDecl,
781
781
EntryType *Entry, void *InsertPos);
782
782
783
783
struct CommonBase {
784
- CommonBase () : InstantiatedFromMember( nullptr , false ) {}
784
+ CommonBase () {}
785
785
786
786
// / The template from which this was most
787
787
// / directly instantiated (or null).
788
- // /
789
- // / The boolean value indicates whether this template
790
- // / was explicitly specialized.
791
- llvm::PointerIntPair<RedeclarableTemplateDecl*, 1 , bool >
792
- InstantiatedFromMember;
788
+ RedeclarableTemplateDecl *InstantiatedFromMember = nullptr ;
793
789
794
790
// / If non-null, points to an array of specializations (including
795
791
// / partial specializations) known only by their external declaration IDs.
@@ -903,12 +899,12 @@ class RedeclarableTemplateDecl : public TemplateDecl,
903
899
// / void X<T>::f(T, U);
904
900
// / \endcode
905
901
RedeclarableTemplateDecl *getInstantiatedFromMemberTemplate () const {
906
- return getCommonPtr ()->InstantiatedFromMember . getPointer () ;
902
+ return getCommonPtr ()->InstantiatedFromMember ;
907
903
}
908
904
909
905
void setInstantiatedFromMemberTemplate (RedeclarableTemplateDecl *TD) {
910
- assert (!getCommonPtr ()->InstantiatedFromMember . getPointer () );
911
- getCommonPtr ()->InstantiatedFromMember . setPointer (TD) ;
906
+ assert (!getCommonPtr ()->InstantiatedFromMember );
907
+ getCommonPtr ()->InstantiatedFromMember = TD ;
912
908
}
913
909
914
910
// / Retrieve the "injected" template arguments that correspond to the
0 commit comments