diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-05 09:33:02 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-05 09:33:02 -0800 |
| commit | c779d13d005456b13649fa772627e2a1e2af898b (patch) | |
| tree | 0239a1bfa873eed8682479ac47bd48d62be4f674 /src/compiler | |
| parent | 543dcfe752ad777188079e8d3cee38ab41845321 (diff) | |
| parent | 4e731759dd5d33781a71c67d19b84f4bb07242d5 (diff) | |
| download | scala-c779d13d005456b13649fa772627e2a1e2af898b.tar.gz scala-c779d13d005456b13649fa772627e2a1e2af898b.tar.bz2 scala-c779d13d005456b13649fa772627e2a1e2af898b.zip | |
Merge remote-tracking branch 'szabolcsberecz/small-cleanup' into develop
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/Members.scala | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index 3baff7da9e..6aee52a354 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -133,7 +133,7 @@ abstract class GenICode extends SubComponent { if (!ctx1.bb.closed) ctx1.bb.close prune(ctx1.method) } else - ctx1.method.setCode(null) + ctx1.method.setCode(NoCode) ctx1 case Template(_, _, body) => diff --git a/src/compiler/scala/tools/nsc/backend/icode/Members.scala b/src/compiler/scala/tools/nsc/backend/icode/Members.scala index 2668e7f29f..298c9171a1 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Members.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Members.scala @@ -177,8 +177,7 @@ trait Members { /** method parameters */ var params: List[Local] = Nil - // TODO - see how null is stil arriving here - def hasCode = (code ne NoCode) && (code ne null) + def hasCode = code ne NoCode def setCode(code: Code): IMethod = { this.code = code; this |