diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-05-26 12:41:45 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-05-26 12:41:45 +0000 |
| commit | f80f8033a7eeb4b088591e4eb6f75e4670f157b5 (patch) | |
| tree | 0e2372c972410fd0ac73c1dfc1f89d792d53fc48 /src | |
| parent | bf7eee08892aa38130dda75cfb6099fdc8b5bcd4 (diff) | |
| download | scala-f80f8033a7eeb4b088591e4eb6f75e4670f157b5.tar.gz scala-f80f8033a7eeb4b088591e4eb6f75e4670f157b5.tar.bz2 scala-f80f8033a7eeb4b088591e4eb6f75e4670f157b5.zip | |
Commit r22003 changed the svn:ignore
property of every directory in the
source tree, probably unintentionally.
http://lampsvn.epfl.ch/trac/scala/changeset/22003
Reverting those changes, leaving just
the change to MutableList.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 705b835e89..aad80c1d8c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -3476,14 +3476,14 @@ trait Typers { self: Analyzer => //if (name.toString == "Elem") println("typedSelect "+qual+":"+qual.tpe+" "+sym+"/"+tree1+":"+tree1.tpe) val (tree2, pre2) = makeAccessible(tree1, sym, qual.tpe, qual) val result = stabilize(tree2, pre2, mode, pt) - def isPotentialNullDereference() = { + def isPotentialNullDeference() = { phase.id <= currentRun.typerPhase.id && !sym.isConstructor && !(qual.tpe <:< NotNullClass.tpe) && !qual.tpe.isNotNull && !(List(Any_isInstanceOf, Any_asInstanceOf) contains result.symbol) // null.is/as is not a dereference } // unit is null here sometimes; how are we to know when unit might be null? (See bug #2467.) - if (settings.Xchecknull.value && isPotentialNullDereference && unit != null) + if (settings.Xchecknull.value && isPotentialNullDeference && unit != null) unit.warning(tree.pos, "potential null pointer dereference: "+tree) result |