Merge pull request #88 from AjayBrahmakshatriya/master

Fixed bug with parents_stack being static

Author: AjayBrahmakshatriya

.github/workflows/ci-all-samples.yml

@@ -21,5 +21,5 @@ jobs:
       - run: echo "Starting tests"
       - name: Checking out repository
         uses: actions/checkout@v2
-      - run: make -C ${{ github.workspace }} -j$(nproc) run
+      - run: make -C ${{ github.workspace }} -j$(sysctl -n hw.physicalcpu) run
       - run: echo "Tests completed"

include/builder/dyn_var.h

@@ -64,7 +64,8 @@ struct custom_type : custom_type_base {
 	}
 };
 
-static std::vector<var *> *parents_stack = nullptr;
+extern std::vector<var *> *parents_stack;
+
 // Struct to initialize a dyn_var as member;
 struct as_member {
 	var *parent_var;

src/builder/builder.cpp

@@ -8,6 +8,8 @@ namespace options {
 bool track_members = false;
 }
 
+std::vector<var *> *parents_stack = nullptr;
+
 template <>
 std::vector<block::type::Ptr> extract_type_vector_dyn<>(void) {
 	std::vector<block::type::Ptr> empty_vector;

src/builder/builder_context.cpp

@@ -334,6 +334,11 @@ block::stmt::Ptr builder_context::extract_ast_from_function_internal(std::vector
 	current_block_stmt->static_offset.clear();
 	assert(current_block_stmt != nullptr);
 	ast = current_block_stmt;
+
+	if (parents_stack != nullptr) {
+		parents_stack->clear();
+	}
+
 	bool_vector = b;
 
 	block::stmt::Ptr ret_ast;