Skip to content

Fix imp_getBlock/imp_removeBlock for struct-return block IMPs #390

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
DTW-Thalion wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −2
Open

Fix imp_getBlock/imp_removeBlock for struct-return block IMPs #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions Test/BlockImpTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ int main(void)
struct big b = {1, 2, 3, 4, 5};
return b;
};
blk = Block_copy((blk));
imp = imp_implementationWithBlock(blk);
assert(imp && "Can't make sret IMP");
// imp_getBlock / imp_removeBlock must also work for struct-return blocks.
assert(imp_getBlock(imp) == blk);
type = block_copyIMPTypeEncoding_np(blk);
assert(NULL != type);
class_addMethod((objc_getMetaClass("Foo")), @selector(sret), imp, type);
Expand All @@ -62,5 +65,7 @@ int main(void)
assert(s.c == 3);
assert(s.d == 4);
assert(s.e == 5);
imp_removeBlock(imp);
assert(imp_getBlock(imp) != blk);
return 0;
}
4 changes: 2 additions & 2 deletions block_to_imp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ id imp_getBlock(IMP anImp)
if (idx == -1)
{
set = sret_trampolines;
indexForIMP(anImp, &set);
idx = indexForIMP(anImp, &set);
}
if (idx == -1)
{
Expand All @@ -390,7 +390,7 @@ BOOL imp_removeBlock(IMP anImp)
if (idx == -1)
{
set = sret_trampolines;
indexForIMP(anImp, &set);
idx = indexForIMP(anImp, &set);
}
if (idx == -1)
{
Expand Down
Loading