From 31c2cebbccba45a00a755981dd6d0cdd0a0459e9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 14 八月 2018 17:28:38 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Assets/Editor/MemoryProfiler/TypeTools.cs | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/Assets/Editor/MemoryProfiler/TypeTools.cs b/Assets/Editor/MemoryProfiler/TypeTools.cs
index 314aa2a..c5ff94d 100644
--- a/Assets/Editor/MemoryProfiler/TypeTools.cs
+++ b/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;
+
}
}
}
--
Gitblit v1.8.0