Add SINKMALLOC tag to TRUNCATIONs.

SMPInstr.cpp

@@ -7982,6 +7982,7 @@ void SMPInstr::EmitIntegerErrorAnnotations(FILE *InfoAnnotFile, list<size_t> &Lo
 	                   //  of an int or a pointer. Cannot have signedness error in that case, as sign bit
 	                   //  is not affected.
 	char *disasm = DisAsmText.GetDisAsm(this->GetAddr());
+	string SinkString("");
 	if (this->IsNumericAnnotationSuppressed()) {
 		return; // Cannot figure out IdiomCode; suppressed from earlier instruction's analyses
@@ -8144,7 +8145,6 @@ void SMPInstr::EmitIntegerErrorAnnotations(FILE *InfoAnnotFile, list<size_t> &Lo
 					this->MDGetUnnormalizedOp(AnnotDefOp);
 				}
 				AnnotPrintOperand(AnnotDefOp, InfoAnnotFile);
-				string SinkString("");
 				if (!IgnoreOverflow) {
 					// See if we made a special detection of an operation involved in a hash function, which can
 					//  be expected to overflow benignly.
@@ -8599,12 +8599,19 @@ void SMPInstr::EmitIntegerErrorAnnotations(FILE *InfoAnnotFile, list<size_t> &Lo
 			//  signedness errors are the result of the uncertainty, but all truncations are detected
 			//  for all nine cases.
+			bool HasSinkString = this->GetBlock()->GetFunc()->HasIntErrorCallSink(DestSearchOp, DefSSANum, this->address, SinkString);
 			if (DefIsUnsigned || UseIsUnsigned) {
 				// First five cases above: any UNSIGNED operand leads to CHECK TRUNCATION UNSIGNED annotation.
 				if (!SuppressTruncation) {
-					SMP_fprintf(InfoAnnotFile, "%10x %6d INSTR CHECK TRUNCATION UNSIGNED %zu %s %zu %s ZZ %s \n",
+					SMP_fprintf(InfoAnnotFile, "%10x %6d INSTR CHECK TRUNCATION UNSIGNED %zu %s %zu %s",
 						this->address, this->SMPcmd.size, SourceDefBitWidth,
-						MDGetRegName(SearchOp), UseBitWidth, MDGetRegName(UseOp), disasm);
+						MDGetRegName(SearchOp), UseBitWidth, MDGetRegName(UseOp));
+					if (HasSinkString) {
+						SMP_fprintf(InfoAnnotFile, " ZZ %s %s \n", SinkString.c_str(), disasm);
+					}
+					else {
+						SMP_fprintf(InfoAnnotFile, " ZZ %s \n", disasm);
+					}
 #if SMP_MEASURE_NUMERIC_ANNOTATIONS
 					++TruncationAnnotationsCount;
 #endif
@@ -8636,9 +8643,15 @@ void SMPInstr::EmitIntegerErrorAnnotations(FILE *InfoAnnotFile, list<size_t> &Lo
 			else if (DefIsSigned && UseIsSigned) {
 				// S => S case above. Emit CHECK TRUNCATION SIGNED annotation.
 				if (!SuppressTruncation) {
-					SMP_fprintf(InfoAnnotFile, "%10x %6d INSTR CHECK TRUNCATION SIGNED %zu %s %zu %s ZZ %s \n",
+					SMP_fprintf(InfoAnnotFile, "%10x %6d INSTR CHECK TRUNCATION SIGNED %zu %s %zu %s",
 						this->address, this->SMPcmd.size, SourceDefBitWidth,
-						MDGetRegName(SearchOp), UseBitWidth, MDGetRegName(UseOp), disasm);
+						MDGetRegName(SearchOp), UseBitWidth, MDGetRegName(UseOp));
+						if (HasSinkString) {
+							SMP_fprintf(InfoAnnotFile, " ZZ %s %s \n", SinkString.c_str(), disasm);
+						}
+						else {
+							SMP_fprintf(InfoAnnotFile, " ZZ %s \n", disasm);
+						}
 #if SMP_MEASURE_NUMERIC_ANNOTATIONS
 					++TruncationAnnotationsCount;
 #endif
@@ -8652,9 +8665,15 @@ void SMPInstr::EmitIntegerErrorAnnotations(FILE *InfoAnnotFile, list<size_t> &Lo
 			else {
 				// S => ?, ? => S, ? => ? cases above: CHECK TRUNCATION UNKNOWNSIGN annotation.
 				if (!SuppressTruncation) {
-					SMP_fprintf(InfoAnnotFile, "%10x %6d INSTR CHECK TRUNCATION UNKNOWNSIGN %zu %s %zu %s ZZ %s \n",
+					SMP_fprintf(InfoAnnotFile, "%10x %6d INSTR CHECK TRUNCATION UNKNOWNSIGN %zu %s %zu %s",
 						this->address, this->SMPcmd.size, SourceDefBitWidth,
-						MDGetRegName(SearchOp), UseBitWidth, MDGetRegName(UseOp), disasm);
+						MDGetRegName(SearchOp), UseBitWidth, MDGetRegName(UseOp));
+					if (HasSinkString) {
+						SMP_fprintf(InfoAnnotFile, " ZZ %s %s \n", SinkString.c_str(), disasm);
+					}
+					else {
+						SMP_fprintf(InfoAnnotFile, " ZZ %s \n", disasm);
+					}
 #if SMP_MEASURE_NUMERIC_ANNOTATIONS
 						++TruncationAnnotationsCount;
 #endif