openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-10-07 08:03:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!4901 Cherry-pick !4857 to 4.0-Release

Browse Source 
Merge pull request !4901 from chenlincl3/cherry-pick-1695608359
This commit is contained in:
openharmony_ci 2023-09-25 06:10:53 +00:00 committed by Gitee
commit 8a5e9aed0b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ecmascript/module/js_module_deregister.cpp
View File

@ -129,6 +129,7 @@ void ModuleDeregister::IncreaseRegisterCounts(JSThread *thread, JSHandle<SourceT
requiredModule->SetLoadingTypes(LoadingTypes::STABLE_MODULE);
return;
}
increaseModule.emplace(moduleName);
LoadingTypes type = requiredModule->GetLoadingTypes();
if (type == LoadingTypes::DYNAMITC_MODULE) {
IncreaseRegisterCounts(thread, requiredModule, increaseModule);

3
ecmascript/module/js_module_manager.cpp
View File

@ -505,7 +505,8 @@ JSHandle<JSTaggedValue> ModuleManager::ResolveModuleWithMerge(
JSRecordInfo recordInfo;
bool hasRecord = jsPandaFile->CheckAndGetRecordInfo(recordName, recordInfo);
if (!hasRecord) {
CString msg = "cannot find record '" + recordName + "', please check the request path.";
CString msg = "cannot find record '" + recordName + "', please check the request path.'"
+ moduleFileName + "'.";
LOG_FULL(ERROR) << msg;
THROW_NEW_ERROR_AND_RETURN_HANDLE(thread, ErrorType::REFERENCE_ERROR, JSTaggedValue, msg.c_str());
}