diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
index aae08dbc0565..2287bcd03df2 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
@@ -48,6 +48,7 @@ import java.util.Map;
 import static com.intellij.openapi.util.Pair.pair;
 import static com.intellij.psi.CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION;
 import static com.intellij.psi.CommonClassNames.JAVA_LANG_STRING;
+import static com.intellij.psi.impl.compiled.ClsFileImpl.EMPTY_ATTRIBUTES;
 
 /**
  * @author max
@@ -749,7 +750,7 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
               mapping.put(name, pair(outerName, innerName));
             }
           }
-        }, ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);
+        }, EMPTY_ATTRIBUTES, ClassReader.SKIP_DEBUG | ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);
 
         if (!mapping.isEmpty()) {
           return mapping;
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitFieldsFileIndex.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitFieldsFileIndex.java
index 5e9ad0a497b5..e245f2fc4243 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitFieldsFileIndex.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitFieldsFileIndex.java
@@ -38,6 +38,7 @@ import java.io.IOException;
 import java.text.StringCharacterIterator;
 import java.util.Collection;
 
+import static com.intellij.psi.impl.compiled.ClsFileImpl.EMPTY_ATTRIBUTES;
 import static com.intellij.util.io.DataInputOutputUtil.readINT;
 import static com.intellij.util.io.DataInputOutputUtil.writeINT;
 import static com.intellij.util.io.IOUtil.readUTF;
@@ -173,7 +174,7 @@ public class GroovyTraitFieldsFileIndex
         String raw = Type.getType(desc).getClassName();
         return StubBuildingVisitor.GUESSING_MAPPER.fun(raw);
       }
-    }, ClassReader.SKIP_CODE);
+    }, EMPTY_ATTRIBUTES, ClassReader.SKIP_CODE);
 
     return values;
   }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitMethodsFileIndex.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitMethodsFileIndex.java
index 4354e1eafeb0..2e675e43570f 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitMethodsFileIndex.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitMethodsFileIndex.java
@@ -41,6 +41,7 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import static com.intellij.psi.impl.compiled.ClsFileImpl.EMPTY_ATTRIBUTES;
 import static org.jetbrains.org.objectweb.asm.Opcodes.ACC_STATIC;
 import static org.jetbrains.org.objectweb.asm.Opcodes.ACC_SYNTHETIC;
 
@@ -102,7 +103,7 @@ public class GroovyTraitMethodsFileIndex extends SingleEntryFileBasedIndexExtens
   private static PsiJavaFileStub index(VirtualFile file, byte[] content) {
     try {
       PsiJavaFileStub root = new PsiJavaFileStubImpl(StringUtilRt.EMPTY_STRING, true);
-      new ClassReader(content).accept(new GrTraitMethodVisitor(file, root), ClassReader.SKIP_CODE);
+      new ClassReader(content).accept(new GrTraitMethodVisitor(file, root), EMPTY_ATTRIBUTES, ClassReader.SKIP_CODE);
       return root;
     }
     catch (Exception e) {