Skip to content

[mtouch] Fix NRE when optimizing bindings. Fixes #44701 #900

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

Merged
spouliot merged 1 commit into from
Sep 27, 2016
Merged

[mtouch] Fix NRE when optimizing bindings. Fixes #44701 #900

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
3 changes: 3 additions & 0 deletions tools/linker/MonoTouch.Tuner/OptimizeGeneratedCodeSubStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ static void ProcessIsDirectBinding (MethodDefinition caller, Instruction ins)
Nop (ins); // ldfld MonoTouch.Foundation.IsDirectBinding
Instruction next = ins.Next; // brfalse IL_x (SuperHandle processing)
Instruction end = null;
// unoptimized compiled code can produce a (unneeeded) store/load combo, leave it there
while (next.OpCode.FlowControl != FlowControl.Cond_Branch)
next = next.Next; // leave the code there (the JIT/AOT will deal with it)
ins = (next.Operand as Instruction).Previous; // br end (ret)
if (ins.OpCode.Code == Code.Ret) { // if there's not branch but it returns immediately then do not remove the 'ret' instruction
ins = ins.Next;
Expand Down