From e9c5d02e14b87f22c28605169df783feb8de7898 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Thu, 19 Dec 2019 18:03:42 -1000 Subject: llvm with libtapi supporting v3 in progress --- data/_llvm10/lldbwut.diff | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 data/_llvm10/lldbwut.diff (limited to 'data/_llvm10/lldbwut.diff') diff --git a/data/_llvm10/lldbwut.diff b/data/_llvm10/lldbwut.diff new file mode 100644 index 000000000..940e413ff --- /dev/null +++ b/data/_llvm10/lldbwut.diff @@ -0,0 +1,105 @@ +diff -ur llvm-project-apple-stable-20191106/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp llvm-project-apple-stable-20191106+iOS/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp +--- llvm-project-apple-stable-20191106/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp 2019-12-03 19:28:47.000000000 -1000 ++++ llvm-project-apple-stable-20191106+iOS/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp 2019-12-05 22:51:42.000000000 -1000 +@@ -330,6 +330,7 @@ + + const bool isInstance = instance; + const bool isVariadic = false; ++ const bool isPropertyAccessor = false; + const bool isSynthesized = false; + const bool isImplicitlyDeclared = true; + const bool isDefined = false; +@@ -376,7 +377,7 @@ + + clang::ObjCMethodDecl *ret = clang::ObjCMethodDecl::Create( + ast_ctx, clang::SourceLocation(), clang::SourceLocation(), sel, +- ret_type, nullptr, interface_decl, isInstance, isVariadic, ++ ret_type, nullptr, interface_decl, isInstance, isVariadic, isPropertyAccessor, + isSynthesized, isImplicitlyDeclared, isDefined, impControl, + HasRelatedResultType); + +diff -ur llvm-project-apple-stable-20191106/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp llvm-project-apple-stable-20191106+iOS/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +--- llvm-project-apple-stable-20191106/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp 2019-12-03 19:28:47.000000000 -1000 ++++ llvm-project-apple-stable-20191106+iOS/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp 2019-12-05 23:09:53.000000000 -1000 +@@ -2538,8 +2538,7 @@ + + // Next we need to determine the correct path for the dyld shared cache. + +- ArchSpec header_arch; +- GetArchitecture(header_arch); ++ ArchSpec header_arch = GetArchitecture(); + char dsc_path[PATH_MAX]; + char dsc_path_development[PATH_MAX]; + +@@ -3494,7 +3493,7 @@ + N_FUN_addr_to_sym_idx.equal_range(nlist.n_value); + if (range.first != range.second) { + bool found_it = false; +- for (const auto pos = range.first; ++ for (ValueToSymbolIndexMap::const_iterator pos = range.first; + pos != range.second; ++pos) { + if (sym[sym_idx].GetMangled().GetName( + lldb::eLanguageTypeUnknown, +@@ -3539,7 +3538,7 @@ + nlist.n_value); + if (range.first != range.second) { + bool found_it = false; +- for (const auto pos = range.first; ++ for (ValueToSymbolIndexMap::const_iterator pos = range.first; + pos != range.second; ++pos) { + if (sym[sym_idx].GetMangled().GetName( + lldb::eLanguageTypeUnknown, +diff -ur llvm-project-apple-stable-20191106/lldb/source/Symbol/ClangASTContext.cpp llvm-project-apple-stable-20191106+iOS/lldb/source/Symbol/ClangASTContext.cpp +--- llvm-project-apple-stable-20191106/lldb/source/Symbol/ClangASTContext.cpp 2019-12-03 19:28:47.000000000 -1000 ++++ llvm-project-apple-stable-20191106+iOS/lldb/source/Symbol/ClangASTContext.cpp 2019-12-05 23:15:15.000000000 -1000 +@@ -8489,6 +8489,7 @@ + ? class_interface_decl->lookupInstanceMethod(getter_sel) + : class_interface_decl->lookupClassMethod(getter_sel))) { + const bool isVariadic = false; ++ const bool isPropertyAccessor = false; + const bool isSynthesized = false; + const bool isImplicitlyDeclared = true; + const bool isDefined = false; +@@ -8499,7 +8500,7 @@ + clang::ObjCMethodDecl *getter = clang::ObjCMethodDecl::Create( + *clang_ast, clang::SourceLocation(), clang::SourceLocation(), + getter_sel, ClangUtil::GetQualType(property_clang_type_to_access), +- nullptr, class_interface_decl, isInstance, isVariadic, ++ nullptr, class_interface_decl, isInstance, isVariadic, isPropertyAccessor, + isSynthesized, isImplicitlyDeclared, isDefined, impControl, + HasRelatedResultType); + +@@ -8521,6 +8522,7 @@ + : class_interface_decl->lookupClassMethod(setter_sel))) { + clang::QualType result_type = clang_ast->VoidTy; + const bool isVariadic = false; ++ const bool isPropertyAccessor = false; + const bool isSynthesized = false; + const bool isImplicitlyDeclared = true; + const bool isDefined = false; +@@ -8531,7 +8533,7 @@ + clang::ObjCMethodDecl *setter = clang::ObjCMethodDecl::Create( + *clang_ast, clang::SourceLocation(), clang::SourceLocation(), + setter_sel, result_type, nullptr, class_interface_decl, +- isInstance, isVariadic, isSynthesized, isImplicitlyDeclared, ++ isInstance, isVariadic, isPropertyAccessor, isSynthesized, isImplicitlyDeclared, + isDefined, impControl, HasRelatedResultType); + + if (setter && metadata) +@@ -8634,6 +8636,7 @@ + if (!method_function_prototype) + return nullptr; + ++ bool isPropertyAccessor = false; + bool is_synthesized = false; + bool is_defined = false; + clang::ObjCMethodDecl::ImplementationControl imp_control = +@@ -8653,7 +8656,7 @@ + nullptr, // TypeSourceInfo *ResultTInfo, + ClangASTContext::GetASTContext(ast)->GetDeclContextForType( + ClangUtil::GetQualType(type)), +- name[0] == '-', is_variadic, is_synthesized, ++ name[0] == '-', is_variadic, isPropertyAccessor, is_synthesized, + true, // is_implicitly_declared; we force this to true because we don't + // have source locations + is_defined, imp_control, false /*has_related_result_type*/); -- cgit v1.2.3