Merge branch 'maint' of https://github.com/rheit/zdoom into maint2.1

# Conflicts:
#	src/version.h

src/autosegs.h

@@ -35,6 +35,8 @@
 #ifndef AUTOSEGS_H
 #define AUTOSEGS_H
 
+#include "doomtype.h"
+
 #define REGMARKER(x) (x)
 typedef void *REGINFO;
 
@@ -76,11 +78,11 @@ class FAutoSegIterator
 			}
 			Probe = Head;
 		}
-		REGINFO operator*() const
+		REGINFO operator*() const NO_SANITIZE
 		{
 			return *Probe;
 		}
-		FAutoSegIterator &operator++()
+		FAutoSegIterator &operator++() NO_SANITIZE
 		{
 			do
 			{

src/dobjtype.cpp

@@ -47,7 +47,7 @@ bool PClass::bShutdown;
 // A harmless non-NULL FlatPointer for classes without pointers.
 static const size_t TheEnd = ~(size_t)0;
 
-static int STACK_ARGS cregcmp (const void *a, const void *b)
+static int STACK_ARGS cregcmp (const void *a, const void *b) NO_SANITIZE
 {
 	// VC++ introduces NULLs in the sequence. GCC seems to work as expected and not do it.
 	const ClassReg *class1 = *(const ClassReg **)a;

src/doomtype.h

@@ -113,6 +113,16 @@ typedef TMap<int, const PClass *> FClassMap;
 #define NOVTABLE
 #endif
 
+#if defined(__clang__)
+#if defined(__has_feature) && __has_feature(address_sanitizer)
+#define NO_SANITIZE __attribute__((no_sanitize("address")))
+#else
+#define NO_SANITIZE
+#endif
+#else
+#define NO_SANITIZE
+#endif
+
 #include "basictypes.h"
 
 // Bounding box coordinate storage.

src/g_heretic/a_hereticartifacts.cpp

@@ -69,7 +69,7 @@ bool AArtiTimeBomb::Use (bool pickup)
 {
 	angle_t angle = Owner->angle >> ANGLETOFINESHIFT;
 	AActor *mo = Spawn("ActivatedTimeBomb",
-		Vec3Angle(24*FRACUNIT, Owner->angle, - Owner->floorclip), ALLOW_REPLACE);
+		Owner->Vec3Angle(24*FRACUNIT, Owner->angle, - Owner->floorclip), ALLOW_REPLACE);
 	mo->target = Owner;
 	return true;
 }