fix: file.modpath and file.workdir function cache cross different mod…

…ules (#1427) Signed-off-by: peefy <xpf6677@163.com>
kcl-lang · Jun 20, 2024 · 6fd3a09 · 6fd3a09
1 parent 63b2368
commit 6fd3a09
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/kclvm/compiler/src/codegen/llvm/context.rs b/kclvm/compiler/src/codegen/llvm/context.rs
@@ -1390,22 +1390,6 @@ impl<'ctx> LLVMCodeGenContext<'ctx> {
                 self.pkgpath_stack.borrow_mut().push(pkgpath.clone());
             }
         }
-        // Set the kcl module path to the runtime context
-        self.build_void_call(
-            &ApiFunc::kclvm_context_set_kcl_modpath.name(),
-            &[
-                self.current_runtime_ctx_ptr(),
-                self.native_global_string_value(&self.program.root),
-            ],
-        );
-        // Set the kcl workdir to the runtime context
-        self.build_void_call(
-            &ApiFunc::kclvm_context_set_kcl_workdir.name(),
-            &[
-                self.current_runtime_ctx_ptr(),
-                self.native_global_string_value(&self.workdir),
-            ],
-        );
         if !self.import_names.is_empty() {
             let import_names = self.dict_value();
             for (k, v) in &self.import_names {
@@ -1438,6 +1422,22 @@ impl<'ctx> LLVMCodeGenContext<'ctx> {
             }
             self.ret_void();
         } else {
+            // Set the kcl module path to the runtime context only in the main package.
+            self.build_void_call(
+                &ApiFunc::kclvm_context_set_kcl_modpath.name(),
+                &[
+                    self.current_runtime_ctx_ptr(),
+                    self.native_global_string_value(&self.program.root),
+                ],
+            );
+            // Set the kcl workdir to the runtime context
+            self.build_void_call(
+                &ApiFunc::kclvm_context_set_kcl_workdir.name(),
+                &[
+                    self.current_runtime_ctx_ptr(),
+                    self.native_global_string_value(&self.workdir),
+                ],
+            );
             // Init scope and all builtin functions
             self.init_scope(MAIN_PKG_PATH);
             let main_pkg_modules = self

diff --git a/kclvm/version/src/lib.rs b/kclvm/version/src/lib.rs
@@ -1,7 +1,7 @@
 //! Copyright The KCL Authors. All rights reserved.
 
 pub const VERSION: &str = include_str!("./../../../VERSION");
-pub const CHECK_SUM: &str = "0c20ab3eb4b9179219d6837a57f5d352";
+pub const CHECK_SUM: &str = "c020ab3eb4b9179219d6837a57f5d323";
 
 /// Get kCL full version string with the format `{version}-{check_sum}`.
 #[inline]