Edits

Author: ckoparkar

clang/lib/AST/ByteCode/InterpBuiltin.cpp

@@ -2822,46 +2822,43 @@ static bool interp__builtin_elementwise_fsh(InterpState &S, CodePtr OpPC,
                                             unsigned BuiltinID) {
   assert(Call->getNumArgs() == 3);
 
-  const QualType &Arg1Type = Call->getArg(0)->getType();
-  const QualType &Arg2Type = Call->getArg(1)->getType();
-  const QualType &Arg3Type = Call->getArg(2)->getType();
+  const QualType Arg0Type = Call->getArg(0)->getType();
+  const QualType Arg1Type = Call->getArg(1)->getType();
+  const QualType Arg2Type = Call->getArg(2)->getType();
 
   // Non-vector integer types.
-  if (!Arg1Type->isVectorType()) {
+  if (!Arg0Type->isVectorType()) {
+    assert(!Arg1Type->isVectorType());
     assert(!Arg2Type->isVectorType());
-    assert(!Arg3Type->isVectorType());
-    const APSInt &Shift = popToAPSInt(
-        S.Stk, *S.getContext().classify(Call->getArg(2)->getType()));
-    const APSInt &Lo = popToAPSInt(
-        S.Stk, *S.getContext().classify(Call->getArg(1)->getType()));
-    const APSInt &Hi = popToAPSInt(
-        S.Stk, *S.getContext().classify(Call->getArg(0)->getType()));
+    const APSInt &Shift =
+      popToAPSInt(S.Stk, *S.getContext().classify(Arg2Type));
+    const APSInt &Lo = popToAPSInt(S.Stk, *S.getContext().classify(Arg1Type));
+    const APSInt &Hi = popToAPSInt(S.Stk, *S.getContext().classify(Arg0Type));
     APSInt Result;
-    if (BuiltinID == Builtin::BI__builtin_elementwise_fshl) {
+    if (BuiltinID == Builtin::BI__builtin_elementwise_fshl)
       Result = APSInt(llvm::APIntOps::fshl(Hi, Lo, Shift), Hi.isUnsigned());
-    } else if (BuiltinID == Builtin::BI__builtin_elementwise_fshr) {
+    else if (BuiltinID == Builtin::BI__builtin_elementwise_fshr)
       Result = APSInt(llvm::APIntOps::fshr(Hi, Lo, Shift), Hi.isUnsigned());
-    } else {
+    else
       llvm_unreachable("Wrong builtin ID");
-    }
     pushInteger(S, Result, Call->getType());
     return true;
   }
 
   // Vector type.
-  assert(Arg1Type->isVectorType() && Arg2Type->isVectorType() &&
-         Arg3Type->isVectorType());
+  assert(Arg0Type->isVectorType() && Arg1Type->isVectorType() &&
+         Arg2Type->isVectorType());
 
-  const VectorType *VecT = Arg1Type->castAs<VectorType>();
+  const auto *VecT = Arg0Type->castAs<VectorType>();
   const PrimType &ElemT = *S.getContext().classify(VecT->getElementType());
   unsigned NumElems = VecT->getNumElements();
 
   assert(VecT->getElementType() ==
-             Arg2Type->castAs<VectorType>()->getElementType() &&
+             Arg1Type->castAs<VectorType>()->getElementType() &&
          VecT->getElementType() ==
-             Arg3Type->castAs<VectorType>()->getElementType());
-  assert(NumElems == Arg2Type->castAs<VectorType>()->getNumElements() &&
-         NumElems == Arg3Type->castAs<VectorType>()->getNumElements());
+             Arg2Type->castAs<VectorType>()->getElementType());
+  assert(NumElems == Arg1Type->castAs<VectorType>()->getNumElements() &&
+         NumElems == Arg2Type->castAs<VectorType>()->getNumElements());
   assert(VecT->getElementType()->isIntegralOrEnumerationType());
 
   const Pointer &VecShift = S.Stk.pop<Pointer>();

clang/lib/AST/ExprConstant.cpp

@@ -11950,7 +11950,7 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
         !EvaluateAsRValue(Info, E->getArg(2), SourceShift))
       return false;
 
-    const QualType &DestEltTy =
+    const QualType DestEltTy =
         E->getType()->castAs<VectorType>()->getElementType();
 
     if (!DestEltTy->isIntegerType())