Florian1 feedback

Author: thurstond

clang/lib/CodeGen/CGExprScalar.cpp

@@ -4238,18 +4238,19 @@ static Value *emitPointerArithmetic(CodeGenFunction &CGF,
                              PtrTy->getPointerAddressSpace()))
       return Ptr;
     // The inbounds GEP of null is valid iff the index is zero.
+    auto CheckOrdinal = SanitizerKind::SO_PointerOverflow;
     auto CheckHandler = SanitizerHandler::PointerOverflow;
-    CodeGenFunction::SanitizerScope SanScope(
-        &CGF, {SanitizerKind::SO_PointerOverflow}, CheckHandler);
+    CodeGenFunction::SanitizerScope SanScope(&CGF, {CheckOrdinal},
+                                             CheckHandler);
     Value *IsZeroIndex = CGF.Builder.CreateIsNull(index);
     llvm::Constant *StaticArgs[] = {
         CGF.EmitCheckSourceLocation(op.E->getExprLoc())};
     llvm::Type *IntPtrTy = DL.getIntPtrType(PtrTy);
     Value *IntPtr = llvm::Constant::getNullValue(IntPtrTy);
     Value *ComputedGEP = CGF.Builder.CreateZExtOrTrunc(index, IntPtrTy);
     Value *DynamicArgs[] = {IntPtr, ComputedGEP};
-    CGF.EmitCheck({{IsZeroIndex, SanitizerKind::SO_PointerOverflow}},
-                  CheckHandler, StaticArgs, DynamicArgs);
+    CGF.EmitCheck({{IsZeroIndex, CheckOrdinal}}, CheckHandler, StaticArgs,
+                  DynamicArgs);
     return Ptr;
   }
 
@@ -4770,16 +4771,16 @@ Value *ScalarExprEmitter::EmitShl(const BinOpInfo &Ops) {
     RHS = ConstrainShiftValue(Ops.LHS, RHS, "shl.mask");
   else if ((SanitizeBase || SanitizeExponent) &&
            isa<llvm::IntegerType>(Ops.LHS->getType())) {
-    SmallVector<SanitizerKind::SanitizerOrdinal, 3> Kinds;
+    SmallVector<SanitizerKind::SanitizerOrdinal, 3> Ordinals;
     if (SanitizeSignedBase)
-      Kinds.push_back(SanitizerKind::SO_ShiftBase);
+      Ordinals.push_back(SanitizerKind::SO_ShiftBase);
     if (SanitizeUnsignedBase)
-      Kinds.push_back(SanitizerKind::SO_UnsignedShiftBase);
+      Ordinals.push_back(SanitizerKind::SO_UnsignedShiftBase);
     if (SanitizeExponent)
-      Kinds.push_back(SanitizerKind::SO_ShiftExponent);
+      Ordinals.push_back(SanitizerKind::SO_ShiftExponent);
 
     CodeGenFunction::SanitizerScope SanScope(
-        &CGF, Kinds, SanitizerHandler::ShiftOutOfBounds);
+        &CGF, Ordinals, SanitizerHandler::ShiftOutOfBounds);
     SmallVector<std::pair<Value *, SanitizerKind::SanitizerOrdinal>, 2> Checks;
     bool RHSIsSigned = Ops.rhsHasSignedIntegerRepresentation();
     llvm::Value *WidthMinusOne =

clang/lib/CodeGen/CodeGenFunction.cpp

@@ -2757,24 +2757,20 @@ CodeGenFunction::CGCapturedStmtInfo::~CGCapturedStmtInfo() { }
 CodeGenFunction::SanitizerScope::SanitizerScope(CodeGenFunction *CGF)
     : CGF(CGF) {
   assert(!CGF->IsSanitizerScope);
+  assert(!ApplyTrapDI);
   CGF->IsSanitizerScope = true;
-
-  assert(!this->ApplyTrapDI);
 }
 
 CodeGenFunction::SanitizerScope::SanitizerScope(
     CodeGenFunction *CGF, ArrayRef<SanitizerKind::SanitizerOrdinal> Ordinals,
     SanitizerHandler Handler)
     : SanitizerScope(CGF) {
-  this->ApplyTrapDI = new ApplyDebugLocation(
-      *CGF, CGF->SanitizerAnnotateDebugInfo(Ordinals, Handler));
+  ApplyTrapDI = std::unique_ptr<ApplyDebugLocation>(new ApplyDebugLocation(
+      *CGF, CGF->SanitizerAnnotateDebugInfo(Ordinals, Handler)));
 }
 
 CodeGenFunction::SanitizerScope::~SanitizerScope() {
   CGF->IsSanitizerScope = false;
-
-  delete ((ApplyDebugLocation *)this->ApplyTrapDI);
-  this->ApplyTrapDI = nullptr;
 }
 
 void CodeGenFunction::InsertHelper(llvm::Instruction *I,

clang/lib/CodeGen/CodeGenFunction.h

@@ -272,6 +272,10 @@ class ApplyAtomGroup {
   ~ApplyAtomGroup();
 };
 
+// CGDebugInfo.h is not #included in this header due to overhead
+// (b384d6d6ccc8f4452cd7086061c657ce76b41224)
+class ApplyDebugLocation;
+
 /// CodeGenFunction - This class organizes the per-function state that is used
 /// while generating LLVM code.
 class CodeGenFunction : public CodeGenTypeCache {
@@ -597,9 +601,7 @@ class CodeGenFunction : public CodeGenTypeCache {
   class SanitizerScope {
     CodeGenFunction *CGF;
 
-    // ApplyDebugLocation is undeclared: CGDebugInfo.h is not #included in this
-    // header due to overhead (b384d6d6ccc8f4452cd7086061c657ce76b41224)
-    void *ApplyTrapDI = nullptr;
+    std::unique_ptr<ApplyDebugLocation> ApplyTrapDI;
 
   public:
     SanitizerScope(CodeGenFunction *CGF);