Modernize viewer alignment macros to use alignas and fix misaligned class issues reported by ubsan/asan

Signed-off-by: Rye <[email protected]>

Author: RyeMutt

indra/llappearance/llavatarjoint.h

@@ -41,9 +41,10 @@ extern const F32 DEFAULT_AVATAR_JOINT_LOD;
 //-----------------------------------------------------------------------------
 // class LLViewerJoint
 //-----------------------------------------------------------------------------
-class LLAvatarJoint :
+class alignas(16) LLAvatarJoint :
     public LLJoint
 {
+    LL_ALIGN_NEW
 public:
     LLAvatarJoint();
     LLAvatarJoint(S32 joint_num);
@@ -121,8 +122,9 @@ class LLAvatarJoint :
     S32         mMeshID;
 };
 
-class LLAvatarJointCollisionVolume : public LLAvatarJoint
+class alignas(16) LLAvatarJointCollisionVolume : public LLAvatarJoint
 {
+    LL_ALIGN_NEW
 public:
     LLAvatarJointCollisionVolume();
     virtual ~LLAvatarJointCollisionVolume() {};

indra/llappearance/llavatarjointmesh.h

@@ -59,8 +59,9 @@ class LLSkinJoint
 //-----------------------------------------------------------------------------
 // class LLViewerJointMesh
 //-----------------------------------------------------------------------------
-class LLAvatarJointMesh : public virtual LLAvatarJoint
+class alignas(16) LLAvatarJointMesh : public virtual LLAvatarJoint
 {
+    LL_ALIGN_NEW
 protected:
     LLColor4                    mColor;         // color value
 //  LLColor4                    mSpecular;      // specular color (always white for now)

indra/llappearance/lldriverparam.h

@@ -128,7 +128,7 @@ class alignas(16) LLDriverParam : public LLViewerVisualParam
     void setDrivenWeight(LLDrivenEntry* driven, F32 driven_weight);
 
 
-    LL_ALIGN_16(LLVector4a  mDefaultVec); // temp holder
+    LLVector4a  mDefaultVec; // temp holder
     entry_list_t mDriven;
     LLViewerVisualParam* mCurrentDistortionParam{ nullptr };
     // Backlink only; don't make this an LLPointer.

indra/llappearance/llpolymorph.h

@@ -71,7 +71,7 @@ class alignas(16) LLPolyMorphData
 
 private:
     void freeData();
-} LL_ALIGN_POSTFIX(16);
+};
 
 
 //-----------------------------------------------------------------------------

indra/llappearance/llpolyskeletaldistortion.h

@@ -111,13 +111,13 @@ class alignas(16) LLPolySkeletalDistortion : public LLViewerVisualParam
 protected:
     LLPolySkeletalDistortion(const LLPolySkeletalDistortion& pOther);
 
-    LL_ALIGN_16(LLVector4a mDefaultVec);
+    LLVector4a mDefaultVec;
     typedef std::map<LLJoint*, LLVector3> joint_vec_map_t;
     joint_vec_map_t mJointScales;
     joint_vec_map_t mJointOffsets;
     // Backlink only; don't make this an LLPointer.
     LLAvatarAppearance *mAvatar;
-} LL_ALIGN_POSTFIX(16);
+};
 
 #endif // LL_LLPOLYSKELETALDISTORTION_H
 

indra/llappearance/lltexlayerparams.h

@@ -63,7 +63,6 @@ class LLTexLayerParam : public LLViewerVisualParam
 // LLTexLayerParamAlpha
 //
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-LL_ALIGN_PREFIX(16)
 class alignas(16) LLTexLayerParamAlpha : public LLTexLayerParam
 {
     LL_ALIGN_NEW
@@ -103,7 +102,7 @@ class alignas(16) LLTexLayerParamAlpha : public LLTexLayerParam
     LLPointer<LLImageRaw>   mStaticImageRaw;
     std::atomic<bool>       mNeedsCreateTexture;
     bool                    mStaticImageInvalid;
-    LL_ALIGN_16(LLVector4a              mAvgDistortionVec);
+    LLVector4a              mAvgDistortionVec;
     F32                     mCachedEffectiveWeight;
 
 public:
@@ -113,7 +112,7 @@ class alignas(16) LLTexLayerParamAlpha : public LLTexLayerParam
 
     typedef std::list< LLTexLayerParamAlpha* > param_alpha_ptr_list_t;
     static param_alpha_ptr_list_t sInstances;
-} LL_ALIGN_POSTFIX(16);
+};
 class LLTexLayerParamAlphaInfo : public LLViewerVisualParamInfo
 {
     friend class LLTexLayerParamAlpha;

indra/llappearance/llviewervisualparam.h

@@ -65,8 +65,7 @@ class LLViewerVisualParamInfo : public LLVisualParamInfo
 // VIRTUAL CLASS
 // a viewer side interface class for a generalized parametric modification of the avatar mesh
 //-----------------------------------------------------------------------------
-LL_ALIGN_PREFIX(16)
-class LLViewerVisualParam : public LLVisualParam
+class alignas(16) LLViewerVisualParam : public LLVisualParam
 {
 public:
     LLViewerVisualParam();
@@ -107,6 +106,6 @@ class LLViewerVisualParam : public LLVisualParam
 
 protected:
     LLViewerVisualParam(const LLViewerVisualParam& pOther);
-} LL_ALIGN_POSTFIX(16);
+};
 
 #endif // LL_LLViewerVisualParam_H

indra/llappearanceutility/llbakingavatar.h

@@ -38,15 +38,7 @@ class LLBakingAvatar : public LLAvatarAppearance
  **                    INITIALIZATION
  **/
 public:
-    void* operator new(size_t size)
-    {
-        return ll_aligned_malloc_16(size);
-    }
-
-    void operator delete(void* ptr)
-    {
-        ll_aligned_free_16(ptr);
-    }
+    LL_ALIGN_NEW
 
     LLBakingAvatar(LLWearableData* wearable_data, S32 bakeTextureSize = 512);
     virtual ~LLBakingAvatar();

indra/llappearanceutility/llbakingjoint.h

@@ -29,8 +29,9 @@
 
 #include "llavatarjoint.h"
 
-class LLBakingJoint : public virtual LLAvatarJoint
+class alignas(16) LLBakingJoint : public virtual LLAvatarJoint
 {
+    LL_ALIGN_NEW
 public:
     LLBakingJoint();
     LLBakingJoint(S32 joint_num);

indra/llappearanceutility/llbakingjointmesh.h

@@ -30,8 +30,9 @@
 #include "llavatarjointmesh.h"
 #include "llbakingjoint.h"
 
-class LLBakingJointMesh : public LLAvatarJointMesh, public LLBakingJoint
+class alignas(16) LLBakingJointMesh : public LLAvatarJointMesh, public LLBakingJoint
 {
+    LL_ALIGN_NEW
 public:
     LLBakingJointMesh();
     LLBakingJointMesh(S32 joint_num);