From 73ad431b8d3eed81f3e49bbaba4c797c87203598 Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:20:06 -0500 Subject: [PATCH] Fix the node type for "file" nodes in object files (#1593) --- include/asm/fstack.hpp | 3 --- src/asm/fstack.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/asm/fstack.hpp b/include/asm/fstack.hpp index 9889d7bc..76bc7a2d 100644 --- a/include/asm/fstack.hpp +++ b/include/asm/fstack.hpp @@ -44,9 +44,6 @@ struct FileStackNode { : type(type_), data(data_){}; std::string const &dump(uint32_t curLineNo) const; - - // If true, entering this context generates a new unique ID. - bool generatesUniqueID() const { return type == NODE_REPT || type == NODE_MACRO; } }; #define DEFAULT_MAX_DEPTH 64 diff --git a/src/asm/fstack.cpp b/src/asm/fstack.cpp index 97a4ac8f..ffca0e82 100644 --- a/src/asm/fstack.cpp +++ b/src/asm/fstack.cpp @@ -210,7 +210,7 @@ static bool newFileContext(std::string const &filePath, bool updateStateNow) { std::shared_ptr macroArgs = nullptr; auto fileInfo = - std::make_shared(NODE_MACRO, filePath == "-" ? "" : filePath); + std::make_shared(NODE_FILE, filePath == "-" ? "" : filePath); if (!contextStack.empty()) { Context &oldContext = contextStack.top(); fileInfo->parent = oldContext.fileInfo;