[OSLog] Update compiler stubs and tests #34100
Conversation
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test |
|
Build failed |
| public static var sensitive: OSLogPrivacy { | ||
| OSLogPrivacy(privacy: .sensitive, mask: .none) | ||
| } | ||
|
|
There was a problem hiding this comment.
I think we can remove the sensitive options. This property declaration and the following static function declaration: sensitive(mask:) and all references to it.
|
|
||
| @_semantics("test_driver") | ||
| func intValueWithPrivacyTest() -> OSLogMessage { | ||
| return "An integer value \(10, privacy: .sensitive(mask: .hash))" |
There was a problem hiding this comment.
This test is good to have. Thanks for adding it. We can change .sensitive here by .private.
| @@ -157,18 +154,30 @@ func testNSObjectInterpolation(nsArray: NSArray) { | |||
| // CHECK-NEXT: [[OFFSET3:%.+]] = getelementptr inbounds i8, i8* [[BUFFER]], i{{.*}} 3 | |||
| // CHECK-64-NEXT: store i8 8, i8* [[OFFSET3]], align 1 | |||
| // CHECK-32-NEXT: store i8 4, i8* [[OFFSET3]], align 1 | |||
| // CHECK-NEXT: tail call void @llvm.objc.release | |||
| // DOESN'T HAPPEN: tail call void @llvm.objc.release | |||
There was a problem hiding this comment.
Feel free to delete the "Doesn't happen" line
|
|
||
| // CHECK-64-NEXT: tail call swiftcc void @"${{.*}}_os_log_impl_test{{.*}}"({{.*}}, {{.*}}, {{.*}}, {{.*}}, i8* getelementptr inbounds ([20 x i8], [20 x i8]* @{{.*}}, i64 0, i64 0), i8* {{(nonnull )?}}[[BUFFER]], i32 12) | ||
| // CHECK-32-NEXT: tail call swiftcc void @"${{.*}}_os_log_impl_test{{.*}}"({{.*}}, {{.*}}, {{.*}}, {{.*}}, i8* getelementptr inbounds ([20 x i8], [20 x i8]* @{{.*}}, i32 0, i32 0), i8* {{(nonnull )?}}[[BUFFER]], i32 8) | ||
| // CHECK-NEXT: [[BITCASTED_OBJ_STORAGE:%.+]] = bitcast i8* [[OBJ_STORAGE]] to %swift.opaque* | ||
| // CHECK-NEXT: tail call void @swift_arrayDestroy(%swift.opaque* [[BITCASTED_OBJ_STORAGE]], i64 1 |
There was a problem hiding this comment.
Does this SIL instruction use i64 even on 32 bit platforms? You can omit the i64 and the rest if that is not the case.
| // CHECK-32: [[BUFFER:%.+]] = tail call noalias i8* @swift_slowAlloc(i{{.*}} 8 | ||
| // CHECK-64-NEXT: [[STR_STORAGE:%.+]] = tail call noalias i8* @swift_slowAlloc(i{{.*}} 32 | ||
| // CHECK-32-NEXT: [[STR_STORAGE:%.+]] = tail call noalias i8* @swift_slowAlloc(i{{.*}} 16 | ||
| // CHECK: call void @llvm.lifetime.start{{.*}}({{.*}}, i8* {{(nonnull )?}}[[STR_STORAGE_PTR:%.*]] |
There was a problem hiding this comment.
I wonder what STR_STORAGE_PTR corresponds to. It doesn't quite correspond to the unsafe storage buffers we are creating. Is this SILValue derived from the input argument %0 in the actual SIL?
There was a problem hiding this comment.
I believe it corresponds to the unsafe storage buffer but the SIL there is a little bit complicated so I may be interpreting it incorrectly. It goes something like:
%2 = alloca i64, align 8
..
%12 = tail call noalias i8* @swift_slowAlloc(i64 32, i64 -1) #5 // String storage buffer
%13 = ptrtoint i8* %12 to i64
%14 = bitcast i64* %2 to i8*
call void @llvm.lifetime.start.p0i8(i64 8, i8* nonnull %14)
store i64 %13, i64* %2, align 8
What this looks like to me is an indirect way of tracking the lifetime of a pointer to the storage buffer.
There was a problem hiding this comment.
Thanks for clarifying it.
| // CHECK-NEXT: [[OFFSET3:%.+]] = getelementptr inbounds i8, i8* [[BUFFER]], i{{.*}} 3 | ||
| // CHECK-NEXT: store i8 8, i8* [[OFFSET3]], align 1 | ||
|
|
||
| // CHECK: [[STR_POINTER:%.*]] = call swiftcc i8* @"${{.*}}getNullTerminatedUTF8Pointer{{.*}}"(i{{.*}} %0, {{.*}} %1 |
There was a problem hiding this comment.
It is also good to check that STR_POINTER is stored into the [[BUFFER]] at the right offset.
|
@swift-ci please test |
1 similar comment
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test |
|
Build failed |
The compiler stubs for testing the OSLog implementation are in need of an update. This change updates the stubs to be consistent with the current OSLog implementation, updates the existing tests, and adds new tests for String and metatype interpolations. rdar://69719729
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test Linux Platform |
|
Build failed |
|
@swift-ci Please smoke test Linux Platform |
|
@swift-ci please smoke test |
The compiler stubs for testing the OSLog implementation are in need of an update. This change updates the stubs to be consistent with the current OSLog implementation, updates the existing tests, and adds new tests for String and metatype interpolations.
rdar://69719729