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

-:609fb59657b4
+:1a9276e7cb18
 for (List<JCVariableDecl> l = tree.params; l.nonEmpty(); l = l.tail) {
 attribStat(l.head, localEnv);
 }
 // Check that type parameters are well-formed.
-chk.validateTypeParams(tree.typarams);
+chk.validate(tree.typarams, localEnv);
 if ((owner.flags() & ANNOTATION) != 0 &&
 tree.typarams.nonEmpty())
 log.error(tree.typarams.head.pos(),
 "intf.annotation.members.cant.have.type.params");
 // Check that result type is well-formed.
-chk.validate(tree.restype);
+chk.validate(tree.restype, localEnv);
 if ((owner.flags() & ANNOTATION) != 0)
 chk.validateAnnotationType(tree.restype);
 if ((owner.flags() & ANNOTATION) != 0)
 chk.validateAnnotationMethod(tree.pos(), m);
 annotate.flush();
 }
 }
 // Check that the variable's declared type is well-formed.
-chk.validate(tree.vartype);
+chk.validate(tree.vartype, env);
 VarSymbol v = tree.sym;
 Lint lint = env.info.lint.augment(v.attributes_field, v.flags());
 Lint prevLint = chk.setLint(lint);
 // Check that value of resulting type is admissible in the
 // current context.  Also, capture the return type
 result = check(tree, capture(restype), VAL, pkind, pt);
 }
-chk.validate(tree.typeargs);
+chk.validate(tree.typeargs, localEnv);
 }
 //where
 /** Check that given application node appears as first statement
 *  in a constructor call.
 *  @param tree   The application node
 // Attribute clazz expression and store
 // symbol + type back into the attributed tree.
 Type clazztype = chk.checkClassType(
 tree.clazz.pos(), attribType(clazz, env), true);
-chk.validate(clazz);
+chk.validate(clazz, localEnv);
 if (tree.encl != null) {
 // We have to work in this case to store
 // symbol + type back into the attributed tree.
 tree.clazz.type = clazztype;
 TreeInfo.setSymbol(clazzid, TreeInfo.symbol(clazzid1));
 if (tree.constructor != null && tree.constructor.kind == MTH)
 owntype = clazztype;
 }
 result = check(tree, owntype, VAL, pkind, pt);
-chk.validate(tree.typeargs);
+chk.validate(tree.typeargs, localEnv);
 }
 /** Make an attributed null check tree.
 */
 public JCExpression makeNullCheck(JCExpression arg) {
 public void visitNewArray(JCNewArray tree) {
 Type owntype = types.createErrorType(tree.type);
 Type elemtype;
 if (tree.elemtype != null) {
 elemtype = attribType(tree.elemtype, env);
-chk.validate(tree.elemtype);
+chk.validate(tree.elemtype, env);
 owntype = elemtype;
 for (List<JCExpression> l = tree.dims; l.nonEmpty(); l = l.tail) {
 attribExpr(l.head, env, syms.intType);
 owntype = new ArrayType(owntype, syms.arrayClass);
 }
 result = check(tree, owntype, VAL, pkind, pt);
 }
 public void visitTypeCast(JCTypeCast tree) {
 Type clazztype = attribType(tree.clazz, env);
+chk.validate(tree.clazz, env);
 Type exprtype = attribExpr(tree.expr, env, Infer.anyPoly);
 Type owntype = chk.checkCastable(tree.expr.pos(), exprtype, clazztype);
 if (exprtype.constValue() != null)
 owntype = cfolder.coerce(exprtype, owntype);
 result = check(tree, capture(owntype), VAL, pkind, pt);
 public void visitTypeTest(JCInstanceOf tree) {
 Type exprtype = chk.checkNullOrRefType(
 tree.expr.pos(), attribExpr(tree.expr, env));
 Type clazztype = chk.checkReifiableReferenceType(
 tree.clazz.pos(), attribType(tree.clazz, env));
+chk.validate(tree.clazz, env);
 chk.checkCastable(tree.expr.pos(), exprtype, clazztype);
 result = check(tree, syms.booleanType, VAL, pkind, pt);
 }
 public void visitIndexed(JCArrayAccess tree) {
 // Validate annotations
 chk.validateAnnotations(tree.mods.annotations, c);
 // Validate type parameters, supertype and interfaces.
 attribBounds(tree.typarams);
-chk.validateTypeParams(tree.typarams);
+chk.validate(tree.typarams, env);
-chk.validate(tree.extending);
+chk.validate(tree.extending, env);
-chk.validate(tree.implementing);
+chk.validate(tree.implementing, env);
 // If this is a non-abstract class, check that it has no abstract
 // methods or unimplemented methods of an implemented interface.
 if ((c.flags() & (ABSTRACT | INTERFACE)) == 0) {
 if (!relax)

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

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

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