summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2010-04-29 13:45:41 +0000
committerIulian Dragos <jaguarul@gmail.com>2010-04-29 13:45:41 +0000
commit35e881860944c1cbae98979c99c3e1a6778b39c9 (patch)
treee36f128f79fb4591c0a73d0d2bac009ac41c2767 /src/compiler
parent78ca916a093c481b87b484759116474f39fb6759 (diff)
downloadscala-35e881860944c1cbae98979c99c3e1a6778b39c9.tar.gz
scala-35e881860944c1cbae98979c99c3e1a6778b39c9.tar.bz2
scala-35e881860944c1cbae98979c99c3e1a6778b39c9.zip
Allow inlining for straight-line methods.
Diffstat (limited to 'src/compiler')
-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 cb87301b6a..dc1ac8e844 100644
--- a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
+++ b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
@@ -523,7 +523,7 @@ abstract class Inliners extends SubComponent {
var score = 0
if (callee.code.blocks.length <= SMALL_METHOD_SIZE) score = score + 1
if (caller.code.blocks.length <= SMALL_METHOD_SIZE
- && ((caller.code.blocks.length + callee.code.blocks.length) > SMALL_METHOD_SIZE)) {
+ && ((caller.code.blocks.length + callee.code.blocks.length - 1) > SMALL_METHOD_SIZE)) {
score -= 1
if (settings.debug.value)
log("shouldInline: score decreased to " + score + " because small " + caller + " would become large")