Update return type to match upstream (std::pair<unsigned, unsigned> -> std::pair<unsigned, int>)

Author: chaitanyav

clang/lib/AST/ByteCode/InterpBuiltin.cpp

@@ -4466,19 +4466,19 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
  case X86::BI__builtin_ia32_vpermi2varpd128:
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0x1;
+ int Offset = ShuffleMask & 0x1;
  unsigned SrcIdx = (ShuffleMask >> 1) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  });
  case X86::BI__builtin_ia32_vpermi2vard128:
  case X86::BI__builtin_ia32_vpermi2varps128:
  case X86::BI__builtin_ia32_vpermi2varq256:
  case X86::BI__builtin_ia32_vpermi2varpd256:
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0x3;
+ int Offset = ShuffleMask & 0x3;
  unsigned SrcIdx = (ShuffleMask >> 2) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  });
  case X86::BI__builtin_ia32_vpermi2varhi128:
  case X86::BI__builtin_ia32_vpermi2vard256:
@@ -4487,34 +4487,34 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
  case X86::BI__builtin_ia32_vpermi2varpd512:
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0x7;
+ int Offset = ShuffleMask & 0x7;
  unsigned SrcIdx = (ShuffleMask >> 3) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  });
  case X86::BI__builtin_ia32_vpermi2varqi128:
  case X86::BI__builtin_ia32_vpermi2varhi256:
  case X86::BI__builtin_ia32_vpermi2vard512:
  case X86::BI__builtin_ia32_vpermi2varps512:
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0xF;
+ int Offset = ShuffleMask & 0xF;
  unsigned SrcIdx = (ShuffleMask >> 4) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  });
  case X86::BI__builtin_ia32_vpermi2varqi256:
  case X86::BI__builtin_ia32_vpermi2varhi512:
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0x1F;
+ int Offset = ShuffleMask & 0x1F;
  unsigned SrcIdx = (ShuffleMask >> 5) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  });
  case X86::BI__builtin_ia32_vpermi2varqi512:
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0x3F;
+ int Offset = ShuffleMask & 0x3F;
  unsigned SrcIdx = (ShuffleMask >> 6) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  });
  case X86::BI__builtin_ia32_pshufb128:
  case X86::BI__builtin_ia32_pshufb256:

clang/lib/AST/ExprConstant.cpp

@@ -13102,9 +13102,9 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  APValue R;
  if (!evalShuffleGeneric(
  Info, E, R, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0x1;
+ int Offset = ShuffleMask & 0x1;
  unsigned SrcIdx = (ShuffleMask >> 1) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  }))
  return false;
  return Success(R, E);
@@ -13116,9 +13116,9 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  APValue R;
  if (!evalShuffleGeneric(
  Info, E, R, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0x3;
+ int Offset = ShuffleMask & 0x3;
  unsigned SrcIdx = (ShuffleMask >> 2) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  }))
  return false;
  return Success(R, E);
@@ -13131,9 +13131,9 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  APValue R;
  if (!evalShuffleGeneric(
  Info, E, R, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0x7;
+ int Offset = ShuffleMask & 0x7;
  unsigned SrcIdx = (ShuffleMask >> 3) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  }))
  return false;
  return Success(R, E);
@@ -13145,9 +13145,9 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  APValue R;
  if (!evalShuffleGeneric(
  Info, E, R, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0xF;
+ int Offset = ShuffleMask & 0xF;
  unsigned SrcIdx = (ShuffleMask >> 4) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  }))
  return false;
  return Success(R, E);
@@ -13157,9 +13157,9 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  APValue R;
  if (!evalShuffleGeneric(
  Info, E, R, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0x1F;
+ int Offset = ShuffleMask & 0x1F;
  unsigned SrcIdx = (ShuffleMask >> 5) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  }))
  return false;
  return Success(R, E);
@@ -13168,9 +13168,9 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  APValue R;
  if (!evalShuffleGeneric(
  Info, E, R, [](unsigned DstIdx, unsigned ShuffleMask) {
- unsigned Offset = ShuffleMask & 0x3F;
+ int Offset = ShuffleMask & 0x3F;
  unsigned SrcIdx = (ShuffleMask >> 6) & 0x1 ? 1 : 0;
- return std::pair<unsigned, unsigned>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{SrcIdx, Offset};
  }))
  return false;
  return Success(R, E);