From fcfb13f8442d09d1f569b3ba4ca7840970102513 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 7 Nov 2016 17:09:44 +0300
Subject: [PATCH] disable emulation for native methods

---
 .../debugger/ui/breakpoints/MethodBreakpoint.java     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
index 1b9b6dc3a0a5..a255abf10ab0 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
@@ -49,7 +49,6 @@ import com.intellij.openapi.util.JDOMExternalizerUtil;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.psi.*;
-import com.intellij.ui.AppUIUtil;
 import com.intellij.util.StringBuilderSpinAllocator;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
@@ -157,7 +156,8 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
       () -> processSubTypes(baseType, subType -> createRequestForPreparedClassEmulated(debugProcess, subType, false), indicator),
       indicator);
     if (indicator.isCanceled()) {
-      AppUIUtil.invokeOnEdt(() -> DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().removeBreakpoint(this));
+      ApplicationManager.getApplication().invokeLater(
+        () -> DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().removeBreakpoint(this));
     }
   }
 
@@ -179,6 +179,13 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
         }
       }
       if (method != null) {
+        if (method.isNative()) {
+          ApplicationManager.getApplication().invokeLater(() -> {
+            getProperties().EMULATED = false;
+            fireBreakpointChanged();
+          });
+          return;
+        }
         Method target = MethodBytecodeUtil.getBridgeTargetMethod(method);
         if (target != null && !DebuggerUtilsEx.allLineLocations(target).isEmpty()) {
           method = target;