@@ -316,14 +316,22 @@ static cl::opt<bool> ClEagerChecks(
316
316
317
317
static cl::opt<bool > ClDumpStrictInstructions (
318
318
" msan-dump-strict-instructions" ,
319
- cl::desc (" print out instructions with default strict semantics" ),
319
+ cl::desc (" print out instructions with default strict semantics i.e.,"
320
+ " check that all the inputs are fully initialized, and mark "
321
+ " the output as fully initialized. These semantics are applied "
322
+ " to instructions that could not be handled explicitly nor "
323
+ " heuristically." ),
320
324
cl::Hidden, cl::init(false ));
321
325
322
- static cl::opt<bool > ClDumpStrictIntrinsics (
323
- " msan-dump-strict-intrinsics" ,
324
- cl::desc (" Prints 'unknown' intrinsics that were handled heuristically. "
325
- " Use -msan-dump-strict-instructions to print intrinsics that "
326
- " could not be handled exactly nor heuristically." ),
326
+ // Currently, all the heuristically handled instructions are specifically
327
+ // IntrinsicInst. However, we use the broader "HeuristicInstructions" name
328
+ // to parallel 'msan-dump-strict-instructions', and to keep the door open to
329
+ // handling non-intrinsic instructions heuristically.
330
+ static cl::opt<bool > ClDumpHeuristicInstructions (
331
+ " msan-dump-heuristic-instructions" ,
332
+ cl::desc (" Prints 'unknown' instructions that were handled heuristically. "
333
+ " Use -msan-dump-strict-instructions to print instructions that "
334
+ " could not be handled explicitly nor heuristically." ),
327
335
cl::Hidden, cl::init(false ));
328
336
329
337
static cl::opt<int > ClInstrumentationWithCallThreshold (
@@ -3197,10 +3205,10 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
3197
3205
3198
3206
bool handleUnknownIntrinsic (IntrinsicInst &I) {
3199
3207
if (handleUnknownIntrinsicUnlogged (I)) {
3200
- if (ClDumpStrictIntrinsics )
3208
+ if (ClDumpHeuristicInstructions )
3201
3209
dumpInst (I);
3202
3210
3203
- LLVM_DEBUG (dbgs () << " UNKNOWN INTRINSIC HANDLED HEURISTICALLY: " << I
3211
+ LLVM_DEBUG (dbgs () << " UNKNOWN INSTRUCTION HANDLED HEURISTICALLY: " << I
3204
3212
<< " \n " );
3205
3213
return true ;
3206
3214
} else
0 commit comments