Fix incorrect merge

Author: Adam Hrbac

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -1072,6 +1072,12 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
         Object[] arguments = virtualFrame.getArguments();
         Object globals = PArguments.getGlobals(arguments);
         Object locals = PArguments.getSpecialArgument(arguments);
+
+        boolean isGeneratorOrCoroutine = co.isGeneratorOrCoroutine();
+        if (inCompiledCode && !isGeneratorOrCoroutine) {
+            unboxVariables(localFrame);
+        }
+
         final PythonLanguage language;
         if (cachedLanguage == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -2162,7 +2168,7 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
                     }
                 }
 
-                int targetIndex = findHandler(bci);
+                int targetIndex = findHandler(beginBci);
                 CompilerAsserts.partialEvaluationConstant(targetIndex);
                 if (pe != null) {
                     if (mutableData.localException != null) {