Add an explicit UsuallyTinyPtrVector that takes a single element.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@102283 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/UsuallyTinyPtrVector.h b/include/clang/AST/UsuallyTinyPtrVector.h
index 5bf3ee94644bfc2eb9023a2b155cca75b8755695..5ee40e05c956799b2a6cf5c7bdfeedc65a344166 100644 (file)
--- a/include/clang/AST/UsuallyTinyPtrVector.h
+++ b/include/clang/AST/UsuallyTinyPtrVector.h
@@ -33,7 +33,9 @@ class UsuallyTinyPtrVector {
 
 public:
   UsuallyTinyPtrVector() : Storage(0) { }
-
+  explicit UsuallyTinyPtrVector(T *Element) 
+    : Storage(reinterpret_cast<uintptr_t>(Element)) { }
+  
   bool empty() const { return !Storage; }
 
   typedef const T **iterator;

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index af4245d21c5bdefb66a9af935a5b2d06487c65a1..0e6ebaecd4900cf32abcb7bb1e03457e00897f09 100644 (file)
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -1503,11 +1503,10 @@ BuildImplicitBaseInitializer(Sema &SemaRef, CXXConstructorDecl *Constructor,
                           SourceLocation(), ParamType, 0);
     
     // Cast to the base class to avoid ambiguities.
-    CXXBaseSpecifierArray BasePath;
-    BasePath.push_back(BaseSpec);
     SemaRef.ImpCastExprToType(CopyCtorArg, BaseSpec->getType(), 
                               CastExpr::CK_UncheckedDerivedToBase,
-                              /*isLvalue=*/true, BasePath);
+                              /*isLvalue=*/true, 
+                              CXXBaseSpecifierArray(BaseSpec));
 
     InitializationKind InitKind
       = InitializationKind::CreateDirect(Constructor->getLocation(),