summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-08-07 23:49:18 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-08-07 23:49:18 -0700
commit45d045f8e3d7006890c5a3a187b8b2fc262ad5c7 (patch)
treeb35728feeebcc08451733ebc0995a65de785f3fd /src
parentc957bf808352364467243875b84b1b7d103caace (diff)
parent4caa766e85b6ee2b1629450df9a18bb76380ee12 (diff)
downloadscala-45d045f8e3d7006890c5a3a187b8b2fc262ad5c7.tar.gz
scala-45d045f8e3d7006890c5a3a187b8b2fc262ad5c7.tar.bz2
scala-45d045f8e3d7006890c5a3a187b8b2fc262ad5c7.zip
Merge pull request #1085 from gkossakowski/inline-in-constructors
Enable inlining in constructors.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/backend/opt/Inliners.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
index b1d00132ce..d87a242f1b 100644
--- a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
+++ b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
@@ -247,7 +247,7 @@ abstract class Inliners extends SubComponent {
debuglog("Analyzing " + cls)
this.currentIClazz = cls
- val ms = cls.methods filterNot { _.symbol.isConstructor } sorted imethodOrdering
+ val ms = cls.methods sorted imethodOrdering
ms foreach { im =>
if(hasInline(im.symbol)) {
log("Not inlining into " + im.symbol.originalName.decode + " because it is marked @inline.")