Refactor and remove unnecessary code

Author: SeongjaeP

clang/lib/AST/ByteCode/InterpBuiltin.cpp

@@ -2877,9 +2877,6 @@ static bool interp__builtin_x86_extract_vector(InterpState &S, CodePtr OpPC,
   unsigned SrcElems = Src.getNumElems();
   unsigned DstElems = Dst.getNumElems();
 
-  if (SrcElems == 0 || DstElems == 0 || (SrcElems % DstElems) != 0)
-    return false;
-
   unsigned NumLanes = SrcElems / DstElems;
   unsigned Lane = static_cast<unsigned>(Index % NumLanes);
   unsigned ExtractPos = Lane * DstElems;
@@ -2917,8 +2914,6 @@ static bool interp__builtin_x86_extract_vector_masked(InterpState &S, CodePtr Op
 
   unsigned SrcElems = Src.getNumElems();
   unsigned DstElems = Dst.getNumElems();
-  if (!SrcElems || !DstElems || (SrcElems % DstElems) != 0)
-    return false;
 
   PrimType ElemT = Src.getFieldDesc()->getPrimType();
   if (ElemT != Dst.getFieldDesc()->getPrimType() ||
@@ -2929,11 +2924,9 @@ static bool interp__builtin_x86_extract_vector_masked(InterpState &S, CodePtr Op
   unsigned Lane = static_cast<unsigned>(ImmAPS.getZExtValue() % NumLanes);
   unsigned Base = Lane * DstElems;
 
-  uint64_t Mask = MaskAPS.getZExtValue();
-
   TYPE_SWITCH(ElemT, {
     for (unsigned I = 0; I != DstElems; ++I) {
-      if ((Mask >> I) & 1)
+      if (MaskAPS[I])
         Dst.elem<T>(I) = Src.elem<T>(Base + I);
       else
         Dst.elem<T>(I) = Merge.elem<T>(I);   

clang/lib/AST/ExprConstant.cpp

@@ -11787,13 +11787,8 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
       return false;
 
     const auto *RetVT = E->getType()->castAs<VectorType>();
-    if (!RetVT) return false;
-
     unsigned RetLen = RetVT->getNumElements();
     unsigned SrcLen = SourceVec.getVectorLength();
-    if (SrcLen != RetLen * 2) 
-      return false;
-
     unsigned Idx = SourceImm.getInt().getZExtValue() & 1;
 
     SmallVector<APValue, 32> ResultElements;
@@ -11820,28 +11815,25 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
     APValue SourceVec, MergeVec;
     APSInt Imm, MaskImm;
 
-    if (!EvaluateAsRValue(Info, E->getArg(0), SourceVec) ||  
-      !EvaluateInteger(E->getArg(1), Imm, Info) ||  
-      !EvaluateAsRValue(Info, E->getArg(2), MergeVec)  ||  
-      !EvaluateInteger(E->getArg(3), MaskImm, Info))      
-    return false;
+    if (!EvaluateAsRValue(Info, E->getArg(0), SourceVec) ||
+        !EvaluateInteger(E->getArg(1), Imm, Info) ||
+        !EvaluateAsRValue(Info, E->getArg(2), MergeVec) ||
+        !EvaluateInteger(E->getArg(3), MaskImm, Info))
+      return false;
 
     const auto *RetVT = E->getType()->castAs<VectorType>();
     unsigned RetLen = RetVT->getNumElements();
 
     if (!SourceVec.isVector() || !MergeVec.isVector()) return false;
     unsigned SrcLen = SourceVec.getVectorLength();
-    if (!SrcLen || !RetLen || (SrcLen % RetLen) != 0) return false;
-
     unsigned Lanes = SrcLen / RetLen;
     unsigned Lane = static_cast<unsigned>(Imm.getZExtValue() % Lanes);
     unsigned Base = Lane * RetLen;
-    uint64_t Mask = MaskImm.getZExtValue();
 
     SmallVector<APValue, 32> ResultElements;
     ResultElements.reserve(RetLen);
     for (unsigned I = 0; I < RetLen; ++I) {
-      if ((Mask >> I) & 1)
+      if (MaskImm[I])
         ResultElements.push_back(SourceVec.getVectorElt(Base + I));
       else
         ResultElements.push_back(MergeVec.getVectorElt(I));