Fix problem in bridged field instance references

Author: emmanue1

src/main/java/org/jd/core/v1/model/javasyntax/expression/ObjectTypeReferenceExpression.java

@@ -55,6 +55,10 @@ public boolean isExplicit() {
         return explicit;
     }
 
+    public void setExplicit(boolean explicit) {
+        this.explicit = explicit;
+    }
+
     @Override
     public int getPriority() {
         return 0;

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java

@@ -7,6 +7,7 @@
 
 package org.jd.core.v1.service.converter.classfiletojavasyntax.util;
 
+import org.jd.core.v1.api.printer.Printer;
 import org.jd.core.v1.model.classfile.ClassFile;
 import org.jd.core.v1.model.classfile.ConstantPool;
 import org.jd.core.v1.model.classfile.Method;
@@ -76,6 +77,7 @@ public void parse(BasicBlock basicBlock, Statements statements, DefaultStack<Exp
         Method method = cfg.getMethod();
         ConstantPool constants = method.getConstants();
         byte[] code = method.<AttributeCode>getAttribute("Code").getCode();
+        boolean syntheticFlag = (method.getAccessFlags() & FLAG_SYNTHETIC) != 0;
 
         Expression indexRef, arrayRef, valueRef, expression1, expression2, expression3;
         Type type1, type2, type3;
@@ -88,7 +90,7 @@ public void parse(BasicBlock basicBlock, Statements statements, DefaultStack<Exp
 
         for (int offset=fromOffset; offset<toOffset; offset++) {
             int opcode = code[offset] & 255;
-            int lineNumber = cfg.getLineNumber(offset);
+            int lineNumber = syntheticFlag ? Printer.UNKNOWN_LINE_NUMBER : cfg.getLineNumber(offset);
 
             switch (opcode) {
                 case 0: // NOP

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/UpdateBridgeMethodVisitor.java

@@ -98,7 +98,7 @@ protected Expression updateExpression(Expression expression) {
         int parameterTypesCount = (parameterTypes == null) ? 0 : parameterTypes.size();
 
         if (expClass == FieldReferenceExpression.class) {
-            FieldReferenceExpression fre = (FieldReferenceExpression) exp;
+            FieldReferenceExpression fre = getFieldReferenceExpression(exp);
 
             expression = (parameterTypesCount == 0) ? fre.getExpression() : mie1.getParameters().getFirst();
 
@@ -133,7 +133,7 @@ protected Expression updateExpression(Expression expression) {
             }
         } else if (expClass == BinaryOperatorExpression.class) {
             BinaryOperatorExpression boe = (BinaryOperatorExpression) exp;
-            FieldReferenceExpression fre = (FieldReferenceExpression) boe.getLeftExpression();
+            FieldReferenceExpression fre = getFieldReferenceExpression(boe.getLeftExpression());
 
             if (parameterTypesCount == 1) {
                 return new BinaryOperatorExpression(
@@ -154,7 +154,7 @@ protected Expression updateExpression(Expression expression) {
             }
         } else if (expClass == PostOperatorExpression.class) {
             PostOperatorExpression poe = (PostOperatorExpression)exp;
-            FieldReferenceExpression fre = (FieldReferenceExpression) poe.getExpression();
+            FieldReferenceExpression fre = getFieldReferenceExpression(poe.getExpression());
 
             expression = (parameterTypesCount == 0) ? fre.getExpression() : mie1.getParameters().getFirst();
 
@@ -164,7 +164,7 @@ protected Expression updateExpression(Expression expression) {
                     poe.getOperator());
         } else if (expClass == PreOperatorExpression.class) {
             PreOperatorExpression poe = (PreOperatorExpression)exp;
-            FieldReferenceExpression fre = (FieldReferenceExpression) poe.getExpression();
+            FieldReferenceExpression fre = getFieldReferenceExpression(poe.getExpression());
 
             expression = (parameterTypesCount == 0) ? fre.getExpression() : mie1.getParameters().getFirst();
 
@@ -179,6 +179,16 @@ protected Expression updateExpression(Expression expression) {
         return expression;
     }
 
+    protected static FieldReferenceExpression getFieldReferenceExpression(Expression expression) {
+        FieldReferenceExpression fre = (FieldReferenceExpression) expression;
+
+        if (fre.getExpression().getClass() == ObjectTypeReferenceExpression.class) {
+            ((ObjectTypeReferenceExpression)fre.getExpression()).setExplicit(true);
+        }
+
+        return fre;
+    }
+
     protected class BodyDeclarationsVisitor extends AbstractJavaSyntaxVisitor {
         protected HashMap<String, ClassFileMethodDeclaration> map = null;