Address review feedback

GrammaTech · Mar 20, 2024 · e32dab4 · e32dab4
1 parent aa2bdb4
commit e32dab4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/include/gtirb/ByteInterval.hpp b/include/gtirb/ByteInterval.hpp
@@ -200,7 +200,7 @@ class GTIRB_EXPORT_API ByteInterval : public Node {
   ///
   /// \brief A comparison object that allows searching in the block set by
   ///        offset.
-  struct OffsetCmp {
+  struct GTIRB_EXPORT_API OffsetCmp {
     bool operator()(uint64_t Offset, const Block& B) const {
       return Offset < B.Offset;
     }

diff --git a/src/ByteInterval.cpp b/src/ByteInterval.cpp
@@ -264,9 +264,7 @@ ChangeStatus ByteInterval::removeBlock(BlockType* B) {
              "recovering from rejected removal is not implemented yet");
     }
 
-    [[maybe_unused]] ChangeStatus Status = sizeChange(B, B->getSize(), 0);
-    assert(Status != ChangeStatus::Rejected &&
-           "recovering from rejected removal is not implemented yet");
+    updateIntervalMap(B, B->getSize(), std::nullopt);
     Index.erase(Iter);
     B->setParent(nullptr, nullptr);
     return ChangeStatus::Accepted;

diff --git a/src/test/ByteInterval.test.cpp b/src/test/ByteInterval.test.cpp
@@ -19,7 +19,6 @@
 #include <gtirb/Symbol.hpp>
 #include <gtirb/proto/ByteInterval.pb.h>
 #include <gtest/gtest.h>
-#include <iostream>
 #include <sstream>
 
 using namespace gtirb;

diff --git a/src/test/Section.test.cpp b/src/test/Section.test.cpp
@@ -747,14 +747,14 @@ TEST(Unit_Section, testIterationOrder) {
   auto* CB11 = BI1->addBlock<CodeBlock>(Ctx, 0, 0);
   auto* CB12 = BI1->addBlock<CodeBlock>(Ctx, 0, 1);
   auto* BI2 = S->addByteInterval(Ctx, Addr(0));
-  auto* CB21 = BI2->addBlock<DataBlock>(Ctx, 0, 0);
-  auto* CB22 = BI2->addBlock<DataBlock>(Ctx, 0, 1);
+  auto* DB21 = BI2->addBlock<DataBlock>(Ctx, 0, 0);
+  auto* DB22 = BI2->addBlock<DataBlock>(Ctx, 0, 1);
   auto* BI3 = S->addByteInterval(Ctx, Addr(1));
-  auto* CB31 = BI3->addBlock<DataBlock>(Ctx, 0, 0);
-  auto* CB32 = BI3->addBlock<DataBlock>(Ctx, 0, 1);
+  auto* DB31 = BI3->addBlock<DataBlock>(Ctx, 0, 0);
+  auto* DB32 = BI3->addBlock<DataBlock>(Ctx, 0, 1);
 
   {
-    std::vector<Node*> ExpectedOrder = {CB11, CB21, CB12, CB22, CB31, CB32};
+    std::vector<Node*> ExpectedOrder = {CB11, DB21, CB12, DB22, DB31, DB32};
     EXPECT_EQ(pointers(S->blocks()), ExpectedOrder);
   }
 }