Created helper function for calling EmitScalarRangeCheck() and adding range metadata. Made getRangeForLoadFromType private function as it was before f25e687.

Author: janagor

clang/lib/CodeGen/CGAtomic.cpp

@@ -590,16 +590,7 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest,
     llvm::LoadInst *Load = CGF.Builder.CreateLoad(Ptr);
     Load->setAtomic(Order, Scope);
     Load->setVolatile(E->isVolatile());
-    QualType Ty = E->getValueType();
-    if (CGF.EmitScalarRangeCheck(Load, Ty, E->getExprLoc())) {
-    } else if (CGF.CGM.getCodeGenOpts().OptimizationLevel > 0) {
-      CGF.getRangeForLoadFromType(Ty);
-      if (llvm::MDNode *RangeInfo = CGF.getRangeForLoadFromType(Ty)) {
-        Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo);
-        Load->setMetadata(llvm::LLVMContext::MD_noundef,
-                          llvm::MDNode::get(CGF.getLLVMContext(), {}));
-      }
-    }
+    CGF.maybeAttachRangeForLoad(Load, E->getValueType(), E->getExprLoc());
     CGF.Builder.CreateStore(Load, Dest);
     return;
   }

clang/lib/CodeGen/CGExpr.cpp

@@ -1919,6 +1919,20 @@ llvm::MDNode *CodeGenFunction::getRangeForLoadFromType(QualType Ty) {
   return MDHelper.createRange(Min, End);
 }
 
+void CodeGenFunction::maybeAttachRangeForLoad(llvm::LoadInst *Load, QualType Ty,
+                                              SourceLocation Loc) {
+  if (EmitScalarRangeCheck(Load, Ty, Loc)) {
+    // In order to prevent the optimizer from throwing away the check, don't
+    // attach range metadata to the load.
+  } else if (CGM.getCodeGenOpts().OptimizationLevel > 0) {
+    if (llvm::MDNode *RangeInfo = getRangeForLoadFromType(Ty)) {
+      Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo);
+      Load->setMetadata(llvm::LLVMContext::MD_noundef,
+                        llvm::MDNode::get(CGM.getLLVMContext(), {}));
+    }
+  }
+}
+
 bool CodeGenFunction::EmitScalarRangeCheck(llvm::Value *Value, QualType Ty,
                                            SourceLocation Loc) {
   bool HasBoolCheck = SanOpts.has(SanitizerKind::Bool);
@@ -2037,15 +2051,7 @@ llvm::Value *CodeGenFunction::EmitLoadOfScalar(Address Addr, bool Volatile,
 
   CGM.DecorateInstructionWithTBAA(Load, TBAAInfo);
 
-  if (EmitScalarRangeCheck(Load, Ty, Loc)) {
-    // In order to prevent the optimizer from throwing away the check, don't
-    // attach range metadata to the load.
-  } else if (CGM.getCodeGenOpts().OptimizationLevel > 0)
-    if (llvm::MDNode *RangeInfo = getRangeForLoadFromType(Ty)) {
-      Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo);
-      Load->setMetadata(llvm::LLVMContext::MD_noundef,
-                        llvm::MDNode::get(getLLVMContext(), {}));
-    }
+  maybeAttachRangeForLoad(Load, Ty, Loc);
 
   return EmitFromMemory(Load, Ty);
 }

clang/lib/CodeGen/CodeGenFunction.h

@@ -5306,7 +5306,8 @@ class CodeGenFunction : public CodeGenTypeCache {
                                      unsigned NumElementsDst,
                                      const llvm::Twine &Name = "");
 
-  llvm::MDNode *getRangeForLoadFromType(QualType Ty);
+  void maybeAttachRangeForLoad(llvm::LoadInst *Load, QualType Ty,
+                               SourceLocation Loc);
 
 private:
   // Emits a convergence_loop instruction for the given |BB|, with |ParentToken|
@@ -5323,6 +5324,7 @@ class CodeGenFunction : public CodeGenTypeCache {
   getOrEmitConvergenceEntryToken(llvm::Function *F);
 
 private:
+  llvm::MDNode *getRangeForLoadFromType(QualType Ty);
   void EmitReturnOfRValue(RValue RV, QualType Ty);
 
   void deferPlaceholderReplacement(llvm::Instruction *Old, llvm::Value *New);