Skip to content

Revert "[IRGen] Fix SyncCallEmission::emitCallToUnmappedExplosion crash" #73965

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+3 −62
Open

Revert "[IRGen] Fix SyncCallEmission::emitCallToUnmappedExplosion crash" #73965

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
e8b1b34
Revert "[IRGen] Fix `SyncCallEmission::emitCallToUnmappedExplosion` c…
ahatanaka May 29, 2024
500a6ea
Revert "Fix a test that was failing on 32-bit platforms (#73820)"
ahatanaka May 29, 2024
d70fed8
Revert "[cxx-interop][IRGen] Do not pass a foreign reference type to …
ahatanaka May 29, 2024
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
17 changes: 3 additions & 14 deletions lib/IRGen/GenCall.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <optional>

#include "CallEmission.h"
#include "ClassTypeInfo.h"
#include "EntryPointArgumentEmission.h"
#include "Explosion.h"
#include "GenCall.h"
Expand Down Expand Up @@ -2613,19 +2612,9 @@ class SyncCallEmission final : public CallEmission {
if (fnConv.getNumDirectSILResults() == 1
&& (fnConv.getDirectSILResults().begin()->getConvention()
== ResultConvention::Autoreleased)) {
if (IGF.IGM.Context.LangOpts.EnableObjCInterop) {
auto ty = fnConv.getSILResultType(IGF.IGM.getMaximalTypeExpansionContext());
// NOTE: We cannot dyn_cast directly to ClassTypeInfo since it does not
// implement 'classof', so will succeed for any ReferenceTypeInfo.
auto *refTypeInfo = dyn_cast<ReferenceTypeInfo>(&IGF.IGM.getTypeInfo(ty));
if (refTypeInfo &&
refTypeInfo->getReferenceCountingType() == ReferenceCounting::Custom) {
Explosion e(result);
refTypeInfo->as<ClassTypeInfo>().strongCustomRetain(IGF, e, true);
} else {
result = emitObjCRetainAutoreleasedReturnValue(IGF, result);
}
} else
if (IGF.IGM.Context.LangOpts.EnableObjCInterop)
result = emitObjCRetainAutoreleasedReturnValue(IGF, result);
else
IGF.emitNativeStrongRetain(result, IGF.getDefaultAtomicity());
}

Expand Down
6 changes: 0 additions & 6 deletions test/Interop/Cxx/foreign-reference/Inputs/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ module ReferenceCounted {
requires cplusplus
}

module ReferenceCountedObjCProperty {
header "reference-counted-objc-property.h"
requires cplusplus
export *
}

module MemberLayout {
header "member-layout.h"
requires cplusplus
Expand Down
15 changes: 0 additions & 15 deletions test/Interop/Cxx/foreign-reference/Inputs/reference-counted-objc-property.h
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions test/Interop/Cxx/foreign-reference/reference-counted-objc-property.swift
View file
Open in desktop

This file was deleted.