Add method to initialize the memory layout

Signed-off-by: Roberto Raggi <[email protected]>

Author: robertoraggi

src/frontend/cxx/frontend.cc

@@ -367,7 +367,7 @@ void Frontend::Private::prepare() {
     toolchain_ = std::move(windowsToolchain);
   }
 
-  unit_->control()->setMemoryLayout(toolchain_->memoryLayout());
+  toolchain_->initMemoryLayout();
 }
 
 void Frontend::Private::preparePreprocessor() {

src/parser/cxx/preprocessor.cc

@@ -2937,6 +2937,8 @@ Preprocessor::Preprocessor(Control* control,
 
 Preprocessor::~Preprocessor() = default;
 
+auto Preprocessor::control() const -> Control* { return d->control_; }
+
 auto Preprocessor::diagnosticsClient() const -> DiagnosticsClient* {
   return d->diagnosticsClient_;
 }

src/parser/cxx/preprocessor.h

@@ -56,6 +56,8 @@ class Preprocessor {
   explicit Preprocessor(Control* control, DiagnosticsClient* diagnosticsClient);
   ~Preprocessor();
 
+  [[nodiscard]] auto control() const -> Control*;
+
   [[nodiscard]] auto diagnosticsClient() const -> DiagnosticsClient*;
 
   [[nodiscard]] auto language() const -> LanguageKind;

src/parser/cxx/toolchain.cc

@@ -21,6 +21,7 @@
 #include <cxx/toolchain.h>
 
 // cxx
+#include <cxx/control.h>
 #include <cxx/memory_layout.h>
 #include <cxx/preprocessor.h>
 
@@ -45,6 +46,10 @@ void Toolchain::defineMacro(const std::string& name,
   preprocessor_->defineMacro(name, definition);
 }
 
+void Toolchain::initMemoryLayout() {
+  preprocessor_->control()->setMemoryLayout(memoryLayout_.get());
+}
+
 void Toolchain::addSystemIncludePath(std::string path) {
   preprocessor_->addSystemIncludePath(std::move(path));
 }

src/parser/cxx/toolchain.h

@@ -46,6 +46,7 @@ class Toolchain {
 
   void setMemoryLayout(std::unique_ptr<MemoryLayout> memoryLayout);
 
+  virtual void initMemoryLayout();
   virtual void addSystemIncludePaths() = 0;
   virtual void addSystemCppIncludePaths() = 0;
   virtual void addPredefinedMacros() = 0;