Author: Andy Yankovsky Date: 2021-11-15T14:48:19+01:00 New Revision: 95102b7dc3c1b5b3f1b688221d9aa28cb1e17974
URL: https://github.com/llvm/llvm-project/commit/95102b7dc3c1b5b3f1b688221d9aa28cb1e17974 DIFF: https://github.com/llvm/llvm-project/commit/95102b7dc3c1b5b3f1b688221d9aa28cb1e17974.diff LOG: [lldb] Unwrap the type when dereferencing the value The value type can be a typedef of a reference (e.g. `typedef int& myint`). In this case `GetQualType(type)` will return `clang::Typedef`, which cannot be casted to `clang::ReferenceType`. Fix a regression introduced in https://reviews.llvm.org/D103532. Reviewed By: teemperor Differential Revision: https://reviews.llvm.org/D113673 Added: Modified: lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py lldb/test/API/lang/cpp/dereferencing_references/main.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp index 077104b8fe85..b20ae32a08ac 100644 --- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp +++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp @@ -6492,7 +6492,8 @@ CompilerType TypeSystemClang::GetChildCompilerTypeAtIndex( case clang::Type::RValueReference: if (idx_is_valid) { const clang::ReferenceType *reference_type = - llvm::cast<clang::ReferenceType>(GetQualType(type).getTypePtr()); + llvm::cast<clang::ReferenceType>( + RemoveWrappingTypes(GetQualType(type)).getTypePtr()); CompilerType pointee_clang_type = GetType(reference_type->getPointeeType()); if (transparent_pointers && pointee_clang_type.IsAggregateType()) { diff --git a/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py b/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py index 994e26f0e91e..741fc6ed85e0 100644 --- a/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py +++ b/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py @@ -21,3 +21,7 @@ def test(self): # Same as above for rvalue references. rref_val = self.expect_var_path("r_ref", type="TTT &&") self.assertEqual(rref_val.Dereference().GetType().GetName(), "TTT") + + # Typedef to a reference should dereference to the underlying type. + td_val = self.expect_var_path("td_to_ref_type", type="td_int_ref") + self.assertEqual(td_val.Dereference().GetType().GetName(), "int") diff --git a/lldb/test/API/lang/cpp/dereferencing_references/main.cpp b/lldb/test/API/lang/cpp/dereferencing_references/main.cpp index 8228dc411320..b64978a9029f 100644 --- a/lldb/test/API/lang/cpp/dereferencing_references/main.cpp +++ b/lldb/test/API/lang/cpp/dereferencing_references/main.cpp @@ -1,8 +1,13 @@ typedef int TTT; +typedef int &td_int_ref; int main() { int i = 0; + // references to typedefs TTT &l_ref = i; TTT &&r_ref = static_cast<TTT &&>(i); + // typedef of a reference + td_int_ref td_to_ref_type = i; + return l_ref; // break here } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits