Assign bytecode offset to BrOnException when modifying IR for TryFinally

Author: Cellule

lib/Backend/FlowGraph.cpp

@@ -317,7 +317,9 @@ FlowGraph::Build(void)
 
             Assert(leaveTarget->labelRefs.HasOne());
             IR::BranchInstr * brOnException = IR::BranchInstr::New(Js::OpCode::BrOnException, finallyLabel, instr->m_func);
-            leaveTarget->labelRefs.Head()->InsertBefore(brOnException);
+            IR::BranchInstr * leaveInstr = leaveTarget->labelRefs.Head();
+            brOnException->SetByteCodeOffset(leaveInstr);
+            leaveInstr->InsertBefore(brOnException);
 
             instrPrev = instr->m_prev;
         }

lib/Backend/IR.cpp

@@ -2715,7 +2715,10 @@ Instr::GetNextByteCodeInstr() const
         {
             IR::BranchInstr* branchInstr = nextInstr->AsBranchInstr();
             AssertMsg(branchInstr->IsUnconditional(), "We can't know which branch to take on a conditionnal branch");
-            return branchInstr->GetTarget();
+            if (branchInstr->IsUnconditional())
+            {
+                return branchInstr->GetTarget();
+            }
         }
         return nextInstr->GetNextRealInstrOrLabel();
     };