@@ -920,11 +920,12 @@ StatusOr<std::map<std::string, ArgInfo>> DwarfReader::GetFunctionArgInfo(
920920 // programs with ASAN/TSAN enabled this is common.
921921 llvm::DWARFUnit* cu = function_die.getDwarfUnit ();
922922 llvm::DWARFDie unit_die = cu->getUnitDIE ();
923- PX_ASSIGN_OR_RETURN (auto p, DetectSourceLanguageFromCUDIE (unit_die));
924- ABI abi = LanguageToABI (p.first , p.second );
923+ PX_ASSIGN_OR_RETURN (auto source_lang_info, DetectSourceLanguageFromCUDIE (unit_die));
924+ auto [source_lang, compiler] = source_lang_info;
925+ ABI abi = LanguageToABI (source_lang, compiler);
925926 if (abi == ABI ::kUnknown ) {
926927 return error::Unimplemented (" Unable to determine ABI from language: $0" ,
927- magic_enum::enum_name (p. first ));
928+ magic_enum::enum_name (source_lang ));
928929 }
929930 std::unique_ptr<ABICallingConventionModel> arg_tracker = ABICallingConventionModel::Create (abi);
930931
@@ -963,7 +964,7 @@ StatusOr<std::map<std::string, ArgInfo>> DwarfReader::GetFunctionArgInfo(
963964 PX_ASSIGN_OR_RETURN (const DWARFDie type_die, GetTypeDie (die));
964965 PX_ASSIGN_OR_RETURN (arg.type_info , GetTypeInfo (die, type_die));
965966
966- if (p. first == llvm::dwarf::DW_LANG_Go) {
967+ if (source_lang == llvm::dwarf::DW_LANG_Go) {
967968 arg.retarg = IsGolangRetArg (die).ValueOr (false );
968969 }
969970
0 commit comments