jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/comp/MemberEnter.java

-:0384683c64be
+:ddb4a2bfcd82
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import javax.lang.model.type.TypeKind;
 import javax.tools.JavaFileObject;
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.jvm.*;
 import com.sun.tools.javac.tree.*;
 chk.setDeferredLintHandler(deferredLintHandler.setPos(tree.pos()));
 try {
 if (TreeInfo.isEnumInit(tree)) {
 attr.attribIdentAsEnumType(localEnv, (JCIdent)tree.vartype);
 } else {
+// Make sure type annotations are processed.
+// But we don't have a symbol to attach them to yet - use null.
+typeAnnotate(tree.vartype, env, null);
 attr.attribType(tree.vartype, localEnv);
+if (tree.nameexpr != null) {
+attr.attribExpr(tree.nameexpr, localEnv);
+MethodSymbol m = localEnv.enclMethod.sym;
+if (m.isConstructor()) {
+Type outertype = m.owner.owner.type;
+if (outertype.hasTag(TypeTag.CLASS)) {
+checkType(tree.vartype, outertype, "incorrect.constructor.receiver.type");
+checkType(tree.nameexpr, outertype, "incorrect.constructor.receiver.name");
+} else {
+log.error(tree, "receiver.parameter.not.applicable.constructor.toplevel.class");
+}
+} else {
+checkType(tree.vartype, m.owner.type, "incorrect.receiver.type");
+checkType(tree.nameexpr, m.owner.type, "incorrect.receiver.name");
+}
+}
 }
 } finally {
 chk.setDeferredLintHandler(prevLintHandler);
 }
 if (chk.checkUnique(tree.pos(), v, enclScope)) {
 chk.checkTransparentVar(tree.pos(), v, enclScope);
 enclScope.enter(v);
 }
 annotateLater(tree.mods.annotations, localEnv, v);
-typeAnnotate(tree.vartype, env, tree.sym);
+typeAnnotate(tree.vartype, env, v);
 annotate.flush();
 v.pos = tree.pos;
+}
+// where
+void checkType(JCTree tree, Type type, String diag) {
+if (!tree.type.isErroneous() && !types.isSameType(tree.type, type)) {
+log.error(tree, diag, type, tree.type);
+}
 }
 /** Create a fresh environment for a variable's initializer.
 *  If the variable is a field, the owner of the environment's scope
 *  is be the variable itself, otherwise the owner is the method
 }
 } finally {
 isFirst = true;
 }
 }
-annotate.afterRepeated(TypeAnnotations.organizeTypeAnnotationsSignatures(syms, names, log, tree));
+TypeAnnotations.organizeTypeAnnotationsSignatures(syms, names, log, tree, annotate);
 }
+/*
+* If the symbol is non-null, attach the type annotation to it.
+*/
 private void actualEnterTypeAnnotations(final List<JCAnnotation> annotations,
 final Env<AttrContext> env,
 final Symbol s) {
 Map<TypeSymbol, ListBuffer<Attribute.TypeCompound>> annotated =
 new LinkedHashMap<TypeSymbol, ListBuffer<Attribute.TypeCompound>>();
 annotated.put(a.type.tsym, ListBuffer.of(tc));
 pos.put(tc, a.pos());
 }
 }
-s.annotations.appendTypeAttributesWithCompletion(
+if (s != null) {
-annotate.new AnnotateRepeatedContext<Attribute.TypeCompound>(env, annotated, pos, log, true));
+s.annotations.appendTypeAttributesWithCompletion(
+annotate.new AnnotateRepeatedContext<Attribute.TypeCompound>(env, annotated, pos, log, true));
+}
 }
 public void typeAnnotate(final JCTree tree, final Env<AttrContext> env, final Symbol sym) {
 tree.accept(new TypeAnnotate(env, sym));
 }
 scan(tree.params);
 scan(tree.thrown);
 scan(tree.defaultValue);
 // Do not annotate the body, just the signature.
 // scan(tree.body);
+}
+@Override
+public void visitVarDef(final JCVariableDecl tree) {
+if (sym != null && sym.kind == Kinds.VAR) {
+// Don't visit a parameter once when the sym is the method
+// and once when the sym is the parameter.
+scan(tree.mods);
+scan(tree.vartype);
+}
+scan(tree.init);
+}
+@Override
+public void visitClassDef(JCClassDecl tree) {
+// We can only hit a classdef if it is declared within
+// a method. Ignore it - the class will be visited
+// separately later.
+}
+@Override
+public void visitNewClass(JCNewClass tree) {
+if (tree.def == null) {
+// For an anonymous class instantiation the class
+// will be visited separately.
+super.visitNewClass(tree);
+}
 }
 }
 private Env<AttrContext> baseEnv(JCClassDecl tree, Env<AttrContext> env) {

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/javac/comp/MemberEnter.java

src/share/classes/com/sun/tools/javac/comp/MemberEnter.java