C++ code cleanup

Author: Patrick-6

genmc-sys/src_cpp/MiriInterface.cpp

@@ -24,24 +24,18 @@
 #include <memory>
 #include <utility>
 
-using AnnotID = ModuleID::ID;
-using AnnotT = SExpr<AnnotID>;
-
 // Return -1 when no thread can/should be scheduled, or the thread id of the next thread
 // NOTE: this is safe because ThreadId is 32 bit, and we return a 64 bit integer
-// TODO GENMC: could directly return std::optional if CXX ever supports this
+// FIXME(genmc,cxx): could directly return std::optional if CXX ever supports this
 auto MiriGenMCShim::scheduleNext(const int curr_thread_id,
 								 const ActionKind curr_thread_next_instr_kind) -> int64_t
 {
 	// The current thread is the only one where the `kind` could have changed since we last made
 	// a scheduling decision.
 	globalInstructions[curr_thread_id].kind = curr_thread_next_instr_kind;
 
-	auto result = GenMCDriver::scheduleNext(globalInstructions);
-	if (result.has_value())
-	{
+	if (const auto result = GenMCDriver::scheduleNext(globalInstructions))
 		return static_cast<int64_t>(result.value());
-	}
 	return -1;
 }
 
@@ -52,8 +46,6 @@ auto MiriGenMCShim::createHandle(const GenmcParams &config)
 	-> std::unique_ptr<MiriGenMCShim>
 {
 	auto conf = std::make_shared<Config>();
-	// TODO GENMC: Can we get some default values somehow?
-	// Config::saveConfigOptions(*conf);
 
 	// NOTE: Miri already initialization checks, so we can disable them in GenMC
 	conf->skipNonAtomicInitializedCheck = true;
@@ -144,13 +136,9 @@ auto createGenmcHandle(const GenmcParams &config)
 
 void MiriGenMCShim::handleExecutionStart()
 {
-	// TODO GENMC: reset completely or just set to init event for each thread?
 	globalInstructions.clear();
 	globalInstructions.push_back(Action(ActionKind::Load, Event::getInit()));
-	// for (auto &action : globalInstructions) {
-	// 	action.event.index = 0;
-	// 	action.kind = ActionKind::Load;
-	// }
+
 	GenMCDriver::handleExecutionStart();
 }
 
@@ -261,7 +249,7 @@ auto MiriGenMCShim::handleMalloc(ThreadId thread_id, uint64_t size, uint64_t ali
 {
 	auto pos = incPos(thread_id);
 
-	auto sd = StorageDuration::SD_Heap;   // TODO GENMC: get from Miri
+	auto sd = StorageDuration::SD_Heap;	  // TODO GENMC: get from Miri
 	auto stype = StorageType::ST_Durable; // TODO GENMC
 	auto spc = AddressSpace::AS_User;	  // TODO GENMC