diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2009-10-21 13:19:33 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2009-10-21 13:19:33 +0000 |
| commit | 70bc8f93c56d6ac2390bbae8a0ab173926240549 (patch) | |
| tree | c6b3fef1fa2b95607732b28187be3cd89654e025 /src/compiler | |
| parent | 58651079b710013873372f12a451146b640581c7 (diff) | |
| download | scala-70bc8f93c56d6ac2390bbae8a0ab173926240549.tar.gz scala-70bc8f93c56d6ac2390bbae8a0ab173926240549.tar.bz2 scala-70bc8f93c56d6ac2390bbae8a0ab173926240549.zip | |
Made Platform methods inlineable and allow the ...
Made Platform methods inlineable and allow the optimiser to load code
for methods that have the @inline attribute
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/opt/Inliners.scala | 3 |
1 files changed, 2 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 487e66fc9e..a93d6b1a34 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala @@ -390,7 +390,8 @@ abstract class Inliners extends SubComponent { if (settings.debug.value) log("shouldLoad: " + receiver + "." + method) ((method.isFinal && isMonadMethod(method) && isHigherOrderMethod(method)) || (receiver.enclosingPackage == definitions.ScalaRunTimeModule.enclosingPackage) - || (receiver == definitions.PredefModule.moduleClass)) + || (receiver == definitions.PredefModule.moduleClass) + || (method.hasAnnotation(ScalaInlineAttr))) } /** Cache whether a method calls private members. */ |