diff options
| author | Stephan Herrmann | 2015-02-14 21:37:15 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2015-02-14 21:37:15 +0000 |
| commit | 53b3b921e9223b7e824d3a984db2edcecebf7168 (patch) | |
| tree | e66bb7787fb9bb35bfd5b4a27e3a2de0072c1b06 /org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java | |
| parent | ea9d5efb7fbf74057de7abad3cdd0f9219a30eda (diff) | |
| download | org.eclipse.objectteams-53b3b921e9223b7e824d3a984db2edcecebf7168.tar.gz org.eclipse.objectteams-53b3b921e9223b7e824d3a984db2edcecebf7168.tar.xz org.eclipse.objectteams-53b3b921e9223b7e824d3a984db2edcecebf7168.zip | |
Update jdt.core to a9567e58ade978b67e4f2db4ee5fe35bc3c0d3fe
- new formatter not yet adjusted for OT/J
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 | 7 |
1 files changed, 4 insertions, 3 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 c091a1e4e..aa2d37e2b 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2014 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ * bug 383368 - [compiler][null] syntactic null analysis for field references * Bug 412203 - [compiler] Internal compiler error: java.lang.IllegalArgumentException: info cannot be null * Bug 400874 - [1.8][compiler] Inference infrastructure should evolve to meet JLS8 18.x (Part G of JSR335 spec) + * Bug 458396 - NPE in CodeStream.invoke() * Jesper S Moller - Contributions for * Bug 378674 - "The method can be declared as static" is wrong *******************************************************************************/ @@ -573,7 +574,7 @@ public void manageSyntheticAccessIfNecessary(BlockScope currentScope, FlowInfo f FieldBinding codegenBinding = this.binding.original(); if (this.binding.isPrivate()) { if ((TypeBinding.notEquals(currentScope.enclosingSourceType(), codegenBinding.declaringClass)) - && this.binding.constant() == Constant.NotAConstant) { + && this.binding.constant(currentScope) == Constant.NotAConstant) { if (this.syntheticAccessors == null) this.syntheticAccessors = new MethodBinding[2]; this.syntheticAccessors[isReadAccess ? FieldReference.READ : FieldReference.WRITE] = @@ -802,7 +803,7 @@ public TypeBinding resolveType(BlockScope scope) { scope.problemReporter().deprecatedField(fieldBinding, this); } boolean isImplicitThisRcv = this.receiver.isImplicitThis(); - this.constant = isImplicitThisRcv ? fieldBinding.constant() : Constant.NotAConstant; + this.constant = isImplicitThisRcv ? fieldBinding.constant(scope) : Constant.NotAConstant; if (fieldBinding.isStatic()) { // static field accessed through receiver? legal but unoptimal (optional warning) if (!(isImplicitThisRcv |