Remove strict check and generalise error message

Author: gbMattN

clang/lib/CodeGen/CGExprCXX.cpp

@@ -1747,7 +1747,7 @@ llvm::Value *CodeGenFunction::EmitCXXNewExpr(const CXXNewExpr *E) {
   SourceManager &SM = getContext().getSourceManager();
   SourceLocation Loc = E->getOperatorNew()->getLocation();
   bool IsCustomOverload = !SM.isInSystemHeader(Loc);
-  if (SanOpts.has(SanitizerKind::Alignment) && IsCustomOverload &&
+  if (SanOpts.has(SanitizerKind::Alignment) &&
       (DefaultTargetAlignment >
        CGM.getContext().getTypeAlignInChars(allocType).getQuantity()))
     checkKind = CodeGenFunction::TCK_ConstructorCallOverloadedNew;

compiler-rt/lib/ubsan/ubsan_handlers.cpp

@@ -92,7 +92,7 @@ extern const char *const TypeCheckKinds[] = {
     "cast to virtual base of",
     "_Nonnull binding to",
     "dynamic operation on",
-    "constructor call with pointer from overloaded operator new on"};
+    "constructor call with pointer from operator new on"};
 }
 
 static void handleTypeMismatchImpl(TypeMismatchData *Data, ValueHandle Pointer,
@@ -134,7 +134,7 @@ static void handleTypeMismatchImpl(TypeMismatchData *Data, ValueHandle Pointer,
   case ErrorType::AlignmentOnOverloadedNew:
     Diag(Loc, DL_Error, ET,
          "%0 misaligned address %1 for type %2, "
-         "which requires target minimum assumed alignment of %3")
+         "which requires target minimum assumed %3 byte alignment")
         << TypeCheckKinds[Data->TypeCheckKind] << (void *)Pointer << Data->Type
         << Alignment;
     break;

compiler-rt/test/ubsan/TestCases/TypeCheck/minimum-alignment.cpp

@@ -30,7 +30,7 @@ struct Foo {
 
 static_assert(alignof(Foo) == 8);
 int main() {
-  // CHECK: runtime error: constructor call with pointer from overloaded operator new on misaligned address 0x{{.*}} for type 'Foo', which requires target minimum assumed alignment of 16
+  // CHECK: runtime error: constructor call with pointer from operator new on misaligned address 0x{{.*}} for type 'Foo', which requires target minimum assumed 16 byte alignment
   Foo *f = new Foo;
   return 0;
 }

compiler-rt/test/ubsan/TestCases/TypeCheck/misaligned.cpp

@@ -101,7 +101,7 @@ int main(int, char **argv) {
     return s->f() && 0;
 
   case 'n':
-    // CHECK-NEW: misaligned.cpp:[[@LINE+4]]{{(:21)?}}: runtime error: constructor call on misaligned address [[PTR:0x[0-9a-f]*]] for type 'S', which requires 4 byte alignment
+    // CHECK-NEW: misaligned.cpp:[[@LINE+4]]{{(:21)?}}: runtime error: constructor call with pointer from operator new on misaligned address [[PTR:0x[0-9a-f]*]] for type 'S', which requires target minimum assumed 4 byte alignment
     // CHECK-NEW-NEXT: [[PTR]]: note: pointer points here
     // CHECK-NEW-NEXT: {{^ 00 00 00 01 02 03 04  05}}
     // CHECK-NEW-NEXT: {{^             \^}}