summaryrefslogtreecommitdiff
path: root/6
diff options
context:
space:
mode:
authorS. Gilles <sgilles@math.umd.edu>2018-03-20 09:55:04 -0400
committerS. Gilles <sgilles@math.umd.edu>2018-03-20 09:55:15 -0400
commitf3265a99202d98f6f7e5969e34faae934ce754b9 (patch)
tree5ae57572c0be3d7ca42b7a5789fb07b55ca40f60 /6
parentf43021ba4fcf39c9ebd718bb3e594f063680e584 (diff)
downloadmc-f3265a99202d98f6f7e5969e34faae934ce754b9.tar.gz
Fix corrupted merge of 'autoexpr'
Diffstat (limited to '6')
-rw-r--r--6/isel.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/6/isel.c b/6/isel.c
index 9abe40e..7b30b04 100644
--- a/6/isel.c
+++ b/6/isel.c
@@ -939,7 +939,6 @@ selexpr(Isel *s, Node *n)
/* These operators should never show up in the reduced trees,
* since they should have been replaced with more primitive
* expressions by now */
-<<<<<<< HEAD
case Obad: case Oauto: case Opreinc: case Opostinc: case Opredec:
case Otern: case Opostdec: case Olor: case Oland: case Oaddeq:
case Osubeq: case Omuleq: case Odiveq: case Omodeq: case Oboreq: