Followup to VEX r2742 which eliminates IRExprP__VECRET and IRExprP__BBPTR

and adds Iex_VECRET and Iex_BBPTR.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13498

diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
index 33dc1ce8829f63b2d49561d37da829c49ac90917..cebbec27c0c6859e7c9be6efd6966d7363869fb4 100644 (file)
--- a/memcheck/mc_translate.c
+++ b/memcheck/mc_translate.c
@@ -4273,7 +4273,7 @@ IRAtom* expr2vbits_Load_WRK ( MCEnv* mce,
       di = unsafeIRDirty_1_N( datavbits, 
                               2/*regparms*/, 
                               hname, VG_(fnptr_to_fnentry)( helper ), 
-                              mkIRExprVec_2( IRExprP__VECRET, addrAct ) );
+                              mkIRExprVec_2( IRExpr_VECRET(), addrAct ) );
    } else {
       di = unsafeIRDirty_1_N( datavbits, 
                               1/*regparms*/, 
@@ -4880,7 +4880,7 @@ void do_shadow_Dirty ( MCEnv* mce, IRDirty* d )
    for (i = 0; d->args[i]; i++) {
       IRAtom* arg = d->args[i];
       if ( (d->cee->mcx_mask & (1<<i))
-           || UNLIKELY(is_IRExprP__VECRET_or_BBPTR(arg)) ) {
+           || UNLIKELY(is_IRExpr_VECRET_or_BBPTR(arg)) ) {
          /* ignore this arg */
       } else {
          here = mkPCastTo( mce, Ity_I32, expr2vbits(mce, arg) );
@@ -5755,7 +5755,7 @@ static Bool checkForBogusLiterals ( /*FLAT*/ IRStmt* st )
          d = st->Ist.Dirty.details;
          for (i = 0; d->args[i]; i++) {
             IRAtom* atom = d->args[i];
-            if (LIKELY(!is_IRExprP__VECRET_or_BBPTR(atom))) {
+            if (LIKELY(!is_IRExpr_VECRET_or_BBPTR(atom))) {
                if (isBogusAtom(atom))
                   return True;
             }
@@ -6647,7 +6647,7 @@ static void do_origins_Dirty ( MCEnv* mce, IRDirty* d )
    for (i = 0; d->args[i]; i++) {
       IRAtom* arg = d->args[i];
       if ( (d->cee->mcx_mask & (1<<i))
-           || UNLIKELY(is_IRExprP__VECRET_or_BBPTR(arg)) ) {
+           || UNLIKELY(is_IRExpr_VECRET_or_BBPTR(arg)) ) {
          /* ignore this arg */
       } else {
          here = schemeE( mce, arg );