Merge pull request #77303 from drexin/wip-138917831-6.0

drexin · web-flow · commit d85933b11e8e · 2024-10-30T16:51:42.000-07:00
[6.0][Tests] Fix Interpreter/layout_string_witnesses_objc.swift
diff --git a/test/Interpreter/layout_string_witnesses_objc.swift b/test/Interpreter/layout_string_witnesses_objc.swift
@@ -64,7 +64,7 @@ struct MultiPayloadObjCExistentialWrapper {
 }
 
 func testMultiPayloadObjCExistentialWrapper() {
-    let ptr = allocateInternalGenericPtr(of: NestedWrapper<MultiPayloadObjCExistentialWrapper>.self)
+    let ptr = allocateInternalGenericPtr(of: MultiPayloadObjCExistentialWrapper.self)
 
     do {
         let x = MultiPayloadObjCExistentialWrapper(x: .y(ObjCPrintOnDealloc()))
@@ -84,7 +84,7 @@ func testMultiPayloadObjCExistentialWrapper() {
     print("Before deinit")
 
     // CHECK-NEXT: ObjCPrintOnDealloc deinitialized!
-    testGenericDestroy(ptr, of: NestedWrapper<MultiPayloadObjCExistentialWrapper>.self)
+    testGenericDestroy(ptr, of: MultiPayloadObjCExistentialWrapper.self)
 
     ptr.deallocate()
 }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ struct MultiPayloadObjCExistentialWrapper {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func testMultiPayloadObjCExistentialWrapper() {`
`67`		`- let ptr = allocateInternalGenericPtr(of: NestedWrapper<MultiPayloadObjCExistentialWrapper>.self)`
	`67`	`+ let ptr = allocateInternalGenericPtr(of: MultiPayloadObjCExistentialWrapper.self)`
`68`	`68`
`69`	`69`	`do {`
`70`	`70`	`let x = MultiPayloadObjCExistentialWrapper(x: .y(ObjCPrintOnDealloc()))`
`@@ -84,7 +84,7 @@ func testMultiPayloadObjCExistentialWrapper() {`
`84`	`84`	`print("Before deinit")`
`85`	`85`
`86`	`86`	`// CHECK-NEXT: ObjCPrintOnDealloc deinitialized!`
`87`		`- testGenericDestroy(ptr, of: NestedWrapper<MultiPayloadObjCExistentialWrapper>.self)`
	`87`	`+ testGenericDestroy(ptr, of: MultiPayloadObjCExistentialWrapper.self)`
`88`	`88`
`89`	`89`	`ptr.deallocate()`
`90`	`90`	`}`