summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2012-08-07 19:03:33 +0200
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2012-08-07 19:03:33 +0200
commit4caa766e85b6ee2b1629450df9a18bb76380ee12 (patch)
tree48d5919db9007e6b609d77f638850aaf119d20e8 /src
parentd8b35a11d67c2a597f1d93456b341a650b542520 (diff)
downloadscala-4caa766e85b6ee2b1629450df9a18bb76380ee12.tar.gz
scala-4caa766e85b6ee2b1629450df9a18bb76380ee12.tar.bz2
scala-4caa766e85b6ee2b1629450df9a18bb76380ee12.zip
Enable inlining in constructors.
Inlining in constructors has been disabled a long time ago due to some VerifyErrors. Unfortunately, @dragos cannot recall what exactly was the problem. I tried to enable inlining in constructors and I didn't see any problem. `Predef.assert` calls in class constructors are one of the biggest contributors to closure allocation in a compiler so we better off get rid of it. Added a test-case that checks if inlining in constructors works properly. Review by @magarciaEPFL and @paulp.
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.")