!fixup move to CGF::EmitMatrixIndexExpr

Author: fhahn

clang/lib/CodeGen/CGExpr.cpp

@@ -4392,22 +4392,23 @@ LValue CodeGenFunction::EmitArraySubscriptExpr(const ArraySubscriptExpr *E,
   return LV;
 }
 
+llvm::Value *CodeGenFunction::EmitMatrixIndexExpr(const Expr *E) {
+  llvm::Value *Idx = EmitScalarExpr(E);
+  if (Idx->getType() == IntPtrTy)
+    return Idx;
+  bool IsSigned = E->getType()->isSignedIntegerOrEnumerationType();
+  return Builder.CreateIntCast(Idx, IntPtrTy, IsSigned);
+}
+
 LValue CodeGenFunction::EmitMatrixSubscriptExpr(const MatrixSubscriptExpr *E) {
   assert(
       !E->isIncomplete() &&
       "incomplete matrix subscript expressions should be rejected during Sema");
   LValue Base = EmitLValue(E->getBase());
 
-  // Extend or truncate the index type to 32 or 64-bits.
-  auto EmitIndex = [this](const Expr *E) {
-    llvm::Value *Idx = EmitScalarExpr(E);
-    bool IsSigned = E->getType()->isSignedIntegerOrEnumerationType();
-    if (Idx->getType() != IntPtrTy)
-      Idx = Builder.CreateIntCast(Idx, IntPtrTy, IsSigned);
-    return Idx;
-  };
-  llvm::Value *RowIdx = EmitIndex(E->getRowIdx());
-  llvm::Value *ColIdx = EmitIndex(E->getColumnIdx());
+  // Extend or truncate the index type to 32 or 64-bits if needed.
+  llvm::Value *RowIdx = EmitMatrixIndexExpr(E->getRowIdx());
+  llvm::Value *ColIdx = EmitMatrixIndexExpr(E->getColumnIdx());
 
   llvm::Value *NumRows = Builder.getIntN(
       RowIdx->getType()->getScalarSizeInBits(),

clang/lib/CodeGen/CGExprScalar.cpp

@@ -1995,15 +1995,8 @@ Value *ScalarExprEmitter::VisitMatrixSubscriptExpr(MatrixSubscriptExpr *E) {
 
   // Handle the vector case.  The base must be a vector, the index must be an
   // integer value.
-  auto VisitIndex = [this](Expr *E) {
-    llvm::Value *Idx = Visit(E);
-    bool IsSigned = E->getType()->isSignedIntegerOrEnumerationType();
-    if (Idx->getType() != CGF.IntPtrTy)
-      Idx = Builder.CreateIntCast(Idx, CGF.IntPtrTy, IsSigned);
-    return Idx;
-  };
-  Value *RowIdx = VisitIndex(E->getRowIdx());
-  Value *ColumnIdx = VisitIndex(E->getColumnIdx());
+  Value *RowIdx = CGF.EmitMatrixIndexExpr(E->getRowIdx());
+  Value *ColumnIdx = CGF.EmitMatrixIndexExpr(E->getColumnIdx());
 
   const auto *MatrixTy = E->getBase()->getType()->castAs<ConstantMatrixType>();
   unsigned NumRows = MatrixTy->getNumRows();

clang/lib/CodeGen/CodeGenFunction.h

@@ -4280,6 +4280,7 @@ class CodeGenFunction : public CodeGenTypeCache {
   LValue EmitUnaryOpLValue(const UnaryOperator *E);
   LValue EmitArraySubscriptExpr(const ArraySubscriptExpr *E,
                                 bool Accessed = false);
+  llvm::Value *EmitMatrixIndexExpr(const Expr *E);
   LValue EmitMatrixSubscriptExpr(const MatrixSubscriptExpr *E);
   LValue EmitArraySectionExpr(const ArraySectionExpr *E,
                               bool IsLowerBound = true);