summaryrefslogtreecommitdiff
path: root/test/junit
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-09-09 15:57:41 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-09-17 22:05:04 +0200
commitfef4b3dd5c330f1c2f18604e231ef7c45ac14d70 (patch)
treefaf9821eb573121a81a754e6929a41cda8a25c22 /test/junit
parentc35c9c77a976b06aeae04d15493ec4995a2a6448 (diff)
downloadscala-fef4b3dd5c330f1c2f18604e231ef7c45ac14d70.tar.gz
scala-fef4b3dd5c330f1c2f18604e231ef7c45ac14d70.tar.bz2
scala-fef4b3dd5c330f1c2f18604e231ef7c45ac14d70.zip
Reduce component nesting in backend
Make InlinerHeuristics a backend component like the others, instead of nested within the Inliner component.
Diffstat (limited to 'test/junit')
-rw-r--r--test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
index 6dfdf20587..a462b4ff0a 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
@@ -91,7 +91,7 @@ class InlinerTest extends ClearAfterClass {
def makeInlineRequest( callsiteInstruction: MethodInsnNode, callsiteMethod: MethodNode, callsiteClass: ClassBType,
callee: MethodNode, calleeDeclarationClass: ClassBType,
callsiteStackHeight: Int, receiverKnownNotNull: Boolean,
- post: List[inliner.heuristics.PostInlineRequest] = Nil) = inliner.heuristics.InlineRequest(
+ post: List[inlinerHeuristics.PostInlineRequest] = Nil) = inlinerHeuristics.InlineRequest(
callsite = callGraph.Callsite(
callsiteInstruction = callsiteInstruction,
callsiteMethod = callsiteMethod,
@@ -1093,7 +1093,7 @@ class InlinerTest extends ClearAfterClass {
calleeDeclarationClass = cTp,
callsiteStackHeight = analyzer.frameAt(gCall).getStackSize,
receiverKnownNotNull = false,
- post = List(inliner.heuristics.PostInlineRequest(fCall, Nil))
+ post = List(inlinerHeuristics.PostInlineRequest(fCall, Nil))
)
val r = inliner.inline(request)