@@ -1952,6 +1952,11 @@ GetDemangledFunctionPrefix(const SymbolContext &sc) {
19521952
19531953 auto [demangled_name, info] = *info_or_err;
19541954
1955+ if (!info.hasPrefix ())
1956+ return llvm::createStringError (
1957+ " DemangledInfo for '%s does not have suffix range." ,
1958+ demangled_name.data ());
1959+
19551960 return demangled_name.slice (info.PrefixRange .first , info.PrefixRange .second );
19561961}
19571962
@@ -1963,6 +1968,11 @@ GetDemangledFunctionSuffix(const SymbolContext &sc) {
19631968
19641969 auto [demangled_name, info] = *info_or_err;
19651970
1971+ if (!info.hasSuffix ())
1972+ return llvm::createStringError (
1973+ " DemangledInfo for '%s does not have suffix range." ,
1974+ demangled_name.data ());
1975+
19661976 return demangled_name.slice (info.SuffixRange .first , info.SuffixRange .second );
19671977}
19681978
@@ -1971,9 +1981,9 @@ static bool PrintDemangledArgumentList(Stream &s, const SymbolContext &sc) {
19711981
19721982 auto info_or_err = GetAndValidateInfo (sc);
19731983 if (!info_or_err) {
1974- LLDB_LOG_ERROR (
1975- GetLog (LLDBLog::Language), info_or_err. takeError (),
1976- " Failed to handle ${{function.basename}} frame-format variable: {0}" );
1984+ LLDB_LOG_ERROR (GetLog (LLDBLog::Language), info_or_err. takeError (),
1985+ " Failed to handle ${{function.formatted-arguments}} "
1986+ " frame-format variable: {0}" );
19771987 return false ;
19781988 }
19791989 auto [demangled_name, info] = *info_or_err;
0 commit comments