summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2014-12-04 17:20:08 +0100
committerLukas Rytz <lukas.rytz@typesafe.com>2014-12-04 17:20:08 +0100
commitb1ae72455e9749df233d8a9f7cea6d486acc8424 (patch)
tree14ea81f3408daa8b2023901932f53f03a34baed1 /src/compiler
parent3eddd4cc1736defe9743f31765df3d42b7f211d4 (diff)
parentce157cb468a6940d22246677e8ab2d1e67150d6c (diff)
downloadscala-b1ae72455e9749df233d8a9f7cea6d486acc8424.tar.gz
scala-b1ae72455e9749df233d8a9f7cea6d486acc8424.tar.bz2
scala-b1ae72455e9749df233d8a9f7cea6d486acc8424.zip
Merge pull request #4180 from som-snytt/issue/7683
SI-7683 Enable -Ystop-before:typer
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/Global.scala5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 430424d0f8..e62dfd00a6 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -1590,10 +1590,9 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
}
}
- /** Reset package class to state at typer (not sure what this
- * is needed for?)
+ /** Reset package class to state at typer (not sure what this is needed for?)
*/
- private def resetPackageClass(pclazz: Symbol) {
+ private def resetPackageClass(pclazz: Symbol): Unit = if (typerPhase != NoPhase) {
enteringPhase(firstPhase) {
pclazz.setInfo(enteringPhase(typerPhase)(pclazz.info))
}