Skip to content

Commit 3e84eff

Browse files
committed
Fix remaining tests
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent fc51589 commit 3e84eff

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/stirling/obj_tools/dwarf_reader.cc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ DwarfReader::DetectSourceLanguageFromCUDIE(const llvm::DWARFDie& unit_die) {
184184
Status DwarfReader::DetectSourceLanguage() {
185185
is_multi_lang_ = false;
186186
std::optional<llvm::dwarf::SourceLanguage> prev_source_language;
187-
std::optional<std::string> prev_compiler;
188187
for (size_t i = 0; i < dwarf_context_->getNumCompileUnits(); ++i) {
189188
const auto& unit_die = dwarf_context_->getUnitAtIndex(i)->getUnitDIE();
190189
auto lang_s = DetectSourceLanguageFromCUDIE(unit_die);
@@ -193,22 +192,15 @@ Status DwarfReader::DetectSourceLanguage() {
193192
}
194193
auto p = lang_s.ValueOrDie();
195194
auto source_language = p.first;
196-
auto& compiler = p.second;
197195

198196
if (!prev_source_language.has_value()) {
199197
prev_source_language = source_language;
200198
} else if (prev_source_language.has_value() &&
201199
prev_source_language.value() != source_language) {
202200
is_multi_lang_ = true;
203201
}
204-
205-
if (!prev_compiler.has_value()) {
206-
prev_compiler = compiler;
207-
} else if (prev_compiler.has_value() && prev_compiler.value() != compiler) {
208-
is_multi_lang_ = true;
209-
}
210202
}
211-
if (prev_source_language.has_value() && prev_compiler.has_value()) {
203+
if (prev_source_language.has_value()) {
212204
source_language_ = prev_source_language.value();
213205
return Status::OK();
214206
}

src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/autogen.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ void DetectSourceLanguage(obj_tools::ElfReader* elf_reader, obj_tools::DwarfRead
7474
input_program->deployment_spec().path_list().paths(0));
7575

7676
} else {
77+
LOG(WARNING) << source_lang_s.msg();
7778
detected_language = ir::shared::Language::LANG_UNKNOWN;
7879
}
7980
} else {

0 commit comments

Comments
 (0)