vsk created this revision. vsk added reviewers: teemperor, shafik. Herald added a subscriber: kristof.beyls.
This fixes a UBSan error seen while debugging clang: Member call on null pointer of type 'clang::TypeSourceInfo' rdar://58783517 https://reviews.llvm.org/D73808 Files: lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp lldb/source/Symbol/TypeSystemClang.cpp Index: lldb/source/Symbol/TypeSystemClang.cpp =================================================================== --- lldb/source/Symbol/TypeSystemClang.cpp +++ lldb/source/Symbol/TypeSystemClang.cpp @@ -1275,11 +1275,12 @@ if (name && name[0]) identifier_info = &ast.Idents.get(name); if (IsValueParam(template_param_infos.args[i])) { + QualType template_param_type = + template_param_infos.args[i].getIntegralType(); template_param_decls.push_back(NonTypeTemplateParmDecl::Create( ast, decl_context, SourceLocation(), SourceLocation(), depth, i, - identifier_info, template_param_infos.args[i].getIntegralType(), - parameter_pack, nullptr)); - + identifier_info, template_param_type, parameter_pack, + ast.getTrivialTypeSourceInfo(template_param_type))); } else { template_param_decls.push_back(TemplateTypeParmDecl::Create( ast, decl_context, SourceLocation(), SourceLocation(), depth, i, Index: lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp =================================================================== --- lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp +++ lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp @@ -34,6 +34,11 @@ bool isIntBool() { return true; } }; +template<int Size> struct array { + int Arr[Size]; + array() {} +}; + int main (int argc, char const *argv[]) { C<int,16,32> myC; @@ -53,12 +58,15 @@ D<int,int> myLesserD; myD.member = 64; (void)D<int,int,bool>().isIntBool(); - (void)D<int,int>().isIntBool(); - return myD.member != 64; //% self.expect("expression -- myD", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["64"]) + (void)D<int,int>().isIntBool(); //% self.expect("expression -- myD", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["64"]) //% self.expect("expression -- myLesserD.isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"]) //% self.expect("expression -- myD.isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"]) // See comment above. //#% self.expect("expression -- D<int, int>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"]) //#% self.expect("expression -- D<int, int, bool>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"]) + + array<3> myArray; //% self.expect("expression -- myArray", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["Arr"]) + + return 1; }
Index: lldb/source/Symbol/TypeSystemClang.cpp =================================================================== --- lldb/source/Symbol/TypeSystemClang.cpp +++ lldb/source/Symbol/TypeSystemClang.cpp @@ -1275,11 +1275,12 @@ if (name && name[0]) identifier_info = &ast.Idents.get(name); if (IsValueParam(template_param_infos.args[i])) { + QualType template_param_type = + template_param_infos.args[i].getIntegralType(); template_param_decls.push_back(NonTypeTemplateParmDecl::Create( ast, decl_context, SourceLocation(), SourceLocation(), depth, i, - identifier_info, template_param_infos.args[i].getIntegralType(), - parameter_pack, nullptr)); - + identifier_info, template_param_type, parameter_pack, + ast.getTrivialTypeSourceInfo(template_param_type))); } else { template_param_decls.push_back(TemplateTypeParmDecl::Create( ast, decl_context, SourceLocation(), SourceLocation(), depth, i, Index: lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp =================================================================== --- lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp +++ lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp @@ -34,6 +34,11 @@ bool isIntBool() { return true; } }; +template<int Size> struct array { + int Arr[Size]; + array() {} +}; + int main (int argc, char const *argv[]) { C<int,16,32> myC; @@ -53,12 +58,15 @@ D<int,int> myLesserD; myD.member = 64; (void)D<int,int,bool>().isIntBool(); - (void)D<int,int>().isIntBool(); - return myD.member != 64; //% self.expect("expression -- myD", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["64"]) + (void)D<int,int>().isIntBool(); //% self.expect("expression -- myD", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["64"]) //% self.expect("expression -- myLesserD.isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"]) //% self.expect("expression -- myD.isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"]) // See comment above. //#% self.expect("expression -- D<int, int>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"]) //#% self.expect("expression -- D<int, int, bool>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"]) + + array<3> myArray; //% self.expect("expression -- myArray", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["Arr"]) + + return 1; }
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits