1.1 --- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Mon Jan 10 14:57:59 2011 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Mon Jan 10 15:08:31 2011 -0800
1.3 @@ -581,8 +581,7 @@
1.4 JCVariableDecl lastParam = null;
1.5 for (List<JCVariableDecl> l = tree.params; l.nonEmpty(); l = l.tail) {
1.6 JCVariableDecl param = lastParam = l.head;
1.7 - assert param.sym != null;
1.8 - params.append(param.sym);
1.9 + params.append(Assert.checkNonNull(param.sym));
1.10 }
1.11 m.params = params.toList();
1.12
1.13 @@ -699,7 +698,7 @@
1.14 *********************************************************************/
1.15
1.16 Type attribImportType(JCTree tree, Env<AttrContext> env) {
1.17 - assert completionEnabled;
1.18 + Assert.check(completionEnabled);
1.19 try {
1.20 // To prevent deep recursion, suppress completion of some
1.21 // types.
1.22 @@ -725,7 +724,7 @@
1.23 return "annotate " + annotations + " onto " + s + " in " + s.owner;
1.24 }
1.25 public void enterAnnotation() {
1.26 - assert s.kind == PCK || s.attributes_field == null;
1.27 + Assert.check(s.kind == PCK || s.attributes_field == null);
1.28 JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
1.29 try {
1.30 if (s.attributes_field != null &&
1.31 @@ -836,7 +835,7 @@
1.32 // Suppress some (recursive) MemberEnter invocations
1.33 if (!completionEnabled) {
1.34 // Re-install same completer for next time around and return.
1.35 - assert (sym.flags() & Flags.COMPOUND) == 0;
1.36 + Assert.check((sym.flags() & Flags.COMPOUND) == 0);
1.37 sym.completer = this;
1.38 return;
1.39 }
