From 61011e7992308582075c66f0957e40634f88c7ed Mon Sep 17 00:00:00 2001 From: chenqy930 Date: Thu, 23 Mar 2023 10:44:11 +0800 Subject: [PATCH] fixed 5683f85 from https://gitee.com/chenqy930/arkcompiler_ets_frontend_hotfix_dev/pulls/940 Add debug info for release build Issue:#I6PFW4 Signed-off-by: chenqy930 Change-Id: Ifda3238af4cd56a1f2e79a1b1e5a6a54a3faa3c5 --- es2panda/aot/emitFiles.cpp | 8 ++++---- es2panda/aot/emitFiles.h | 13 ++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/es2panda/aot/emitFiles.cpp b/es2panda/aot/emitFiles.cpp index 897b30539f..462708ae15 100644 --- a/es2panda/aot/emitFiles.cpp +++ b/es2panda/aot/emitFiles.cpp @@ -28,7 +28,7 @@ void EmitFileQueue::Schedule() // generate abcs if (mergeAbc_) { - auto emitMergedAbcJob = new EmitMergedAbcJob(options_->CompilerOutput(), progsInfo_, isDebug_); + auto emitMergedAbcJob = new EmitMergedAbcJob(options_->CompilerOutput(), progsInfo_); jobs_.push_back(emitMergedAbcJob); jobsCount_++; } else { @@ -36,7 +36,7 @@ void EmitFileQueue::Schedule() try { auto outputFileName = options_->OutputFiles().empty() ? options_->CompilerOutput() : options_->OutputFiles().at(info.first); - auto emitSingleAbcJob = new EmitSingleAbcJob(outputFileName, &(info.second->program), statp_, isDebug_); + auto emitSingleAbcJob = new EmitSingleAbcJob(outputFileName, &(info.second->program), statp_); jobs_.push_back(emitSingleAbcJob); jobsCount_++; } catch (std::exception &error) { @@ -65,7 +65,7 @@ void EmitFileQueue::Schedule() void EmitSingleAbcJob::Run() { if (!panda::pandasm::AsmEmitter::Emit(panda::os::file::File::GetExtendedFilePath(outputFileName_), *prog_, statp_, - nullptr, isDebug_)) { + nullptr, true)) { throw Error(ErrorType::GENERIC, "Failed to emit " + outputFileName_ + ", error: " + panda::pandasm::AsmEmitter::GetLastError()); } @@ -79,7 +79,7 @@ void EmitMergedAbcJob::Run() progs.push_back(&(info.second->program)); } if (!panda::pandasm::AsmEmitter::EmitPrograms(panda::os::file::File::GetExtendedFilePath(outputFileName_), progs, - isDebug_)) { + true)) { throw Error(ErrorType::GENERIC, "Failed to emit " + outputFileName_ + ", error: " + panda::pandasm::AsmEmitter::GetLastError()); } diff --git a/es2panda/aot/emitFiles.h b/es2panda/aot/emitFiles.h index 27495790e2..808393ecad 100644 --- a/es2panda/aot/emitFiles.h +++ b/es2panda/aot/emitFiles.h @@ -25,8 +25,8 @@ namespace panda::es2panda::aot { class EmitSingleAbcJob : public util::WorkerJob { public: explicit EmitSingleAbcJob(const std::string &outputFileName, panda::pandasm::Program *prog, - std::map *statp, bool isDebug) - : outputFileName_(outputFileName), prog_(prog), statp_(statp), isDebug_(isDebug) {}; + std::map *statp) + : outputFileName_(outputFileName), prog_(prog), statp_(statp) {}; NO_COPY_SEMANTIC(EmitSingleAbcJob); NO_MOVE_SEMANTIC(EmitSingleAbcJob); ~EmitSingleAbcJob() override = default; @@ -36,15 +36,13 @@ private: std::string outputFileName_; panda::pandasm::Program *prog_; std::map *statp_; - bool isDebug_; }; class EmitMergedAbcJob : public util::WorkerJob { public: explicit EmitMergedAbcJob(const std::string &outputFileName, - const std::map &progsInfo, - bool isDebug) - : outputFileName_(outputFileName), progsInfo_(progsInfo), isDebug_(isDebug) {}; + const std::map &progsInfo) + : outputFileName_(outputFileName), progsInfo_(progsInfo) {}; NO_COPY_SEMANTIC(EmitMergedAbcJob); NO_MOVE_SEMANTIC(EmitMergedAbcJob); ~EmitMergedAbcJob() override = default; @@ -53,7 +51,6 @@ public: private: std::string outputFileName_; const std::map &progsInfo_; - bool isDebug_; }; class EmitCacheJob : public util::WorkerJob { @@ -78,7 +75,6 @@ public: : WorkerQueue(options->CompilerOptions().fileThreadCount), options_(options), statp_(statp), progsInfo_(progsInfo) { mergeAbc_ = options_->CompilerOptions().mergeAbc; - isDebug_ = options_->CompilerOptions().isDebug; } NO_COPY_SEMANTIC(EmitFileQueue); @@ -92,7 +88,6 @@ private: std::map *statp_; const std::map &progsInfo_; bool mergeAbc_ { false }; - bool isDebug_ { true }; }; } // namespace panda::es2panda::aot -- Gitee