From 6c1feb586bc3687ee08d2395233c849550530ba7 Mon Sep 17 00:00:00 2001
From: Hubert Plociniczak <hubert.plociniczak@epfl.ch>
Date: Fri, 29 Apr 2011 14:27:35 +0000
Subject: remove now redundant check (see #4426).

---
 src/compiler/scala/tools/nsc/plugins/Plugins.scala | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/compiler/scala/tools/nsc/plugins')

diff --git a/src/compiler/scala/tools/nsc/plugins/Plugins.scala b/src/compiler/scala/tools/nsc/plugins/Plugins.scala
index 64e38fee9a..36227c1052 100644
--- a/src/compiler/scala/tools/nsc/plugins/Plugins.scala
+++ b/src/compiler/scala/tools/nsc/plugins/Plugins.scala
@@ -105,12 +105,8 @@ trait Plugins {
    * Extract all phases supplied by plugins and add them to the phasesSet.
    * @see phasesSet
    */
-  protected def computePluginPhases(): Unit = {
-    // For reasons not yet apparent to me, plugins started appearing
-    // as null when I added phaseTimings to global.
-    if (plugins != null)
-      phasesSet ++= (plugins flatMap (_.components))
-  }
+  protected def computePluginPhases(): Unit =
+    phasesSet ++= (plugins flatMap (_.components))
 
   /** Summary of the options for all loaded plugins */
   def pluginOptionsHelp: String =
-- 
cgit v1.2.3