@@ -1952,6 +1952,11 @@ GetDemangledFunctionPrefix(const SymbolContext &sc) {
1952
1952
1953
1953
auto [demangled_name, info] = *info_or_err;
1954
1954
1955
+ if (!info.hasPrefix ())
1956
+ return llvm::createStringError (
1957
+ " DemangledInfo for '%s does not have suffix range." ,
1958
+ demangled_name.data ());
1959
+
1955
1960
return demangled_name.slice (info.PrefixRange .first , info.PrefixRange .second );
1956
1961
}
1957
1962
@@ -1963,6 +1968,11 @@ GetDemangledFunctionSuffix(const SymbolContext &sc) {
1963
1968
1964
1969
auto [demangled_name, info] = *info_or_err;
1965
1970
1971
+ if (!info.hasSuffix ())
1972
+ return llvm::createStringError (
1973
+ " DemangledInfo for '%s does not have suffix range." ,
1974
+ demangled_name.data ());
1975
+
1966
1976
return demangled_name.slice (info.SuffixRange .first , info.SuffixRange .second );
1967
1977
}
1968
1978
@@ -1971,9 +1981,9 @@ static bool PrintDemangledArgumentList(Stream &s, const SymbolContext &sc) {
1971
1981
1972
1982
auto info_or_err = GetAndValidateInfo (sc);
1973
1983
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}" );
1977
1987
return false ;
1978
1988
}
1979
1989
auto [demangled_name, info] = *info_or_err;
0 commit comments