This is an archive of the discontinued LLVM Phabricator instance.

[ubsan] Un-templatize handleIntegerOverflowImpl (NFC)
AcceptedPublic

Authored by vsk on Oct 5 2016, 4:14 PM.

Download Raw Diff

Details

Reviewers

filcab
rsmith

Diff Detail

Event Timeline

vsk updated this revision to Diff 73706.Oct 5 2016, 4:14 PM

vsk retitled this revision from to [ubsan] Un-templatize handleIntegerOverflowImpl (NFC).

vsk updated this object.

vsk added a reviewer: rsmith.

vsk added a subscriber: llvm-commits.

Herald added a subscriber: kubamracek. · View Herald TranscriptOct 5 2016, 4:14 PM

vsk added a child revision: D25295: [ubsan] Handle undef values in the integer overflow diagnostic.Oct 5 2016, 4:16 PM

LGTM, it's always called with Value anyway.

This revision is now accepted and ready to land.Oct 21 2016, 2:59 AM

Revision Contents

Path

Size

lib/

ubsan/

ubsan_handlers.cc

5 lines

Diff 73706

lib/ubsan/ubsan_handlers.cc

	Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Lines
	void __ubsan::__ubsan_handle_type_mismatch_abort(TypeMismatchData *Data,			void __ubsan::__ubsan_handle_type_mismatch_abort(TypeMismatchData *Data,
	ValueHandle Pointer) {			ValueHandle Pointer) {
	GET_REPORT_OPTIONS(true);			GET_REPORT_OPTIONS(true);
	handleTypeMismatchImpl(Data, Pointer, Opts);			handleTypeMismatchImpl(Data, Pointer, Opts);
	Die();			Die();
	}			}

	/// \brief Common diagnostic emission for various forms of integer overflow.			/// \brief Common diagnostic emission for various forms of integer overflow.
	template <typename T>
	static void handleIntegerOverflowImpl(OverflowData *Data, ValueHandle LHS,			static void handleIntegerOverflowImpl(OverflowData *Data, ValueHandle LHS,
	const char *Operator, T RHS,			const char *Operator, const Value &RHSVal,
	ReportOptions Opts) {			ReportOptions Opts) {
	SourceLocation Loc = Data->Loc.acquire();			SourceLocation Loc = Data->Loc.acquire();
	bool IsSigned = Data->Type.isSignedIntegerTy();			bool IsSigned = Data->Type.isSignedIntegerTy();
	ErrorType ET = IsSigned ? ErrorType::SignedIntegerOverflow			ErrorType ET = IsSigned ? ErrorType::SignedIntegerOverflow
	: ErrorType::UnsignedIntegerOverflow;			: ErrorType::UnsignedIntegerOverflow;

	if (ignoreReport(Loc, Opts, ET))			if (ignoreReport(Loc, Opts, ET))
	return;			return;

	ScopedReport R(Opts, Loc, ET);			ScopedReport R(Opts, Loc, ET);

	Diag(Loc, DL_Error, "%0 integer overflow: "			Diag(Loc, DL_Error, "%0 integer overflow: "
	"%1 %2 %3 cannot be represented in type %4")			"%1 %2 %3 cannot be represented in type %4")
	<< (IsSigned ? "signed" : "unsigned")			<< (IsSigned ? "signed" : "unsigned")
	<< Value(Data->Type, LHS) << Operator << RHS << Data->Type;			<< Value(Data->Type, LHS) << Operator << RHSVal << Data->Type;
	}			}

	#define UBSAN_OVERFLOW_HANDLER(handler_name, op, unrecoverable) \			#define UBSAN_OVERFLOW_HANDLER(handler_name, op, unrecoverable) \
	void __ubsan::handler_name(OverflowData *Data, ValueHandle LHS, \			void __ubsan::handler_name(OverflowData *Data, ValueHandle LHS, \
	ValueHandle RHS) { \			ValueHandle RHS) { \
	GET_REPORT_OPTIONS(unrecoverable); \			GET_REPORT_OPTIONS(unrecoverable); \
	handleIntegerOverflowImpl(Data, LHS, op, Value(Data->Type, RHS), Opts); \			handleIntegerOverflowImpl(Data, LHS, op, Value(Data->Type, RHS), Opts); \
	if (unrecoverable) \			if (unrecoverable) \
	▲ Show 20 Lines • Show All 453 Lines • Show Last 20 Lines