Merge branch 'master' into leonard

client_Wu Xijin

2018-08-14 31c2cebbccba45a00a755981dd6d0cdd0a0459e9

 Assets/Editor/MemoryProfiler/TypeTools.cs

@@ -7,10 +7,10 @@
{
   static class TypeTools
   {
      public enum FieldFindOptions
      {
         OnlyInstance,
         OnlyStatic
      public enum FieldFindOptions

      {

         OnlyInstance,

         OnlyStatic

      }

      static public IEnumerable<FieldDescription> AllFieldsOf (TypeDescription typeDescription, TypeDescription[] typeDescriptions, FieldFindOptions findOptions)
@@ -18,43 +18,43 @@
         if (typeDescription.isArray)
            yield break;
         
         if (findOptions != FieldFindOptions.OnlyStatic && typeDescription.baseOrElementTypeIndex != -1 && !typeDescription.isValueType)
         if (findOptions != FieldFindOptions.OnlyStatic && typeDescription.baseOrElementTypeIndex != -1 && !typeDescription.isValueType)

         {
            var baseTypeDescription = typeDescriptions [typeDescription.baseOrElementTypeIndex];
            foreach(var field in AllFieldsOf(baseTypeDescription, typeDescriptions, findOptions))
               yield return field;
         }

         foreach (var field in typeDescription.fields)
         {
            if (!FieldMatchesOptions(field, findOptions))
               continue;

            if (field.typeIndex == typeDescription.typeIndex && typeDescription.isValueType)
            {
               // this happens in primitive types like System.Single, which is a weird type that has a field of its own type.
               continue;
            }

            if (field.offset == -1)
            {
               // this is how we encode TLS fields. We don't support TLS fields yet.
               continue;
            }

            yield return field;
         }
         foreach (var field in typeDescription.fields)

         {

            if (!FieldMatchesOptions(field, findOptions))

               continue;



            if (field.typeIndex == typeDescription.typeIndex && typeDescription.isValueType)

            {

               // this happens in primitive types like System.Single, which is a weird type that has a field of its own type.

               continue;

            }



            if (field.offset == -1)

            {

               // this is how we encode TLS fields. We don't support TLS fields yet.

               continue;

            }



            yield return field;

         }

      }

      static bool FieldMatchesOptions(FieldDescription field, FieldFindOptions options)
      {
         if (field.isStatic && options == FieldFindOptions.OnlyStatic)
            return true;
         if (!field.isStatic && options == FieldFindOptions.OnlyInstance)
            return true;

         return false;

      static bool FieldMatchesOptions(FieldDescription field, FieldFindOptions options)

      {

         if (field.isStatic && options == FieldFindOptions.OnlyStatic)

            return true;

         if (!field.isStatic && options == FieldFindOptions.OnlyInstance)

            return true;



         return false;



      }
   }
}