Decrease verbosity of alerts from both queries

Author: jeongsoolee09

cpp/misra/src/rules/RULE-21-6-2/DynamicMemoryManagedManually.ql

@@ -95,7 +95,7 @@ where
     /* ===== 2. The expression takes address of the dynamic memory management functions. ===== */
     expr = dynamicMemoryManagementFunction.getAnAccess() and
     message =
-      "Taking the address of a banned function `" +
+      "Taking the address of banned `" +
         dynamicMemoryManagementFunction.getQualifiedName() + "`."
   )
 select expr, message

cpp/misra/src/rules/RULE-21-6-3/AdvancedMemoryManagementUsed.ql

@@ -23,10 +23,10 @@ class AdvancedMemoryManagementFunction extends Function {
 
   AdvancedMemoryManagementFunction() {
     this instanceof NonStandardNewOrNewArrayOperator and
-    description = "a non-replaceable allocation function as operator `new` / `new[]`"
+    description = "a non-replaceable allocation function"
     or
     this instanceof NonStandardDeleteOrDeleteArrayOperator and
-    description = "a non-replaceable deallocation function as operator `delete` / `delete[]`"
+    description = "a non-replaceable deallocation function"
     or
     this instanceof UninitializedMemoryManagementFunction and
     description = "a function from <memory> that manages uninitialized memory"
@@ -76,22 +76,26 @@ where
     /* 1. The element is a call to one of the advanced management functions. */
     element = advancedMemoryManagementFunction.getACallToThisFunction() and
     message =
-      "Call to banned function `" + advancedMemoryManagementFunction.getName() + "` which is " +
-        advancedMemoryManagementFunction.describe() + "."
+      "Call to banned function `" + advancedMemoryManagementFunction.getName() +
+        //"."
+        "` which is " + advancedMemoryManagementFunction.describe() + "."
     or
     /* 2. The element takes address of the advanced memory management functions. */
     element = advancedMemoryManagementFunction.getAnAccess() and
     message =
-      "This expression takes address of a banned function `" + advancedMemoryManagementFunction.getName() +
+      "Taking the address of a banned function `" + advancedMemoryManagementFunction.getName() +
         "` which is " + advancedMemoryManagementFunction.describe() + "."
+    //  "`."
   )
   or
   (
     element instanceof VacuousDestructorCall or
     element instanceof ExplicitDestructorCall
   ) and
-  message = "This expression is a manual call to a destructor."
+  message = "Manual call to a destructor."
   or
   element instanceof UserDeclaredOperatorNewOrDelete and
-  message = "This is a user-provided declaration of `new` / `new[]` / `delete` / `delete[]`."
+  message =
+    "User-provided declaration of `" +
+      element.(UserDeclaredOperatorNewOrDelete).getFunction().getName() + "`."
 select element, message

cpp/misra/test/rules/RULE-21-6-2/DynamicMemoryManagedManually.expected

@@ -36,49 +36,49 @@
 | test.cpp:151:10:151:16 | call to release | Banned call to `std::unique_ptr<C1[], default_delete<C1[]>>::release`. |
 | test.cpp:152:3:152:15 | call to operator delete[] | Banned call to `operator delete[]`. |
 | test.cpp:158:3:158:12 | call to operator delete | Banned call to `operator delete`. |
-| test.cpp:165:7:165:17 | malloc | Taking the address of a banned function `malloc`. |
-| test.cpp:167:8:167:18 | malloc | Taking the address of a banned function `malloc`. |
-| test.cpp:169:7:169:14 | malloc | Taking the address of a banned function `malloc`. |
-| test.cpp:171:8:171:15 | malloc | Taking the address of a banned function `malloc`. |
-| test.cpp:174:7:174:17 | calloc | Taking the address of a banned function `calloc`. |
-| test.cpp:176:8:176:18 | calloc | Taking the address of a banned function `calloc`. |
-| test.cpp:179:7:179:18 | realloc | Taking the address of a banned function `realloc`. |
-| test.cpp:181:8:181:19 | realloc | Taking the address of a banned function `realloc`. |
-| test.cpp:184:7:184:24 | aligned_alloc | Taking the address of a banned function `aligned_alloc`. |
-| test.cpp:186:8:186:25 | aligned_alloc | Taking the address of a banned function `aligned_alloc`. |
-| test.cpp:189:7:189:15 | free | Taking the address of a banned function `free`. |
-| test.cpp:191:8:191:16 | free | Taking the address of a banned function `free`. |
-| test.cpp:193:7:193:12 | free | Taking the address of a banned function `free`. |
-| test.cpp:195:8:195:13 | free | Taking the address of a banned function `free`. |
-| test.cpp:202:7:202:21 | operator new | Taking the address of a banned function `operator new`. |
-| test.cpp:204:7:204:20 | operator new | Taking the address of a banned function `operator new`. |
-| test.cpp:206:7:206:23 | operator new[] | Taking the address of a banned function `operator new[]`. |
-| test.cpp:208:7:208:22 | operator new[] | Taking the address of a banned function `operator new[]`. |
-| test.cpp:211:7:211:21 | operator new | Taking the address of a banned function `operator new`. |
-| test.cpp:213:7:213:23 | operator new[] | Taking the address of a banned function `operator new[]`. |
-| test.cpp:218:7:218:24 | operator delete | Taking the address of a banned function `operator delete`. |
-| test.cpp:220:7:220:23 | operator delete | Taking the address of a banned function `operator delete`. |
-| test.cpp:222:7:222:26 | operator delete[] | Taking the address of a banned function `operator delete[]`. |
-| test.cpp:223:24:223:42 | operator delete[] | Taking the address of a banned function `operator delete[]`. |
-| test.cpp:227:7:227:24 | operator delete | Taking the address of a banned function `operator delete`. |
-| test.cpp:229:7:229:26 | operator delete[] | Taking the address of a banned function `operator delete[]`. |
-| test.cpp:233:7:233:24 | operator delete | Taking the address of a banned function `operator delete`. |
-| test.cpp:235:7:235:26 | operator delete[] | Taking the address of a banned function `operator delete[]`. |
-| test.cpp:243:13:243:41 | allocate | Taking the address of a banned function `std::allocator<C1>::allocate`. |
-| test.cpp:245:13:245:43 | deallocate | Taking the address of a banned function `std::allocator<C1>::deallocate`. |
-| test.cpp:251:7:251:23 | allocate | Taking the address of a banned function `std::allocator_traits<allocator<C1>>::allocate`. |
-| test.cpp:254:8:254:25 | deallocate | Taking the address of a banned function `std::allocator_traits<allocator<C1>>::deallocate`. |
-| test.cpp:258:13:258:48 | allocate | Taking the address of a banned function `std::pmr::memory_resource::allocate`. |
-| test.cpp:261:7:261:44 | deallocate | Taking the address of a banned function `std::pmr::memory_resource::deallocate`. |
-| test.cpp:265:13:266:19 | allocate | Taking the address of a banned function `std::pmr::polymorphic_allocator<C1>::allocate`. |
-| test.cpp:268:13:269:21 | deallocate | Taking the address of a banned function `std::pmr::polymorphic_allocator<C1>::deallocate`. |
-| test.cpp:273:13:274:24 | allocate | Taking the address of a banned function `std::pmr::memory_resource::allocate`. |
-| test.cpp:276:14:277:27 | deallocate | Taking the address of a banned function `std::pmr::memory_resource::deallocate`. |
-| test.cpp:281:14:282:25 | allocate | Taking the address of a banned function `std::pmr::memory_resource::allocate`. |
-| test.cpp:284:14:285:27 | deallocate | Taking the address of a banned function `std::pmr::memory_resource::deallocate`. |
-| test.cpp:289:14:290:25 | allocate | Taking the address of a banned function `std::pmr::memory_resource::allocate`. |
-| test.cpp:292:14:293:27 | deallocate | Taking the address of a banned function `std::pmr::memory_resource::deallocate`. |
-| test.cpp:299:7:299:28 | allocate | Taking the address of a banned function `std::scoped_allocator_adaptor<allocator<C1>>::allocate`. |
-| test.cpp:302:7:302:30 | deallocate | Taking the address of a banned function `std::scoped_allocator_adaptor<allocator<C1>>::deallocate`. |
-| test.cpp:309:13:309:41 | release | Taking the address of a banned function `std::unique_ptr<C1, default_delete<C1>>::release`. |
-| test.cpp:312:7:312:37 | release | Taking the address of a banned function `std::unique_ptr<C1[], default_delete<C1[]>>::release`. |
+| test.cpp:165:7:165:17 | malloc | Taking the address of banned `malloc`. |
+| test.cpp:167:8:167:18 | malloc | Taking the address of banned `malloc`. |
+| test.cpp:169:7:169:14 | malloc | Taking the address of banned `malloc`. |
+| test.cpp:171:8:171:15 | malloc | Taking the address of banned `malloc`. |
+| test.cpp:174:7:174:17 | calloc | Taking the address of banned `calloc`. |
+| test.cpp:176:8:176:18 | calloc | Taking the address of banned `calloc`. |
+| test.cpp:179:7:179:18 | realloc | Taking the address of banned `realloc`. |
+| test.cpp:181:8:181:19 | realloc | Taking the address of banned `realloc`. |
+| test.cpp:184:7:184:24 | aligned_alloc | Taking the address of banned `aligned_alloc`. |
+| test.cpp:186:8:186:25 | aligned_alloc | Taking the address of banned `aligned_alloc`. |
+| test.cpp:189:7:189:15 | free | Taking the address of banned `free`. |
+| test.cpp:191:8:191:16 | free | Taking the address of banned `free`. |
+| test.cpp:193:7:193:12 | free | Taking the address of banned `free`. |
+| test.cpp:195:8:195:13 | free | Taking the address of banned `free`. |
+| test.cpp:202:7:202:21 | operator new | Taking the address of banned `operator new`. |
+| test.cpp:204:7:204:20 | operator new | Taking the address of banned `operator new`. |
+| test.cpp:206:7:206:23 | operator new[] | Taking the address of banned `operator new[]`. |
+| test.cpp:208:7:208:22 | operator new[] | Taking the address of banned `operator new[]`. |
+| test.cpp:211:7:211:21 | operator new | Taking the address of banned `operator new`. |
+| test.cpp:213:7:213:23 | operator new[] | Taking the address of banned `operator new[]`. |
+| test.cpp:218:7:218:24 | operator delete | Taking the address of banned `operator delete`. |
+| test.cpp:220:7:220:23 | operator delete | Taking the address of banned `operator delete`. |
+| test.cpp:222:7:222:26 | operator delete[] | Taking the address of banned `operator delete[]`. |
+| test.cpp:223:24:223:42 | operator delete[] | Taking the address of banned `operator delete[]`. |
+| test.cpp:227:7:227:24 | operator delete | Taking the address of banned `operator delete`. |
+| test.cpp:229:7:229:26 | operator delete[] | Taking the address of banned `operator delete[]`. |
+| test.cpp:233:7:233:24 | operator delete | Taking the address of banned `operator delete`. |
+| test.cpp:235:7:235:26 | operator delete[] | Taking the address of banned `operator delete[]`. |
+| test.cpp:243:13:243:41 | allocate | Taking the address of banned `std::allocator<C1>::allocate`. |
+| test.cpp:245:13:245:43 | deallocate | Taking the address of banned `std::allocator<C1>::deallocate`. |
+| test.cpp:251:7:251:23 | allocate | Taking the address of banned `std::allocator_traits<allocator<C1>>::allocate`. |
+| test.cpp:254:8:254:25 | deallocate | Taking the address of banned `std::allocator_traits<allocator<C1>>::deallocate`. |
+| test.cpp:258:13:258:48 | allocate | Taking the address of banned `std::pmr::memory_resource::allocate`. |
+| test.cpp:261:7:261:44 | deallocate | Taking the address of banned `std::pmr::memory_resource::deallocate`. |
+| test.cpp:265:13:266:19 | allocate | Taking the address of banned `std::pmr::polymorphic_allocator<C1>::allocate`. |
+| test.cpp:268:13:269:21 | deallocate | Taking the address of banned `std::pmr::polymorphic_allocator<C1>::deallocate`. |
+| test.cpp:273:13:274:24 | allocate | Taking the address of banned `std::pmr::memory_resource::allocate`. |
+| test.cpp:276:14:277:27 | deallocate | Taking the address of banned `std::pmr::memory_resource::deallocate`. |
+| test.cpp:281:14:282:25 | allocate | Taking the address of banned `std::pmr::memory_resource::allocate`. |
+| test.cpp:284:14:285:27 | deallocate | Taking the address of banned `std::pmr::memory_resource::deallocate`. |
+| test.cpp:289:14:290:25 | allocate | Taking the address of banned `std::pmr::memory_resource::allocate`. |
+| test.cpp:292:14:293:27 | deallocate | Taking the address of banned `std::pmr::memory_resource::deallocate`. |
+| test.cpp:299:7:299:28 | allocate | Taking the address of banned `std::scoped_allocator_adaptor<allocator<C1>>::allocate`. |
+| test.cpp:302:7:302:30 | deallocate | Taking the address of banned `std::scoped_allocator_adaptor<allocator<C1>>::deallocate`. |
+| test.cpp:309:13:309:41 | release | Taking the address of banned `std::unique_ptr<C1, default_delete<C1>>::release`. |
+| test.cpp:312:7:312:37 | release | Taking the address of banned `std::unique_ptr<C1[], default_delete<C1[]>>::release`. |