Skip to content

Commit 2895d0c

Browse files
authored
Merge pull request #2777 from apple/lazily-named-classes
Fix Objective-C runtime code on Catalina and re-enable tests
2 parents 098b8a5 + 68c9ce8 commit 2895d0c

File tree

8 files changed

+5
-14
lines changed

8 files changed

+5
-14
lines changed

lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ __lldb_apple_objc_v2_get_dynamic_class_info2(void *gdb_objc_realized_classes_ptr
200200
201201
uint32_t count = 0;
202202
Class* realized_class_list = objc_copyRealizedClassList(&count);
203+
DEBUG_PRINTF ("count = %u\n", count);
203204
204205
uint32_t idx = 0;
205206
for (uint32_t i=0; i<=count; ++i)
@@ -208,6 +209,8 @@ __lldb_apple_objc_v2_get_dynamic_class_info2(void *gdb_objc_realized_classes_ptr
208209
{
209210
Class isa = realized_class_list[i];
210211
const char *name_ptr = objc_debug_class_getNameRaw(isa);
212+
if (name_ptr == NULL)
213+
continue;
211214
const char *s = name_ptr;
212215
uint32_t h = 5381;
213216
for (unsigned char c = *s; c; c = *++s)

lldb/test/API/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
from lldbsuite.test.decorators import *
33

44
lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest, skipUnlessDarwin,
5-
expectedFailureAll(archs=['arm64_32'], bugnumber="<rdar://problem/58065423>"),
6-
skipIf(bugnumber='rdar://76105456', oslist=['macosx'])])
5+
expectedFailureAll(archs=['arm64_32'], bugnumber="<rdar://problem/58065423>")])
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import lldbsuite.test.lldbinline as lldbinline
22
from lldbsuite.test.decorators import *
33

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

lldb/test/API/lang/swift/swiftieformatting/TestSwiftieFormatting.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ def setUp(self):
2929

3030
@skipUnlessDarwin
3131
@swiftTest
32-
@skipIf(bugnumber='rdar://76105456', oslist=['macosx'])
3332
def test_swiftie_formatting(self):
3433
"""Test that data formatters honor Swift conventions"""
3534
self.build()

lldb/test/Shell/SwiftREPL/DictBridging.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Test formatters on bridged dictionaries in the REPL.
33
// REQUIRES: system-darwin
44
// REQUIRES: swift
5-
// REQUIRES: rdar73216083
65

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

lldb/test/Shell/SwiftREPL/ResilientArray.test

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33

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

6-
// rdar://76105456
7-
// REQUIRES: radar76105456
8-
96
import Foundation
107

118
let x : [URL] = [URL(string: "https://github.com")!, URL(string: "https://apple.com")!]

lldb/test/Shell/SwiftREPL/ResilientDict.test

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33

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

6-
// rdar://76105456
7-
// REQUIRES: radar76105456
8-
96
// The dictionary order isn't deterministic, so print the dictionary
107
// once per element.
118

lldb/test/Shell/SwiftREPL/SetBridging.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Test formatters on bridged sets in the REPL.
33
// REQUIRES: system-darwin
44
// REQUIRES: swift
5-
// REQUIRES: rdar73216234
65

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

0 commit comments

Comments
 (0)