projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial import of the Generic MCS tree.
[mono.git]
/
mcs
/
gmcs
/
codegen.cs
diff --git
a/mcs/gmcs/codegen.cs
b/mcs/gmcs/codegen.cs
index 43ac7def63d855e5acb83da711e7ba959ed65b36..be4c17460257149b8b05a38a55395d94257d3bad 100755
(executable)
--- a/
mcs/gmcs/codegen.cs
+++ b/
mcs/gmcs/codegen.cs
@@
-275,6
+275,12
@@
namespace Mono.CSharp {
/// </summary>
public bool InEnumContext;
/// </summary>
public bool InEnumContext;
+ /// <summary>
+ /// If our type container, or the method we are generating code
+ /// for is Generic
+ /// </summary>
+ public bool IsGeneric;
+
protected Stack FlowStack;
public EmitContext (DeclSpace parent, DeclSpace ds, Location l, ILGenerator ig,
protected Stack FlowStack;
public EmitContext (DeclSpace parent, DeclSpace ds, Location l, ILGenerator ig,
@@
-309,6
+315,11
@@
namespace Mono.CSharp {
if (ReturnType == TypeManager.void_type)
ReturnType = null;
if (ReturnType == TypeManager.void_type)
ReturnType = null;
+
+ //
+ // We should also set it if the method is generic
+ //
+ IsGeneric = ds.IsGeneric || ((Modifiers.METHOD_GENERIC) != 0);
}
public EmitContext (TypeContainer tc, Location l, ILGenerator ig,
}
public EmitContext (TypeContainer tc, Location l, ILGenerator ig,