diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-11 23:45:13 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-11 23:45:13 -0700 |
| commit | 0b68be2baa6cf96e71466b3b878559918b7d847f (patch) | |
| tree | 0c3cc7cfc58c34f145aea046cdc901e45b28045f /src/compiler | |
| parent | 897116ffb0e317a60a94b20f502f27483a98bad0 (diff) | |
| parent | 8400088ee029703374f3e0d7c4a53c8dcb5f13b2 (diff) | |
| download | scala-0b68be2baa6cf96e71466b3b878559918b7d847f.tar.gz scala-0b68be2baa6cf96e71466b3b878559918b7d847f.tar.bz2 scala-0b68be2baa6cf96e71466b3b878559918b7d847f.zip | |
Merge pull request #877 from magarciaEPFL/fixes
SI-6015 assertion (in Type-flow analysis) that wasn't, valid counterexample found
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala index c3fbf31cc6..7a5615ac26 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala @@ -516,7 +516,7 @@ abstract class TypeFlowAnalysis { * but the effect on method size could be explored. */ putOnRadar(m.linearizedBlocks(linearizer)) populatePerimeter() - assert(relevantBBs.isEmpty || relevantBBs.contains(m.startBlock), "you gave me dead code") + // usually but not always true (counterexample in SI-6015) `(relevantBBs.isEmpty || relevantBBs.contains(m.startBlock))` } def conclusives(b: BasicBlock): List[opcodes.CALL_METHOD] = { |