summaryrefslogtreecommitdiff
path: root/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-05-30 19:25:14 +0200
committerJason Zaugg <jzaugg@gmail.com>2016-06-06 14:34:57 +1000
commit037a089ad4fb7137513777ccda6d47e30e151838 (patch)
treeb1ffe6d682ec24d7872967d8dfdd64ed5158f521 /test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
parent1f812e9482855d3fd5a8a5e9118942dc80f22db5 (diff)
downloadscala-037a089ad4fb7137513777ccda6d47e30e151838.tar.gz
scala-037a089ad4fb7137513777ccda6d47e30e151838.tar.bz2
scala-037a089ad4fb7137513777ccda6d47e30e151838.zip
Store source file paths of classes being compiled in the bytecode repo
For classes being compiled (vs. being loaded from classfiles), keep the source file path in the bytecode repo. This will allow to keep line numbers when inlining from one class into another in case the two are defined in the same compilation unit.
Diffstat (limited to 'test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala')
-rw-r--r--test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala2
1 files changed, 1 insertions, 1 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 02cd632af1..4023f1fd3a 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
@@ -43,7 +43,7 @@ class InlinerTest extends BytecodeTesting {
// Use the class nodes stored in the byteCodeRepository. The ones returned by compileClasses are not the same,
// these are created new from the classfile byte array. They are completely separate instances which cannot
// be used to look up methods / callsites in the callGraph hash maps for example.
- byteCodeRepository.compilingClasses.valuesIterator.toList.sortBy(_.name)
+ byteCodeRepository.compilingClasses.valuesIterator.map(_._1).toList.sortBy(_.name)
}
def checkCallsite(callsite: callGraph.Callsite, callee: MethodNode) = {