Add pop_back() / back() method for FixedVector

src/common/FixedVector.h

@@ -71,6 +71,10 @@ class FixedVector final
     void push_back(const value_type &value);
     void push_back(value_type &&value);
 
+    void pop_back();
+    reference back();
+    const_reference back() const;
+
     void swap(FixedVector<T, N, Storage> &other);
 
     void resize(size_type count);
@@ -241,7 +245,7 @@ void FixedVector<T, N, Storage>::clear()
 template <class T, size_t N, class Storage>
 void FixedVector<T, N, Storage>::push_back(const value_type &value)
 {
-    ASSERT(mSize + 1 < N);
+    ASSERT(mSize + 1 <= N);
     mStorage[mSize] = value;
     mSize++;
 }
@@ -249,12 +253,33 @@ void FixedVector<T, N, Storage>::push_back(const value_type &value)
 template <class T, size_t N, class Storage>
 void FixedVector<T, N, Storage>::push_back(value_type &&value)
 {
-    ASSERT(mSize + 1 < N);
+    ASSERT(mSize + 1 <= N);
     mStorage[mSize] = std::move(value);
     mSize++;
 }
 
 template <class T, size_t N, class Storage>
+void FixedVector<T, N, Storage>::pop_back()
+{
+    ASSERT(mSize > 0);
+    mSize--;
+}
+
+template <class T, size_t N, class Storage>
+typename FixedVector<T, N, Storage>::reference FixedVector<T, N, Storage>::back()
+{
+    ASSERT(mSize > 0);
+    return mStorage[mSize - 1];
+}
+
+template <class T, size_t N, class Storage>
+typename FixedVector<T, N, Storage>::const_reference FixedVector<T, N, Storage>::back() const
+{
+    ASSERT(mSize > 0);
+    return mStorage[mSize - 1];
+}
+
+template <class T, size_t N, class Storage>
 void FixedVector<T, N, Storage>::swap(FixedVector<T, N, Storage> &other)
 {
     std::swap(mSize, other.mSize);

src/common/FixedVector_unittest.cpp

@@ -61,6 +61,30 @@ TEST(FixedVector, PushBack)
     FixedVector<int, 5> vec;
     vec.push_back(1);
     EXPECT_EQ(1, vec[0]);
+    vec.push_back(1);
+    vec.push_back(1);
+    vec.push_back(1);
+    vec.push_back(1);
+    EXPECT_EQ(vec.size(), vec.max_size());
+}
+
+// Test the pop_back function
+TEST(FixedVector, PopBack)
+{
+    FixedVector<int, 5> vec;
+    vec.push_back(1);
+    EXPECT_EQ(1, (int)vec.size());
+    vec.pop_back();
+    EXPECT_EQ(0, (int)vec.size());
+}
+
+// Test the back function
+TEST(FixedVector, Back)
+{
+    FixedVector<int, 5> vec;
+    vec.push_back(1);
+    vec.push_back(2);
+    EXPECT_EQ(2, vec.back());
 }
 
 // Test the sizing operations
@@ -99,7 +123,7 @@ TEST(FixedVector, Resize)
 // Test iterating over the vector
 TEST(FixedVector, Iteration)
 {
-    FixedVector<int, 5> vec = { 0, 1, 2, 3 };
+    FixedVector<int, 5> vec = {0, 1, 2, 3};
 
     int vistedCount = 0;
     for (int value : vec)
@@ -110,4 +134,4 @@ TEST(FixedVector, Iteration)
     EXPECT_EQ(4, vistedCount);
 }
 
-} // namespace angle
+}  // namespace angle