commit 11c141eb68531eec30af8ff8f82b8159de99e555
author Reid Kleckner <rnk@google.com> Fri May 24 00:02:00 2019 +0000
committer Reid Kleckner <rnk@google.com> Fri May 24 00:02:00 2019 +0000
tree c432a2dd3dc579a0a54369fec854d8b563639d6d
parent ae02e8944807c7b611ca3645a983c62d464f27a4

[COFF] Remove finalizeContents virtual method from Chunk, NFC

This only needs to be done for MergeChunks, so just do that in a
separate pass in the Writer.

This is one small step towards eliminating the vtable in Chunk.

llvm-svn: 361573

lld/COFF/Chunks.cpp

diff --git a/lld/COFF/Chunks.cpp b/lld/COFF/Chunks.cpp
index 76b0c83..b016ac1 100644
--- a/lld/COFF/Chunks.cpp
+++ b/lld/COFF/Chunks.cpp
@@ -873,14 +873,15 @@
 }
 
 void MergeChunk::finalizeContents() {
-  if (!Finalized) {
-    for (SectionChunk *C : Sections)
-      if (C->Live)
-        Builder.add(toStringRef(C->getContents()));
-    Builder.finalize();
-    Finalized = true;
-  }
+  assert(!Finalized && "should only finalize once");
+  for (SectionChunk *C : Sections)
+    if (C->Live)
+      Builder.add(toStringRef(C->getContents()));
+  Builder.finalize();
+  Finalized = true;
+}
 
+void MergeChunk::assignSubsectionRVAs() {
   for (SectionChunk *C : Sections) {
     if (!C->Live)
       continue;