d: Merge upstream dmd 3982604c5, druntime bc58b1e9, phobos 12329adb6.

[thirdparty/gcc.git] / gcc / d / dmd / ob.d

diff --git a/gcc/d/dmd/ob.d b/gcc/d/dmd/ob.d
index 605e9f3bfdd94ba55f7c07aa336b32bc2e47cda8..156428eb6991c3406fe4ad1dd380a256d8dd8373 100644 (file)
--- a/gcc/d/dmd/ob.d
+++ b/gcc/d/dmd/ob.d
@@ -1362,7 +1362,7 @@ void genKill(ref ObState obstate, ObNode* ob)
 
             override void visit(Expression e)
             {
-                //printf("[%s] %s: %s\n", e.loc.toChars(), Token.toChars(e.op), e.toChars());
+                //printf("[%s] %s: %s\n", e.loc.toChars(), EXPtoString(e.op).ptr, e.toChars());
                 //assert(0);
             }
 
@@ -1644,7 +1644,7 @@ void genKill(ref ObState obstate, ObNode* ob)
                  * allowed, but CTFE can generate one out of a new expression,
                  * but it'll be placed in static data so no need to check it.
                  */
-                if (e.e1.op != TOK.structLiteral)
+                if (e.e1.op != EXP.structLiteral)
                     e.e1.accept(this);
             }
 
@@ -2378,7 +2378,7 @@ void checkObErrors(ref ObState obstate)
                  * allowed, but CTFE can generate one out of a new expression,
                  * but it'll be placed in static data so no need to check it.
                  */
-                if (e.e1.op != TOK.structLiteral)
+                if (e.e1.op != EXP.structLiteral)
                     e.e1.accept(this);
             }