diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 737814b3ddcb..d2b1692efaf3 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -9631,7 +9631,11 @@ static uint64_t getRVVTypeSize(ASTContext &Context, const BuiltinType *Ty) {
     EltSize = 1;
 
   unsigned MinElts = Info.EC.getKnownMinValue();
+#ifdef SYCLomatic_CUSTOMIZATION
+  return (uint64_t)VScale->first * (uint64_t)MinElts * (uint64_t)EltSize;
+#else
   return VScale->first * MinElts * EltSize;
+#endif
 }
 
 bool ASTContext::areCompatibleRVVTypes(QualType FirstType,