summaryrefslogtreecommitdiff
path: root/6
diff options
context:
space:
mode:
Diffstat (limited to '6')
-rw-r--r--6/isel.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/6/isel.c b/6/isel.c
index bd122b7..9abe40e 100644
--- a/6/isel.c
+++ b/6/isel.c
@@ -939,8 +939,9 @@ 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 */
- case Obad: case Opreinc: case Opostinc: case Opredec: case Otern:
- case Opostdec: case Olor: case Oland: case Oaddeq:
+<<<<<<< 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:
case Obandeq: case Obxoreq: case Obsleq: case Obsreq: case Omemb:
case Oslbase: case Osllen: case Ocast: case Outag: case Oudata: