diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-17 20:15:36 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-18 10:32:28 +0200 |
commit | 41e5ef4396a1526cd8c58157912ffed830a96f1e (patch) | |
tree | d406ff22f3588ac9c47ff0067a002efa30ca5cef /src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | |
parent | 59a5d3b8fd036d36afcf6349bc3cc527344981a1 (diff) | |
download | scala-41e5ef4396a1526cd8c58157912ffed830a96f1e.tar.gz scala-41e5ef4396a1526cd8c58157912ffed830a96f1e.tar.bz2 scala-41e5ef4396a1526cd8c58157912ffed830a96f1e.zip |
First version of inliningh heuristics that prefer higher-order methos
When invoking a higher-order method and the value passed for the
SAM type is either a function literal or a parameter of the callsite
method, inline the higher-order method into the callee.
This is a first version, the heuristics will be refined further.
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/ScalaSettings.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index ea9ad1d909..74d152a4cf 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -276,8 +276,8 @@ trait ScalaSettings extends AbsScalaSettings name = "-Yopt-inline-heuristics", helpArg = "strategy", descr = "Set the heuristics for inlining decisions.", - choices = List("at-inline-annotated", "everything"), - default = "at-inline-annotated") + choices = List("at-inline-annotated", "everything", "default"), + default = "default") object YoptWarningsChoices extends MultiChoiceEnumeration { val none = Choice("none" , "No optimizer warnings.") |