@@ -360,7 +360,8 @@ static bool PrintDemangledArgumentList(Stream &s, const SymbolContext &sc) {
360
360
361
361
auto info_or_err = GetAndValidateInfo (sc);
362
362
if (!info_or_err) {
363
- llvm::consumeError (info_or_err.takeError ());
363
+ LLDB_LOG_ERROR (GetLog (LLDBLog::Language), info_or_err.takeError (),
364
+ " Failed to retrieve demangled info: {0}" );
364
365
return false ;
365
366
}
366
367
auto [demangled_name, info] = *info_or_err;
@@ -1897,7 +1898,8 @@ bool CPlusPlusLanguage::HandleFrameFormatVariable(
1897
1898
case FormatEntity::Entry::Type::FunctionScope: {
1898
1899
auto scope_or_err = GetDemangledScope (sc);
1899
1900
if (!scope_or_err) {
1900
- llvm::consumeError (scope_or_err.takeError ());
1901
+ LLDB_LOG_ERROR (GetLog (LLDBLog::Language), scope_or_err.takeError (),
1902
+ " Failed to retrieve scope: {0}" );
1901
1903
return false ;
1902
1904
}
1903
1905
@@ -1909,7 +1911,8 @@ bool CPlusPlusLanguage::HandleFrameFormatVariable(
1909
1911
case FormatEntity::Entry::Type::FunctionBasename: {
1910
1912
auto name_or_err = GetDemangledBasename (sc);
1911
1913
if (!name_or_err) {
1912
- llvm::consumeError (name_or_err.takeError ());
1914
+ LLDB_LOG_ERROR (GetLog (LLDBLog::Language), name_or_err.takeError (),
1915
+ " Failed to retrieve basename: {0}" );
1913
1916
return false ;
1914
1917
}
1915
1918
@@ -1921,7 +1924,9 @@ bool CPlusPlusLanguage::HandleFrameFormatVariable(
1921
1924
case FormatEntity::Entry::Type::FunctionTemplateArguments: {
1922
1925
auto template_args_or_err = GetDemangledTemplateArguments (sc);
1923
1926
if (!template_args_or_err) {
1924
- llvm::consumeError (template_args_or_err.takeError ());
1927
+ LLDB_LOG_ERROR (GetLog (LLDBLog::Language),
1928
+ template_args_or_err.takeError (),
1929
+ " Failed to retrieve template arguments: {0}" );
1925
1930
return false ;
1926
1931
}
1927
1932
@@ -1956,7 +1961,8 @@ bool CPlusPlusLanguage::HandleFrameFormatVariable(
1956
1961
case FormatEntity::Entry::Type::FunctionReturnRight: {
1957
1962
auto return_rhs_or_err = GetDemangledReturnTypeRHS (sc);
1958
1963
if (!return_rhs_or_err) {
1959
- llvm::consumeError (return_rhs_or_err.takeError ());
1964
+ LLDB_LOG_ERROR (GetLog (LLDBLog::Language), return_rhs_or_err.takeError (),
1965
+ " Failed to retrieve RHS return type: {0}" );
1960
1966
return false ;
1961
1967
}
1962
1968
@@ -1967,7 +1973,8 @@ bool CPlusPlusLanguage::HandleFrameFormatVariable(
1967
1973
case FormatEntity::Entry::Type::FunctionReturnLeft: {
1968
1974
auto return_lhs_or_err = GetDemangledReturnTypeLHS (sc);
1969
1975
if (!return_lhs_or_err) {
1970
- llvm::consumeError (return_lhs_or_err.takeError ());
1976
+ LLDB_LOG_ERROR (GetLog (LLDBLog::Language), return_lhs_or_err.takeError (),
1977
+ " Failed to retrieve LHS return type: {0}" );
1971
1978
return false ;
1972
1979
}
1973
1980
@@ -1978,7 +1985,8 @@ bool CPlusPlusLanguage::HandleFrameFormatVariable(
1978
1985
case FormatEntity::Entry::Type::FunctionQualifiers: {
1979
1986
auto quals_or_err = GetDemangledFunctionQualifiers (sc);
1980
1987
if (!quals_or_err) {
1981
- llvm::consumeError (quals_or_err.takeError ());
1988
+ LLDB_LOG_ERROR (GetLog (LLDBLog::Language), quals_or_err.takeError (),
1989
+ " Failed to retrieve function qualifiers: {0}" );
1982
1990
return false ;
1983
1991
}
1984
1992
@@ -1989,7 +1997,8 @@ bool CPlusPlusLanguage::HandleFrameFormatVariable(
1989
1997
case FormatEntity::Entry::Type::FunctionSuffix: {
1990
1998
auto suffix_or_err = GetDemangledFunctionSuffix (sc);
1991
1999
if (!suffix_or_err) {
1992
- llvm::consumeError (suffix_or_err.takeError ());
2000
+ LLDB_LOG_ERROR (GetLog (LLDBLog::Language), suffix_or_err.takeError (),
2001
+ " Failed to retrieve suffix: {0}" );
1993
2002
return false ;
1994
2003
}
1995
2004
0 commit comments