diff options
Diffstat (limited to 'org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java')
| -rw-r--r-- | org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java index dd8ed4cea..fac6b4082 100644 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java @@ -140,9 +140,9 @@ public FlowInfo analyseAssignment(BlockScope currentScope, FlowContext flowConte this.receiver .analyseCode(currentScope, flowContext, flowInfo, !this.binding.isStatic()) .unconditionalInits(); - + this.receiver.checkNPE(currentScope, flowContext, flowInfo); - + if (assignment.expression != null) { flowInfo = assignment @@ -181,7 +181,7 @@ public FlowInfo analyseAssignment(BlockScope currentScope, FlowContext flowConte && TypeBinding.equalsEquals(this.receiver.resolvedType, this.binding.declaringClass) // inherited fields are not tracked here && ((this.receiver.bits & ASTNode.ParenthesizedMASK) == 0)) { // (this).x is forbidden flowInfo.markAsDefinitelyAssigned(this.binding); - } + } } return flowInfo; } @@ -319,7 +319,7 @@ public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean this.receiver.generateCode(currentScope, codeStream, !isStatic); if ((this.bits & NeedReceiverGenericCast) != 0) { codeStream.checkcast(this.actualReceiverType); - } + } pc = codeStream.position; if (codegenBinding.declaringClass == null) { // array length codeStream.arraylength(); @@ -470,7 +470,7 @@ public void generatePostIncrement(BlockScope currentScope, CodeStream codeStream operandType = this.genericCast; } else { operandType = codegenBinding.type; - } + } if (valueRequired) { if (isStatic) { switch (operandType.id) { @@ -481,7 +481,7 @@ public void generatePostIncrement(BlockScope currentScope, CodeStream codeStream default : codeStream.dup(); break; - } + } } else { // Stack: [owner][old field value] ---> [old field value][owner][old field value] switch (operandType.id) { case TypeIds.T_long : @@ -491,10 +491,10 @@ public void generatePostIncrement(BlockScope currentScope, CodeStream codeStream default : codeStream.dup_x1(); break; - } + } } } - codeStream.generateImplicitConversion(this.implicitConversion); + codeStream.generateImplicitConversion(this.implicitConversion); codeStream.generateConstant( postIncrement.expression.constant, this.implicitConversion); @@ -530,7 +530,7 @@ public boolean isEquivalent(Reference reference) { FieldReference fr = (FieldReference) reference; if (fr.receiver.isThis() && !(fr.receiver instanceof QualifiedThisReference)) { otherToken = fr.token; - } + } } return otherToken != null && CharOperation.equals(this.token, otherToken); } else { @@ -594,13 +594,13 @@ public FieldBinding lastFieldBinding() { */ public void manageSyntheticAccessIfNecessary(BlockScope currentScope, FlowInfo flowInfo, boolean isReadAccess) { if ((flowInfo.tagBits & FlowInfo.UNREACHABLE_OR_DEAD) != 0) return; - + //{ObjectTeams: don't create (more) synthetics for base field accessed via callout: - if ( FieldModel.isCalloutAccessed(this.binding) - && this.syntheticAccessors != null - && this.syntheticAccessors[isReadAccess ? FieldReference.READ : FieldReference.WRITE] != null) + if ( FieldModel.isCalloutAccessed(this.binding) + && this.syntheticAccessors != null + && this.syntheticAccessors[isReadAccess ? FieldReference.READ : FieldReference.WRITE] != null) { - return; // synthetic binding already created during resolveType; avoid CCE if declaringClass is binary. + return; // synthetic binding already created during resolveType; avoid CCE if declaringClass is binary. } // SH} // if field from parameterized type got found, use the original field at codegen time @@ -803,7 +803,7 @@ public TypeBinding resolveType(BlockScope scope) { return null; } // https://bugs.eclipse.org/bugs/show_bug.cgi?id=245007 avoid secondary errors in case of - // missing super type for anonymous classes ... + // missing super type for anonymous classes ... ReferenceBinding declaringClass = fieldBinding.declaringClass; boolean avoidSecondary = declaringClass != null && declaringClass.isAnonymousType() && |