Skip to content

Commit d92040a

Browse files
authored
Merge pull request #8690 from Michael137/lldb/tc/build-bot-fixes-to-next
[lldb][Type Completion] Remove a few XFAILs and an assert related to redecl-completion
2 parents 1a282c6 + 5d486ab commit d92040a

File tree

4 files changed

+2
-5
lines changed

4 files changed

+2
-5
lines changed

lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9170,7 +9170,8 @@ static void ConnectRedeclToPrev(TypeSystemClang &ts, T *prev, T *redecl) {
91709170
// decl.
91719171
ts.GetTypeForDecl(redecl);
91729172
// The previous decl and the redeclaration both declare the same type.
9173-
assert(prev->getTypeForDecl() == redecl->getTypeForDecl());
9173+
// FIXME: rdar://123500660, this is causing large number of test failures.
9174+
// assert(prev->getTypeForDecl() == redecl->getTypeForDecl());
91749175
}
91759176

91769177
/// Returns the ClangModuleID for the given declaration.

lldb/test/API/functionalities/limit-debug-info/TestLimitDebugInfo.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ def _check_incomplete_frame_variable_output(self):
183183
for command, expect_items in command_expect_pairs:
184184
self.expect(command, substrs=expect_items)
185185

186-
@expectedFailureAll(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
187186
@skipIf(bugnumber="pr46284", debug_info="gmodules")
188187
@skipIfWindows # Clang emits type info even with -flimit-debug-info
189188
# Requires DW_CC_pass_by_* attributes from Clang 7 to correctly call

lldb/test/API/lang/c/shared_lib/TestSharedLib.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,10 @@ def common_test_expr(self, preload_symbols):
2727

2828
self.expect("expression GetMeASubFoo(my_foo_ptr)", startstr="(sub_foo *) $")
2929

30-
@expectedFailureAll(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
3130
def test_expr(self):
3231
"""Test that types work when defined in a shared library and forward-declared in the main executable"""
3332
self.common_test_expr(True)
3433

35-
@expectedFailureAll(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
3634
def test_expr_no_preload(self):
3735
"""Test that types work when defined in a shared library and forward-declared in the main executable, but with preloading disabled"""
3836
self.common_test_expr(False)

lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010

1111
class SharedLibStrippedTestCase(TestBase):
12-
@expectedFailureAll(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
1312
@expectedFailureAll(oslist=["windows"])
1413
def test_expr(self):
1514
"""Test that types work when defined in a shared library and forwa/d-declared in the main executable"""

0 commit comments

Comments
 (0)