Skip to content

Fix Objective-C runtime code on Catalina and re-enable tests #2777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 5, 2021
Merged

Fix Objective-C runtime code on Catalina and re-enable tests #2777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e69a5b
Revert "XFAIL failing lldb tests"
JDevlieghere Apr 2, 2021
e4dea3b
[lldb] Re-enable {Set|Dict}Bridging.test
JDevlieghere Apr 2, 2021
68c9ce8
[lldb] Account for objc_debug_class_getNameRaw returning NULL
JDevlieghere Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ __lldb_apple_objc_v2_get_dynamic_class_info2(void *gdb_objc_realized_classes_ptr

uint32_t count = 0;
Class* realized_class_list = objc_copyRealizedClassList(&count);
DEBUG_PRINTF ("count = %u\n", count);

uint32_t idx = 0;
for (uint32_t i=0; i<=count; ++i)
Expand All @@ -208,6 +209,8 @@ __lldb_apple_objc_v2_get_dynamic_class_info2(void *gdb_objc_realized_classes_ptr
{
Class isa = realized_class_list[i];
const char *name_ptr = objc_debug_class_getNameRaw(isa);
if (name_ptr == NULL)
continue;
const char *s = name_ptr;
uint32_t h = 5381;
for (unsigned char c = *s; c; c = *++s)
Expand Down
3 changes: 1 addition & 2 deletions lldb/test/API/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
from lldbsuite.test.decorators import *

lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest, skipUnlessDarwin,
expectedFailureAll(archs=['arm64_32'], bugnumber="<rdar://problem/58065423>"),
skipIf(bugnumber='rdar://76105456', oslist=['macosx'])])
expectedFailureAll(archs=['arm64_32'], bugnumber="<rdar://problem/58065423>")])
4 changes: 1 addition & 3 deletions lldb/test/API/lang/swift/generic_objcclasswrapper/TestGenericObjcClassWrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import lldbsuite.test.lldbinline as lldbinline
from lldbsuite.test.decorators import *

lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest, skipUnlessDarwin,
skipIf(bugnumber='rdar://76105456', oslist=['macosx'])])

lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest, skipUnlessDarwin])
1 change: 0 additions & 1 deletion lldb/test/API/lang/swift/swiftieformatting/TestSwiftieFormatting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def setUp(self):

@skipUnlessDarwin
@swiftTest
@skipIf(bugnumber='rdar://76105456', oslist=['macosx'])
def test_swiftie_formatting(self):
"""Test that data formatters honor Swift conventions"""
self.build()
Expand Down
1 change: 0 additions & 1 deletion lldb/test/Shell/SwiftREPL/DictBridging.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Test formatters on bridged dictionaries in the REPL.
// REQUIRES: system-darwin
// REQUIRES: swift
// REQUIRES: rdar73216083

// RUN: %lldb --repl < %s | FileCheck %s --check-prefix=DICT

Expand Down
3 changes: 0 additions & 3 deletions lldb/test/Shell/SwiftREPL/ResilientArray.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

// RUN: %lldb --repl < %s | FileCheck %s

// rdar://76105456
// REQUIRES: radar76105456

import Foundation

let x : [URL] = [URL(string: "https://github.com")!, URL(string: "https://apple.com")!]
Expand Down
3 changes: 0 additions & 3 deletions lldb/test/Shell/SwiftREPL/ResilientDict.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

// RUN: %lldb --repl < %s | FileCheck %s --check-prefix=DICT

// rdar://76105456
// REQUIRES: radar76105456

// The dictionary order isn't deterministic, so print the dictionary
// once per element.

Expand Down
1 change: 0 additions & 1 deletion lldb/test/Shell/SwiftREPL/SetBridging.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Test formatters on bridged sets in the REPL.
// REQUIRES: system-darwin
// REQUIRES: swift
// REQUIRES: rdar73216234

// RUN: %lldb --repl < %s | FileCheck %s --check-prefix=SET

Expand Down