Address feedback from code review

* Use tmp variable to hold the inedx of the byte to avoid duplication
and help with clang-format

Author: chaitanyav

clang/lib/AST/ByteCode/InterpBuiltin.cpp

@@ -3566,21 +3566,17 @@ static bool interp__builtin_ia32_multishiftqb(InterpState &S, CodePtr OpPC,
     }
 
     for (unsigned ByteIdx = 0; ByteIdx != NumBytesInQWord; ++ByteIdx) {
+      unsigned Idx = QWordId * NumBytesInQWord + ByteIdx;
       uint64_t Ctrl = 0;
-      INT_TYPE_SWITCH(ElemT, {
-        Ctrl = static_cast<uint64_t>(
-                   APtr.elem<T>(QWordId * NumBytesInQWord + ByteIdx)) &
-               0x3F;
-      });
+      INT_TYPE_SWITCH(
+          ElemT, { Ctrl = static_cast<uint64_t>(APtr.elem<T>(Idx)) & 0x3F; });
 
       APInt Byte(8, 0);
       for (unsigned BitIdx = 0; BitIdx != NumBitsInByte; ++BitIdx) {
         Byte.setBitVal(BitIdx, BQWord[(Ctrl + BitIdx) & 0x3F]);
       }
-      INT_TYPE_SWITCH(ElemT, {
-        Dst.elem<T>(QWordId * NumBytesInQWord + ByteIdx) =
-            T::from(Byte.getZExtValue());
-      });
+      INT_TYPE_SWITCH(ElemT,
+                      { Dst.elem<T>(Idx) = T::from(Byte.getZExtValue()); });
     }
   }
 

clang/lib/AST/ExprConstant.cpp

@@ -13122,10 +13122,8 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
       }
 
       for (unsigned ByteIdx = 0; ByteIdx != NumBytesInQWord; ++ByteIdx) {
-        uint64_t Ctrl = A.getVectorElt(QWordId * NumBytesInQWord + ByteIdx)
-                            .getInt()
-                            .getZExtValue() &
-                        0x3F;
+        unsigned Idx = QWordId * NumBytesInQWord + ByteIdx;
+        uint64_t Ctrl = A.getVectorElt(Idx).getInt().getZExtValue() & 0x3F;
 
         APInt Byte(8, 0);
         for (unsigned BitIdx = 0; BitIdx != NumBitsInByte; ++BitIdx) {