diff options
author | Iulian Dragos <jaguarul@gmail.com> | 2007-07-17 09:15:33 +0000 |
---|---|---|
committer | Iulian Dragos <jaguarul@gmail.com> | 2007-07-17 09:15:33 +0000 |
commit | 9f1345730a8e00a43ae628ae0c2f0a38b530579b (patch) | |
tree | 1ec86bb86f6c94eb158f651270dcb083ba5280f7 /src | |
parent | 07d14d9712caa653b54cfcc022d9db8e38545d4d (diff) | |
download | scala-9f1345730a8e00a43ae628ae0c2f0a38b530579b.tar.gz scala-9f1345730a8e00a43ae628ae0c2f0a38b530579b.tar.bz2 scala-9f1345730a8e00a43ae628ae0c2f0a38b530579b.zip |
Fixed looping behavior in inliner.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/opt/Inliners.scala | 2 |
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 efe10fd429..039a16a5d5 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala @@ -321,7 +321,7 @@ abstract class Inliners extends SubComponent { classes(receiver).lookupMethod(concreteMethod) match { case Some(inc) => if (inc.symbol != m.symbol - //&& (inlinedMethods(inc.symbol) < 2) + && (inlinedMethods(inc.symbol) < 2) && (inc.code ne null) && shouldInline(m, inc) && (inc.code.blocks.length <= MAX_INLINE_SIZE) |