default mode is the fastest

AqlaSolutions · Feb 15, 2016 · f93e8f9 · f93e8f9
1 parent 7788e3d
commit f93e8f9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/RunSharpShared/Aqla/RunSharpDebug.cs b/RunSharpShared/Aqla/RunSharpDebug.cs
@@ -5,7 +5,9 @@ public static class RunSharpDebug
         /// <summary>
         /// Set to minimal to improve generation performance
         /// </summary>
-        public static LeakingDetectionMode LeakingDetection { get; set; } = LeakingDetectionMode.DetectAndCaptureStackWithFiles;
+        public static LeakingDetectionMode LeakingDetection { get; set; } = LeakingDetectionMode.Minimal;
+
+        public static bool CaptureStackOnUnreachable { get; set; }
     }
 
     public enum LeakingDetectionMode

diff --git a/RunSharpShared/AttributeGen.cs b/RunSharpShared/AttributeGen.cs
@@ -120,7 +120,7 @@ internal AttributeGen(AttributeTargets target, AttributeType attributeType, obje
 
         static bool IsValidAttributeParamType(Type t)
 		{
-		    return t != null && (t.IsPrimitive || t.IsEnum || Helpers.IsAssignableFrom(typeof(Type), t) || t.FullName == typeof(string).FullName);
+		    return t != null && (t.IsPrimitive || t.IsEnum || Helpers.IsAssignableFrom(typeof(System.Type), t) || t.FullName == typeof(string).FullName);
 		}
 
 		static bool IsSingleDimensionalZeroBasedArray(Array a)

diff --git a/RunSharpShared/CodeGen.Statements.cs b/RunSharpShared/CodeGen.Statements.cs
@@ -239,7 +239,10 @@ void BeforeStatement()
 		{
             if (!IsReachable)
             {
-                throw new InvalidOperationException(Properties.Messages.ErrCodeNotReachable + ", \r\n set unreachable at \r\n" + _unreachableFrom);
+                var msg = ", \r\n set unreachable at \r\n" + _unreachableFrom;
+                if (_unreachableFrom == null)
+                    msg = ", enable " + nameof(RunSharpDebug) + "." + nameof(RunSharpDebug.CaptureStackOnUnreachable) + " for capturing stack on unreachable";
+                throw new InvalidOperationException(Properties.Messages.ErrCodeNotReachable + msg);
             }
 #if !PHONE8
             if (_cg != null && !_chainCalled && !_cg.Type.TypeBuilder.IsValueType)

diff --git a/RunSharpShared/CodeGen.cs b/RunSharpShared/CodeGen.cs
@@ -84,7 +84,8 @@ public bool IsReachable
 	        private set
 	        {
 	            _isReachable = value;
-	            _unreachableFrom = value ? null :
+	            _unreachableFrom = (value || !RunSharpDebug.CaptureStackOnUnreachable) 
+                    ? null :
 #if !SILVERLIGHT
                     new StackTrace(1, true);
 #else

diff --git a/RunSharpShared/Operand.cs b/RunSharpShared/Operand.cs
@@ -830,7 +830,7 @@ protected internal override void EmitAddressOf(CodeGen g)
                 string message = "RunSharp: a possible leak of operand " + ((this as ContextualOperand)?.GetInternalOperandType() ?? this.GetType()).Name
                                  + " detected, see Operand.SetNotLeaked() if it's not the case. " +
                                  "Operand creation stack trace "
-                                 + (_leakedStateStack != null ? "\r\n" + _leakedStateStack : " may be enabled with RunSharpDebug.StoreLeakingStackTrace = LeakingDetectionMode.Minimal");
+                                 + (_leakedStateStack != null ? "\r\n" + _leakedStateStack : " may be enabled with RunSharpDebug.StoreLeakingStackTrace = LeakingDetectionMode.DetectAndCaptureStack");
                 throw new InvalidOperationException(message);
             }
         }

diff --git a/RunSharpShared/Operands/TypeLiteral.cs b/RunSharpShared/Operands/TypeLiteral.cs
@@ -55,10 +55,10 @@ protected internal override void EmitGet(CodeGen g)
         {
 		    OperandExtensions.SetLeakedState(this, false); 
 			g.IL.Emit(OpCodes.Ldtoken, _t);
-			g.IL.Emit(OpCodes.Call, g.TypeMapper.MapType(typeof(Type)).GetMethod("GetTypeFromHandle"));
+			g.IL.Emit(OpCodes.Call, g.TypeMapper.MapType(typeof(System.Type)).GetMethod("GetTypeFromHandle"));
 		}
 
-	    public override Type GetReturnType(ITypeMapper typeMapper) => typeMapper.MapType(typeof(Type));
+	    public override Type GetReturnType(ITypeMapper typeMapper) => typeMapper.MapType(typeof(System.Type));
 
 	    protected internal override object ConstantValue => _t;
 	}