handle special case 8 in interp__builtin_bswap and fix extra space in VisitBuiltinCallExpr

Author: clingfei

clang/lib/AST/ByteCode/InterpBuiltin.cpp

@@ -1004,8 +1004,10 @@ static bool interp__builtin_bswap(InterpState &S, CodePtr OpPC,
                                   const CallExpr *Call) {
   const APSInt &Val = popToAPSInt(S, Call->getArg(0));
   assert(Val.getActiveBits() <= 64);
-
-  pushInteger(S, Val.byteSwap(), Call->getType());
+  if (Val.getBitWidth() == 8)
+    pushInteger(S, Val, Call->getType());
+  else
+    pushInteger(S, Val.byteSwap(), Call->getType());
   return true;
 }
 
@@ -3288,15 +3290,7 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
   case Builtin::BI__builtin_elementwise_ctzg:
     return interp__builtin_elementwise_countzeroes(S, OpPC, Frame, Call,
                                                    BuiltinID);
-  case Builtin::BI__builtin_bswapg: {
-    const APSInt &Val = popToAPSInt(S, Call->getArg(0));
-      assert(Val.getActiveBits() <= 64);
-    if (Val.getBitWidth() == 8)
-        pushInteger(S, Val, Call->getType());
-    else
-        pushInteger(S, Val.byteSwap(), Call->getType());
-    return true;
-  }
+  case Builtin::BI__builtin_bswapg:
   case Builtin::BI__builtin_bswap16:
   case Builtin::BI__builtin_bswap32:
   case Builtin::BI__builtin_bswap64:

clang/lib/AST/ExprConstant.cpp

@@ -13986,10 +13986,8 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
     APSInt Val;
     if (!EvaluateInteger(E->getArg(0), Val, Info))
       return false;
-    if (Val.getBitWidth() == 8) {
-        bool ret =  Success(Val, E);
-        return ret;
-    }
+    if (Val.getBitWidth() == 8)
+      return Success(Val, E);
 
     return Success(Val.byteSwap(), E);
   }