Apply feedback

Author: monthdev

clang/lib/AST/ByteCode/InterpBuiltin.cpp

@@ -3003,35 +3003,6 @@ static bool interp__builtin_x86_insert_subvector(InterpState &S, CodePtr OpPC,
   return true;
 }
 
-static bool interp__builtin_ia32_psign_op(InterpState &S, CodePtr OpPC,
-                                          const CallExpr *Call) {
-  assert(Call->getNumArgs() == 2);
-
-  const Pointer &B = S.Stk.pop<Pointer>();
-  const Pointer &A = S.Stk.pop<Pointer>();
-  const Pointer &Result = S.Stk.peek<Pointer>();
-
-  unsigned ResultLen = A.getNumElems();
-  QualType ElemQT = getElemType(A);
-  OptPrimType ElemT = S.getContext().classify(ElemQT);
-  unsigned ElemBitWidth = S.getASTContext().getTypeSize(ElemQT);
-  bool ResultElemUnsigned = ElemQT->isUnsignedIntegerOrEnumerationType();
-
-  INT_TYPE_SWITCH_NO_BOOL(*ElemT, {
-    for (unsigned I = 0; I != ResultLen; ++I) {
-      APSInt AElem = A.elem<T>(I).toAPSInt();
-      APSInt BElem = B.elem<T>(I).toAPSInt();
-      APSInt ResultElem =
-          (BElem.isNegative() ? -AElem
-           : BElem.isZero()   ? APSInt(ElemBitWidth, ResultElemUnsigned)
-                              : AElem);
-      Result.elem<T>(I) = static_cast<T>(ResultElem);
-    }
-  });
-  Result.initializeAllElements();
-  return true;
-}
-
 static bool interp__builtin_ia32_pternlog(InterpState &S, CodePtr OpPC,
                                           const CallExpr *Call, bool MaskZ) {
   assert(Call->getNumArgs() == 5);
@@ -3665,7 +3636,12 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
   case X86::BI__builtin_ia32_psignw256:
   case X86::BI__builtin_ia32_psignd128:
   case X86::BI__builtin_ia32_psignd256:
-    return interp__builtin_ia32_psign_op(S, OpPC, Call);
+    return interp__builtin_elementwise_int_binop(
+        S, OpPC, Call, [](const APSInt &AElem, const APSInt &BElem) -> APInt {
+          return BElem.isNegative() ? static_cast<const APInt &>(-AElem)
+                 : BElem.isZero()   ? APInt(AElem.getBitWidth(), 0)
+                                    : static_cast<const APInt &>(AElem);
+        });
 
   case clang::X86::BI__builtin_ia32_pavgb128:
   case clang::X86::BI__builtin_ia32_pavgw128:

clang/lib/AST/ExprConstant.cpp

@@ -12250,30 +12250,13 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
   case X86::BI__builtin_ia32_psignw128:
   case X86::BI__builtin_ia32_psignw256:
   case X86::BI__builtin_ia32_psignd128:
-  case X86::BI__builtin_ia32_psignd256: {
-    APValue ASource, BSource;
-    if (!EvaluateAsRValue(Info, E->getArg(0), ASource) ||
-        !EvaluateAsRValue(Info, E->getArg(1), BSource))
-      return false;
-    unsigned SourceLen = ASource.getVectorLength();
-    const VectorType *VT = E->getArg(0)->getType()->castAs<VectorType>();
-    QualType ElemQT = VT->getElementType();
-    unsigned ElemBitWidth = Info.Ctx.getTypeSize(ElemQT);
-    bool ResultElemUnsigned = ElemQT->isUnsignedIntegerOrEnumerationType();
-
-    SmallVector<APValue, 16> Result;
-    Result.reserve(SourceLen);
-    for (unsigned I = 0; I != SourceLen; ++I) {
-      APSInt &AElem = ASource.getVectorElt(I).getInt();
-      APSInt &BElem = BSource.getVectorElt(I).getInt();
-      APSInt ResultElem =
-          (BElem.isNegative() ? -AElem
-           : BElem.isZero()   ? APSInt(ElemBitWidth, ResultElemUnsigned)
-                              : AElem);
-      Result.emplace_back(ResultElem);
-    }
-    return Success(APValue(Result.data(), Result.size()), E);
-  }
+  case X86::BI__builtin_ia32_psignd256:
+    return EvaluateBinOpExpr(
+        [](const APSInt &AElem, const APSInt &BElem) -> APInt {
+          return BElem.isNegative() ? static_cast<const APInt &>(-AElem)
+                 : BElem.isZero()   ? APInt(AElem.getBitWidth(), 0)
+                                    : static_cast<const APInt &>(AElem);
+        });
 
   case X86::BI__builtin_ia32_blendvpd:
   case X86::BI__builtin_ia32_blendvpd256: