diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/opt/Inliners.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/opt/Inliners.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala index 23a100ba44..c0252d84cc 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala @@ -486,8 +486,8 @@ abstract class Inliners extends SubComponent { */ def shouldInline(caller: IMethod, callee: IMethod): Boolean = { if (caller.symbol.hasFlag(Flags.BRIDGE)) return false; - if (callee.symbol.hasAttribute(ScalaNoInlineAttr)) return false - if (callee.symbol.hasAttribute(ScalaInlineAttr)) return true + if (callee.symbol.hasAnnotation(ScalaNoInlineAttr)) return false + if (callee.symbol.hasAnnotation(ScalaInlineAttr)) return true if (settings.debug.value) log("shouldInline: " + caller + " with " + callee) var score = 0 |