8000 Merge pull request #3763 from adriaanm/revert-3760 · scala/scala-dev@1e1defd · GitHub
[go: up one dir, main page]
Skip to content

Commit 1e1defd

Browse files
adriaanmadriaanm
committed
Merge pull request #3763 from adriaanm/revert-3760
Revert #3760
2 parents 8cc1887 + 81309e7 commit 1e1defd

File tree

10 files changed

+7
-61
lines changed

10 files changed

+7
-61
lines changed

‎src/compiler/scala/tools/nsc/backend/opt/ClosureElimination.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,11 @@ abstract class ClosureElimination extends SubComponent {
5656
case (BOX(t1), UNBOX(t2)) if (t1 == t2) =>
5757
Some(Nil)
5858

59-
// Can't eliminate (LOAD_FIELD, DROP) without eliding side effects:
60-
// - static class initialization
61-
// - NPE if the receiver is null
62-
// We could replace the LOAD/DROP with a null check to preserve semantics.
59+
case (LOAD_FIELD(sym, isStatic), DROP(_)) if !sym.hasAnnotation(definitions.VolatileAttr) =>
60+
if (isStatic)
61+
Some(Nil)
62+
else
63+
Some(DROP(REFERENCE(definitions.ObjectClass)) :: Nil)
6364

6465
case _ => None
6566
}

‎src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ abstract class DeadCodeElimination extends SubComponent {
167167
set += idx
168168
localStores(key) = set
169169

170-
case RETURN(_) | JUMP(_) | CJUMP(_, _, _, _) | CZJUMP(_, _, _, _) | STORE_FIELD(_, _) | LOAD_FIELD(_, _) | // Why LOAD_FIELD? It can NPE!
170+
case RETURN(_) | JUMP(_) | CJUMP(_, _, _, _) | CZJUMP(_, _, _, _) | STORE_FIELD(_, _) |
171171
THROW(_) | LOAD_ARRAY_ITEM(_) | STORE_ARRAY_ITEM(_) | SCOPE_ENTER(_) | SCOPE_EXIT(_) | STORE_THIS(_) |
172-
LOAD_EXCEPTION(_) | SWITCH(_, _) | MONITOR_ENTER() | MONITOR_EXIT() | CHECK_CAST(_) | CREATE_ARRAY(_, _) =>
172+
LOAD_EXCEPTION(_) | SWITCH(_, _) | MONITOR_ENTER() | MONITOR_EXIT() | CHECK_CAST(_) =>
173173
moveToWorkList()
174174

175175
case CALL_METHOD(m1, _) if isSideEffecting(m1) =>
@@ -193,8 +193,6 @@ abstract class DeadCodeElimination extends SubComponent {
193193
moveToWorkListIf(necessary)
194194
case LOAD_MODULE(sym) if isLoadNeeded(sym) =>
195195
moveToWorkList() // SI-4859 Module initialization might side-effect.
196-
case CALL_PRIMITIVE(Arithmetic(DIV | REM, INT | LONG) | ArrayLength(_)) =>
197-
moveToWorkList() // SI-8601 Might divide by zero
198196
case _ => ()
199197
moveToWorkListIf(cond = false)
200198
}

‎test/files/run/t8601.flags

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/files/run/t8601.scala

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎test/files/run/t8601b.flags

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/files/run/t8601b.scala

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎test/files/run/t8601c.flags

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/files/run/t8601c.scala

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎test/files/run/t8601d.flags

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/files/run/t8601d.scala

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0