r186255 - Revert "PR16540: ASTVector::insert(Context, Iter, Element) doesn't compile"

[David Blaikie]

Author: dblaikie
Date: Sat Jul 13 13:54:56 2013
New Revision: 186255

URL: http://llvm.org/viewvc/llvm-project?rev=186255&view=rev
Log:
Revert "PR16540: ASTVector::insert(Context, Iter, Element) doesn't compile"

This reverts commit r186253.

This is failing to link under Configure+Make on the buildbots for
reasons I don't immediately understand.

Removed:
    cfe/trunk/unittests/AST/ASTVectorTest.cpp
Modified:
    cfe/trunk/include/clang/AST/ASTVector.h
    cfe/trunk/unittests/AST/CMakeLists.txt

Modified: cfe/trunk/include/clang/AST/ASTVector.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ASTVector.h?rev=186255&r1=186254&r2=186255&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/ASTVector.h (original)
+++ cfe/trunk/include/clang/AST/ASTVector.h Sat Jul 13 13:54:56 2013
@@ -216,11 +216,11 @@ public:
 
   iterator insert(ASTContext &C, iterator I, const T &Elt) {
     if (I == this->end()) {  // Important special case for empty vector.
-      push_back(Elt, C);
+      push_back(Elt);
       return this->end()-1;
     }
 
-    if (this->End < this->Capacity) {
+    if (this->EndX < this->CapacityX) {
     Retry:
       new (this->end()) T(this->back());
       this->setEnd(this->end()+1);

Removed: cfe/trunk/unittests/AST/ASTVectorTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/AST/ASTVectorTest.cpp?rev=186254&view=auto
==============================================================================
--- cfe/trunk/unittests/AST/ASTVectorTest.cpp (original)
+++ cfe/trunk/unittests/AST/ASTVectorTest.cpp (removed)
@@ -1,26 +0,0 @@
-//===- unittests/AST/DeclTest.cpp --- Declaration tests -------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// Unit tests for the ASTVector container.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/Compiler.h"
-#include "clang/AST/ASTVector.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-
-LLVM_ATTRIBUTE_UNUSED void CompileTest() {
-  ASTContext *C = 0;
-  ASTVector<int> V;
-  V.insert(*C, V.begin(), 0);
-}

Modified: cfe/trunk/unittests/AST/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/AST/CMakeLists.txt?rev=186255&r1=186254&r2=186255&view=diff
==============================================================================
--- cfe/trunk/unittests/AST/CMakeLists.txt (original)
+++ cfe/trunk/unittests/AST/CMakeLists.txt Sat Jul 13 13:54:56 2013
@@ -1,7 +1,6 @@
 add_clang_unittest(ASTTests
   ASTContextParentMapTest.cpp
   ASTTypeTraitsTest.cpp
-  ASTVectorTest.cpp
   CommentLexer.cpp
   CommentParser.cpp
   DeclPrinterTest.cpp