From 6ad9deac2abff091c7a25f5798bf4b2421c2b208 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Wed, 4 Jul 2018 15:42:20 +0300
Subject: [PATCH] fixes for IDEA-CR-34442

---
 .../com/intellij/debugger/jdi/MethodBytecodeUtil.java    | 9 ++-------
 .../ui/breakpoints/WildcardMethodBreakpoint.java         | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java b/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java
index 8c19601e74f2..36c7bb99d8f9 100644
--- a/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java
+++ b/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java
@@ -31,13 +31,11 @@ public class MethodBytecodeUtil {
    * Allows to use ASM MethodVisitor with jdi method bytecode
    */
   public static void visit(Method method, MethodVisitor methodVisitor, boolean withLineNumbers) {
-    if (method.virtualMachine().canGetBytecodes()) {
-      visit(method, method.bytecodes(), methodVisitor, withLineNumbers);
-    }
+    visit(method, method.bytecodes(), methodVisitor, withLineNumbers);
   }
 
   public static void visit(Method method, long maxOffset, MethodVisitor methodVisitor, boolean withLineNumbers) {
-    if (maxOffset > 0 && method.virtualMachine().canGetBytecodes()) {
+    if (maxOffset > 0) {
       // need to keep the size, otherwise labels array will not be initialized correctly
       byte[] originalBytecodes = method.bytecodes();
       byte[] bytecodes = originalBytecodes;
@@ -65,9 +63,6 @@ public class MethodBytecodeUtil {
   }
 
   private static void visit(Method method, byte[] bytecodes, MethodVisitor methodVisitor, boolean withLineNumbers) {
-    if (!method.virtualMachine().canGetConstantPool()) {
-      return;
-    }
     ReferenceType type = method.declaringType();
     try {
       byte[] constantPool = getConstantPool(type);
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java
index d8dd396cb1e7..c8fca65afa9c 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java
@@ -122,6 +122,7 @@ public class WildcardMethodBreakpoint extends Breakpoint<JavaMethodBreakpointPro
       VirtualMachineProxyImpl virtualMachineProxy = debugProcess.getVirtualMachineProxy();
       if (!virtualMachineProxy.canGetBytecodes() || !virtualMachineProxy.canGetConstantPool()) {
         disableEmulation();
+        return;
       }
       debugProcess.getRequestsManager().callbackOnPrepareClasses(this, getClassPattern());